Changeset 4507 for trunk/MagicSoft

Timestamp:

08/04/04 18:29:35 (20 years ago)

Author:

merck

Message:

MMerck: Added setter to set the corrected reference position.
MMerck: We draw both laser reference positions. The stored during
MMerck: Roque lamp calibration and the corrected one for infinity
MMerck: focus.
CVc: Committing in .

Location:

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol

Files:

• videoframe.cpp (modified) (3 diffs)
• videoframe.h (modified) (2 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videoframe.cpp

@@ -125 +125 @@
         windowPainter->drawEllipse( LED4_X-4, LED4_Y-4, 9, 9);
 
-        // Draw the calibration pointa and the regression fits.
+        // Draw the calibration points and the regression fits.
         if( m_pCalibDlg != 0 )
         {
@@ -183 +183 @@
         if( m_dRefX > 0)
         {
+                // Draw a green rectangle showing the reference point for this panel
                 windowPainter->setPen( Qt::green );
                 if( m_dCenterX > 1.0 )
@@ -193 +194 @@
                 } else
                         windowPainter->drawRect( m_dRefX-4., m_dRefY-4., 9., 9. );
+        }
+
+        // Draw a cyan rectangle showing the corrected reference point for this panel
+        if( m_dRef1X > 0)
+        {
+                windowPainter->setPen( Qt::cyan );
+                if( m_dCenterX > 1.0 )
+                {
+                        // Adapt spot for shift of camera center.
+                        double dDx, dDy;
+                        dDx = m_dCenterX - CAMERA_X;
+                        dDy = m_dCenterY - CAMERA_Y;
+                        windowPainter->drawRect( m_dRef1X+dDx-4., m_dRef1Y+dDy-4., 9., 9. );
+                } else
+                        windowPainter->drawRect( m_dRef1X-4., m_dRef1Y-4., 9., 9. );
+
         }
 

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videoframe.h

@@ -51 +51 @@
   /** Set the reference position */
   void setRef( double p_dX, double p_dY ) { m_dRefX = p_dX; m_dRefY = p_dY; };
+  /** Set the corrected reference position */
+  void setCorrRef( double p_dX, double p_dY ) { m_dRef1X = p_dX; m_dRef1Y = p_dY; };
   /** Set list of spots used to calibrate panel movement */
   void setCalibDlg( CalibratePanelDialog* p_pDlg ) { m_pCalibDlg = p_pDlg; };
@@ -104 +106 @@
   double m_dRefY;
   /**  */
+  double m_dRef1X;
+  /**  */
+  double m_dRef1Y;
+  /**  */
   double m_dCenterX;
   /**  */