rectangle background

graphExample.py

@@ -217,6 +217,7 @@ class RIXSgrating(QWidget):
           w.setToolTip(inf)
           l.addWidget(w, i,1)
         w=QtGui.QPushButton('move all motors')
+        w.clicked.connect(self.btnMoveAllMotors)
         l.addWidget(w, i+1, 1)
 
 
@@ -255,7 +256,7 @@ class RIXSgrating(QWidget):
         w=wGeo.findChild(QtGui.QLineEdit, k)
         w.setText(f'{geo[i]:.6g}')
 
-      raw=vlsg.geometry2raw(geo)
+      p['raw']=raw=vlsg.geometry2raw(geo)
       wRaw=self._wdGrpRaw
       for i,k in enumerate(('MT','GTZ','GTY1','GTY2','GRX','GTX','DTZ','DTY1','DTY2','DRX',)):
         w=wRaw.findChild(QtGui.QLineEdit, k)
@@ -265,7 +266,7 @@ class RIXSgrating(QWidget):
           w.setText(f'{raw[i]:.6g}')
 
     def sldChanged(self,key,val,*args,**kwargs):
-      print(key,val)
+      #print(key,val)
       p=self._param
       if key=='energy':
         self.setEnergy(val)
@@ -275,6 +276,12 @@ class RIXSgrating(QWidget):
           del p['geo']
       self.update()
 
+    def btnMoveAllMotors(self):
+      p=self._param
+      print(f'energy:{p["energy"]}')
+      print(f'geometry:{p["geo"]}')
+      print(f'raw motors:{p["raw"]}')
+
     def paintEvent(self, e):
         p=self._param
         r1=p['r1']
@@ -296,12 +303,12 @@ class RIXSgrating(QWidget):
         ctr=(max(ctr[0],w+r1),max(w+r2*np.sin((aa+bb)*np.pi/180),ctr[1]))
         qp.translate(ctr[0],ctr[1])
         qp.setBrush(QColor(0, 0, 0))
-        qp.drawRect(-r1, -w, r1, 2*w)
-        qp.drawEllipse(-r1-w, -w, 2*w, 2*w)
+        qp.drawRect(-r1-w, -w, r1+w, 2*w)
+        #qp.drawEllipse(-r1-w, -w, 2*w, 2*w)
         qp.drawEllipse(-w, -w, 2*w, 2*w)
         qp.rotate(180-aa-bb)
-        qp.drawRect(-r2, -w, r2, 2*w)
-        qp.drawEllipse(-r2-w, -w, 2*w, 2*w)
+        qp.drawRect(-r2-w, -w, r2+w, 2*w)
+        #qp.drawEllipse(-r2-w, -w, 2*w, 2*w)
 
         #plot beam path
         qp.setTransform(QtGui.QTransform())