Changeset 1746

Timestamp:

01/04/10 23:36:31 (2 years ago)

Author:

andreas

Message:

added include guard in sip_handler.hh / based DataViewerProxy? on SipHandler? / improved handling of mask shift in MaskOverlay?

Files:

• branches/qt_gui/src/ex/proc/diff/dm/dm.py (modified) (4 diffs)
• branches/qt_gui/src/ex/proc/diff/dm/edit_mask.py (modified) (1 diff)
• branches/qt_gui/src/ex/proc/diff/dm/verify_lattice.py (modified) (2 diffs)
• branches/qt_gui/src/gui/lib/data_viewer/data_viewer_proxy.cc (modified) (1 diff)
• branches/qt_gui/src/gui/lib/data_viewer/data_viewer_proxy.hh (modified) (3 diffs)
• branches/qt_gui/src/gui/lib/data_viewer/mask_overlay.cc (modified) (3 diffs)
• branches/qt_gui/src/gui/lib/data_viewer/mask_overlay.hh (modified) (1 diff)
• branches/qt_gui/src/gui/lib/sip_handler.hh (modified) (2 diffs)
• branches/qt_gui/src/gui/pymod/export_overlay.cc (modified) (1 diff)
• branches/qt_gui/src/gui/pymod/export_viewer.cc (modified) (1 diff)

branches/qt_gui/src/ex/proc/diff/dm/dm.py

@@ -21 +21 @@
-import iplt.ex as ex
-from verify_lattice import *
+from edit_mask import *
-from view_se import *
-from view_tilt import *
@@ -312 +313 @@
-
-        self.verify_lattice_view_=None
+        self.edit_masks_view_=None
-        self.view_se_=None
-        self.view_tilt_=None
@@ -362 +364 @@
-    def OnLoadVerifiedLattice(self,im_list_entry):
-        self.verify_lattice_view_.Load(self.wdir_,im_list_entry[0])
+
+    def OnEditMasks(self):
+        if not self.edit_masks_view_:
+            self.edit_masks_view_=EditMask(self.pinfo_)
+        base=str(self.w_im_label_.text())
+        self.edit_masks_view_.Load(self.wdir_,base)
-
-    def OnVerifyLattice(self):
@@ -433 +441 @@
-        hb.addWidget(self.w_im_label_)
-        vb.addLayout(hb,Qt.AlignCenter)
+        self.b_edit_masks_=QPushButton("Edit masks")
+        QObject.connect(self.b_edit_masks_,SIGNAL("clicked()"),self.OnEditMasks)
+        vb.addWidget(self.b_edit_masks_)
-        self.b_verify_lattice_=QPushButton("Verify Lattice")
-        QObject.connect(self.b_verify_lattice_,SIGNAL("clicked()"),self.OnVerifyLattice)

branches/qt_gui/src/ex/proc/diff/dm/edit_mask.py

@@ -14 +14 @@
-#
-
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+import sip
-import sys,math,os.path,time
-from iplt import *
-diff_view_base import Diff
+view_base import 
-import iplt.ex as ex
-import iplt.ex.gui as exgui
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-    def Load(self,wdir,base,iinfo):
-        self.v_=None
-        self.iinfo_ = iinfo
-        if self.iinfo_.Root().HasGroup("DiffProcessing/BeamStopMask"):
-            self.mask_ = InfoToMask(iinfo.Root().RetrieveGroup("DiffProcessing/BeamStopMask"))
-        self.wdir_ = wdir
-        self.base_ = base
-        im_name = str(self.GetDatasetImagePath(iinfo,wdir,base))
-        self.im_=LoadImage(im_name)
-        self.v_=gui.CreateDataViewer(self.im_,im_name)
-        self.v_.AddOverlay(self.exclusion_mask_overlay_)
-        self.v_.AddOverlay(self.mask_overlay_)
-        if self.mask_:
-            self.mask_overlay_.SetMask(self.mask_)
-        if self.iinfo_.Root().HasGroup("DiffProcessing/ExclusionMask"):
-            self.exclusion_mask_ = InfoToMask(iinfo.Root().RetrieveGroup("DiffProcessing/ExclusionMask"))
-        if self.exclusion_mask_:
-            self.exclusion_mask_overlay_.SetMask(self.exclusion_mask_)
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-    def save_local_mask(self):
-        self.mask_=self.mask_overlay_.GetMask()
-        if self.iinfo_.Root().HasGroup("DiffProcessing/BeamStopMask"):
-            self.iinfo_.Root().Remove("DiffProcessing/BeamStopMask")
-        g=self.iinfo_.Root().RetrieveGroup("DiffProcessing/BeamStopMask")
-        MaskToInfo(self.mask_,g)
-        self.iinfo_.Export(os.path.join(self.wdir_,self.base_,"info.xml"))
-        
-    def remove_local_mask(self):
-        if self.iinfo_.Root().HasGroup("DiffProcessing/BeamStopMask"):
-            self.iinfo_.Root().Remove("DiffProcessing/BeamStopMask")
-            self.iinfo_.Export(os.path.join(self.wdir_,self.base_,"info.xml"))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/qt_gui/src/ex/proc/diff/dm/verify_lattice.py

@@ -117 +117 @@
-        self.lov2_=None
-        self.lov3_=None
-self.mshift_
+mshift
-        if self.info_.Root().HasGroup("DiffProcessing/BeamStopMask"):
-            self.bs_mask_=InfoToMask(self.info_.Root().GetGroup("DiffProcessing/BeamStopMask"))
-        if self.info_.Root().HasGroup("DiffProcessingResults/DiffFindMask/Shift"):
-            g=self.info_.Root().GetGroup("DiffProcessingResults/DiffFindMask/Shift")
-self.mshift_
+mshift
-        self.mo_=None
-self.mshift_
+mshift
-            mlogn(5,"adding mask overlay")
-            mask = self.bs_mask_.Clone()
-            mask.Shift(self.mshift_)
-            self.mo_=gui.MaskOverlay()
-
+
+
-            self.v_.AddOverlay(self.mo_)
-
@@ -196 +195 @@
-    def SaveMaskShift(self):
-      if self.mo_:
-+self.mshift_
+
-            g=self.info_.Root().GetGroup("DiffProcessingResults/DiffFindMask/Shift")
-            g.GetItem('x').SetFloat(shift[0])

branches/qt_gui/src/gui/lib/data_viewer/data_viewer_proxy.cc

@@ -120 +120 @@
-}
-
+unsigned long DataViewerProxy::SipHandle() const
+{
+  return reinterpret_cast<unsigned long>(viewer_);
+}
+
-}} // ns

branches/qt_gui/src/gui/lib/data_viewer/data_viewer_proxy.hh

@@ -29 +29 @@
-#include "overlay_manager_fw.hh"
-//#include "data_viewer_snapshot_type.hh"
+#include <iplt/gui/sip_handler.hh>
-
-class QWidget;
@@ -38 +39 @@
-class DataViewer;
-
-
+: public SipHandler
-public:
-  DataViewerProxy();
@@ -72 +73 @@
-  //Vec3 GetClickedPosition();
-  //wxImage GetSnapshot(DataViewerSnapshotType type = WHOLE_DATA_VIEWER);
+  virtual unsigned long SipHandle() const;
-
-private:

branches/qt_gui/src/gui/lib/data_viewer/mask_overlay.cc

@@ -63 +63 @@
-    Polygon2 pol=polygons_[i];
-    QPolygon qpol;
-
-
+unsigned 
++shift_
-      pnt.drawEllipse(qpol.back(),3,3);
-    }
@@ -94 +94 @@
-  geom::Vec2 diffpos=mousepos-old_mouse_pos_;
-  if(e->buttons() & Qt::RightButton){
-    for(std::vector<geom::Polygon2>::iterator it=polygons_.begin();it!=polygons_.end();++it){
-      (*it)=(*it)+diffpos;
-    }
-    new_poly_=new_poly_+diffpos;
-    shift_+=diffpos;
-  }
@@ -205 +201 @@
-}
-
+void MaskOverlay::ClearShift()
+{
+  shift_=geom::Vec2();
+}
+
+geom::Vec2 MaskOverlay::GetShift()
+{
+  return shift_;
+}
+
+void MaskOverlay::SetShift(geom::Vec2 shift)
+{
+  shift_=shift;
+}
+
+void MaskOverlay::ApplyShiftToMask()
+{
+  for(std::vector<geom::Polygon2>::iterator it=polygons_.begin();it!=polygons_.end();++it){
+    (*it)=(*it)+shift_;
+  }
+  new_poly_=new_poly_+shift_;
+  shift_=Vec2(0.0,0.0);
+}
-
-}} // ns

branches/qt_gui/src/gui/lib/data_viewer/mask_overlay.hh

@@ -43 +43 @@
-  void SetMask(const MaskPtr& m);
-  void ClearMask();
-
-
+
+
+
+
-
-protected:

branches/qt_gui/src/gui/lib/sip_handler.hh

@@ -13 +13 @@
-  Author: Ansgar Philippsen
-*/
+
+#ifndef IPLT_GUI_SIP_HANDLER_H
+#define IPLT_GUI_SIP_HANDLER_H
-
-namespace iplt { namespace gui {
@@ -55 +58 @@
-}}
-
+#endif

branches/qt_gui/src/gui/pymod/export_overlay.cc

@@ -97 +97 @@
-    .def("GetShift",&MaskOverlay::GetShift)
-    .def("ClearShift",&MaskOverlay::ClearShift)
+    .def("SetShift",&MaskOverlay::SetShift)
+    .def("ApplyShiftToMask",&MaskOverlay::ApplyShiftToMask)
-    ;
-

branches/qt_gui/src/gui/pymod/export_viewer.cc

@@ -51 +51 @@
-void export_viewer()
-{
-
+, bases<SipHandler> 
-    .def("SetData",&DataViewerProxy::SetData)
-    .def("SetName",&DataViewerProxy::SetName)