SFELPHOTON-1356: deployed version

ARESvis/ARESvis.py

@@ -307,7 +307,7 @@ class ARESdevice():
 
     pm=pic['di'] #diode 2
     w,h=pm.width(),pm.height()
-    qp.setTransform(tf2Th);qp.rotate(54);qp.translate(0,-290-71);qp.scale(.64,.64)
+    qp.setTransform(tf2Th);qp.rotate(54);qp.translate(0,-240);qp.scale(.64,.64)
     qp.drawPixmap(QPointF(-w/2,-h/2),pm)
 
     pm=pic['df'] #diffrantometer
@@ -327,7 +327,7 @@ class ARESdevice():
 
     pm=pic['di'] #diode
     w,h=pm.width(),pm.height()
-    qp.setTransform(tfDet);qp.rotate(165.4);qp.translate(-0, -205);qp.scale(.32,.32)
+    qp.setTransform(tfDet);qp.rotate(165.4);qp.translate(-0, -205);qp.scale(.64,.64)
     qp.drawPixmap(QPointF(-w/2,-h/2),pm)
 
     #--- RIXS-arm devices ---
@@ -352,10 +352,10 @@ class ARESdevice():
     qp.setTransform(tf2Th);qp.translate(-20,-r2Th-40);qp.rotate(-2);qp.translate(0,tzFM)
     qp.drawRect(-30, 0, 30, 310) # foc. mirror 2
 
-    qp.setTransform(tf2Th);qp.rotate(54);qp.translate(-diW/2,-r2Th);
+    qp.setTransform(tf2Th);qp.rotate(54);qp.translate(-diW/2,-rDet-diH) #-r2Th-50
     qp.drawRect(0, 0, diW, diH) # diode2
-    qp.setTransform(tf2Th);qp.rotate(80);qp.translate(-diW/2,-r2Th);
-    qp.drawRect(0, 0, diW, diH) # diode3
+    #qp.setTransform(tf2Th);qp.rotate(80);qp.translate(-diW/2,-r2Th);
+    #qp.drawRect(0, 0, diW, diH) # diode3
 
     #--- Jungfrau devices ---
     qp.setTransform(tfJFr)
@@ -393,7 +393,7 @@ class ARESdevice():
     qp.setBrush(QColor(192,192,0,192))
     #x,x0,y,y0=3*50.8,3*12,3*50.8,3*12
     x,x0,y,y0=50.8,12,50.8,4
-    qp.translate(txPar-x/2, tyPar)
+    qp.translate(txPar-x/2+61, tyPar)
     path=QPainterPath()
     path.moveTo(0,0)
     path.cubicTo(0,y/2,x/2,y,x,y)