Changeset 1739

Timestamp:

12/01/09 19:39:20 (2 years ago)

Author:

andreas

Message:

fixed display of lattice vectors in LatticeOverlay? / made ResolutionRings? in RlistOverlay? customizable / some tweaks in giplt_dm

Files:

• branches/qt_gui/src/ex/gui/lib/lattice_overlay_base.cc (modified) (1 diff)
• branches/qt_gui/src/ex/gui/lib/rlist_overlay.cc (modified) (13 diffs)
• branches/qt_gui/src/ex/gui/lib/rlist_overlay.hh (modified) (6 diffs)
• branches/qt_gui/src/ex/gui/pymod/export_overlays.cc (modified) (1 diff)
• branches/qt_gui/src/ex/proc/diff/dm/dm.py (modified) (3 diffs)
• branches/qt_gui/src/ex/proc/diff/dm/view_tilt.py (modified) (2 diffs)

branches/qt_gui/src/ex/gui/lib/lattice_overlay_base.cc

@@ -115 +115 @@
-    qpoly << QPoint(static_cast<int>(v2[0]),static_cast<int>(v2[1]));
-    qpoly << QPoint(static_cast<int>(v3[0]),static_cast<int>(v3[1]));
-line
+gon
-  }
-}

branches/qt_gui/src/ex/gui/lib/rlist_overlay.cc

@@ -14 +14 @@
-*/
-
+#include <algorithm>
-#include <boost/format.hpp>
-
@@ -37 +38 @@
-
-RListOverlaySettings::RListOverlaySettings(const QColor& ac, const QColor& pc, int ssize, int sstr, 
-
+
+
-                                           QWidget* p):
-  PointlistOverlayBaseSettings(ac,pc,ssize,sstr,p),
@@ -44 +46 @@
-  color1(c1),
-  color2(c2),
-
+
+
-{
-  QPixmap pm(32,32);
@@ -63 +66 @@
-  hb->addWidget(c2_b_);
-  hb->addWidget(c3_b_);
+
+  rlim_edit_=new QLineEdit(this);
+  rlim_edit_->setValidator(new QDoubleValidator(0.0,100.0,2,rlim_edit_));
+  rlim_widget_=new QListWidget(this);
+  for(std::vector<double>::const_iterator it=rlim_list_.begin();it!=rlim_list_.end();++it){
+    new QListWidgetItem(QString::number(*it), rlim_widget_);
+  }
+  QPushButton* b=new QPushButton("Add Resolution Ring");
+  connect(b,SIGNAL(pressed()), this, SLOT(OnLimAdd()));
+  QPushButton* b2=new QPushButton("Remove Resolution Ring");
+  connect(b2,SIGNAL(pressed()), this, SLOT(OnLimRemove()));
+  
+  
+  QVBoxLayout* vb = new QVBoxLayout;
+  QHBoxLayout* hb2 = new QHBoxLayout;
+  QVBoxLayout* vb2 = new QVBoxLayout;
+  QVBoxLayout* vb3 = new QVBoxLayout;
+  vb3->addWidget(rlim_edit_);
+  vb3->addWidget(rlim_widget_);
+  hb2->addLayout(vb3);
+  vb2->addWidget(b);
+  vb2->addWidget(b2);
+  hb2->addLayout(vb2);
-
-  QCheckBox* cb1 = new QCheckBox("Display Resolution Limits");
@@ -71 +97 @@
-  connect(cb2,SIGNAL(stateChanged(int)),this,SLOT(OnSymRel(int)));
-
-  QVBoxLayout* vb = new QVBoxLayout;
-  vb->addLayout(hb);
+  vb->addLayout(hb2);
-  vb->addWidget(cb1);
-  vb->addWidget(cb2);
@@ -122 +148 @@
-  }
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/////////////////////////////
@@ -132 +172 @@
-  color2_(QColor(QColor(255,255,0))),
-  color3_(QColor(QColor(32,147,172))),
-tru
+fals
-  rlim_list_(),
-  sym_points_flag_(true),
@@ -144 +184 @@
-  SetReferenceCell(rlist_.GetUnitCell());
-
-  // hardcoded for now
-  rlim_list_.push_back(20.0);
-  rlim_list_.push_back(4.0);
-}
-
@@ -154 +191 @@
-    RListOverlaySettings set(active_color_,passive_color_,symbolsize_,symbolstrength_,
-                             res_limit_flag_,sym_points_flag_,color1_,color2_,color3_,
+                             rlim_list_,
-                             e->parentWidget());
-    if(set.exec()==QDialog::Accepted) {
@@ -159 +197 @@
-      res_limit_flag_=set.res_lim;
-      sym_points_flag_=set.sym_rel;
+      rlim_list_=set.rlim_list_;
-      color1_=set.color1;
-      color2_=set.color2;
@@ -262 +301 @@
-void RListOverlay::DrawResolutionCircles(QPainter& pnt, DataViewerPanel* dvp, const QColor& color)
-{
-
-
-
+
+
-  
-  pnt.setPen(color);
@@ -273 +311 @@
-  
-  for(std::vector<double>::const_iterator it=rlim_list_.begin();it!=rlim_list_.end();++it) {
-
+
+
-    
-,radius
-
+_x,radius_y
+_x
-  }
-}
@@ -310 +349 @@
-}
-
+void RListOverlay::AddResolutionRing(double value)
+{
+  rlim_list_.push_back(value);
+}
+
+void RListOverlay::RemoveResolutionRing(double value)
+{
+    std::vector<double>::iterator pos=find(rlim_list_.begin(),rlim_list_.end(),value);
+    if(pos!=rlim_list_.end()){
+        rlim_list_.erase(pos);
+    }
+}
+
+void RListOverlay::DisplayResolutionRings(bool flag)
+{
+  res_limit_flag_=flag;
+}
+
-}}}//ns

branches/qt_gui/src/ex/gui/lib/rlist_overlay.hh

@@ -17 +17 @@
-#define IPLT_EX_GUI_RLIST_OVERLAY_HH
-
+#include <QListWidget>
-#include <iplt/ex/lattice.hh>
-#include <iplt/ex/reflection_list.hh>
@@ -36 +37 @@
-  RListOverlaySettings(const QColor& ac, const QColor& pc, int ssize, int sstr, 
-                       bool rl, bool sl, const QColor& c1, const QColor& c2, const QColor& c3,
+                       const std::vector<double>& rlim_list,
-                       QWidget* p);
-
@@ -44 +46 @@
-  void OnColor2();
-  void OnColor3();
+  void OnLimAdd();
+  void OnLimRemove();
-
-public:
@@ -49 +53 @@
-  bool sym_rel;
-  QColor color1,color2,color3;
+  std::vector<double> rlim_list_;
-
-private:
@@ -54 +59 @@
-  QPushButton* c2_b_;
-  QPushButton* c3_b_;
+  QListWidget* rlim_widget_;
+  QLineEdit* rlim_edit_;
-};
-
@@ -68 +75 @@
-
-  ReflectionList GetReflectionList() const;
+  
+  virtual void AddResolutionRing(double value);
+  virtual void RemoveResolutionRing(double value);
+  virtual void DisplayResolutionRings(bool flag);
-
-protected:

branches/qt_gui/src/ex/gui/pymod/export_overlays.cc

@@ -57 +57 @@
-
-  class_<RListOverlay,bases<LatticeOverlayBase>,boost::noncopyable>("RListOverlay",init<const ReflectionList&, optional<const string&> >())
+    .def("AddResolutionRing",&RListOverlay::AddResolutionRing)
+    .def("RemoveResolutionRing",&RListOverlay::RemoveResolutionRing)
+    .def("DisplayResolutionRings",&RListOverlay::DisplayResolutionRings)
-    .def("GetReflectionList",&RListOverlay::GetReflectionList)
-    ;

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

@@ -210 +210 @@
-        QObject.connect(self.pb_,SIGNAL("clicked()"),self.OnPrev)
-        vb.addWidget(self.pb_)
+        self.jb_=QPushButton("Jump to Pattern")
+        QObject.connect(self.jb_,SIGNAL("clicked()"),self.OnJump)
+        vb.addWidget(self.jb_)
-        self.setLayout(vb)
-    def OnNext(self):
@@ -231 +234 @@
-        else:
-            self.emit(SIGNAL("LoadImage"),self.im_list_[self.current_])
+
+    def OnJump(self):
+        (name,ok)=QInputDialog.getText(self,"Jump to Image","Image Name:")
+        if not ok:
+          return
+        self.DoJump(name)
+
+    def DoJump(self,name):
+        i=0
+        for (imname,filename) in self.im_list_:
+            if name == imname:
+                if os.path.isfile(os.path.join(self.wdir_,self.im_list_[i][0],"ignore")):
+                    return
+                self.current_=i
+                self.check_vis()
+                print self.im_list_[self.current_]
+                self.emit(SIGNAL("LoadImage"),self.im_list_[self.current_])
+                return 
+            i+=1
+        msg_box=QMessageBox()
+        msg_box.setText("The image %s could not be found." % (name) )
+        msg_box.exec_()
-            
-    def check_vis(self):
@@ -333 +358 @@
-        self.verify_lattice_view_=VerifyLattice(self.pinfo_,self.im_list_w_)
-        QObject.connect(self.im_list_w_,SIGNAL("LoadImage"),self.OnLoadVerifiedLattice)
-OnNext(
+DoJump(self.w_im_label_.text()
-
-    def OnLoadVerifiedLattice(self,im_list_entry):

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

@@ -37 +37 @@
-        sigiobs=rp.Get("sigiobs")
-        blist1.Add(rr,iobs,1.0/(sigiobs*sigiobs))
-[str(rp.GetIndex())]
+str(rp.GetIndex())
-
-    pd1=gui.PlotData()
@@ -140 +140 @@
-
-        self.rov_=exgui.RListOverlay(rlist)
+        self.rov_.AddResolutionRing(5.0)
+        self.rov_.AddResolutionRing(4.0)
+        self.rov_.AddResolutionRing(3.0)
+        self.rov_.AddResolutionRing(2.0)
+        self.rov_.DisplayResolutionRings(True)
-        self.rov_.SetReferenceCell(self.suc_)
-