Changeset 4173

Timestamp:

05/25/04 14:11:25 (21 years ago)

Author:

merck

Message:

Changes to recalculate reference position when camera center moves.

File:

• trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videodisplay.cpp (modified) (4 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videodisplay.cpp

@@ -19 +19 @@
 #include "amclog.h"
 #include "amcmotor.h"
+#include "amcdefs.h"
 #include "amcmirrorpanel.h"
 #include "amcprogdlg.h"
@@ -271 +272 @@
         Y_Dec_10_Button->setEnabled( p_zEnable );
         Y_Dec_100_Button->setEnabled( p_zEnable );
-                
+
         if( p_zEnable )
         {
@@ -337 +338 @@
         if( ( iRefX == -1 ) && ( iRefY == -1 ) )
                 return;
+        int iDx, iDy;
+        iDx = m_videoFrame->m_iCenterX - CAMERA_X;
+        iDy = m_videoFrame->m_iCenterY - CAMERA_Y;
+        iRefX += iDx;
+        iRefY += iDy;
         int iStepX, iStepY;
         calcSteps( iRefX, iRefY, iStepX, iStepY );
@@ -359 +365 @@
         if( ( iVSpotX == -1 ) && ( iVSpotY == -1 ) )
                 return;
-        qDebug("Spot at x,y: %4d %4d", iVSpotX, iVSpotY );      
-        qDebug("Ref  at x,y: %4d %4d", p_iRefX, p_iRefY );      
+        qDebug("Spot at x,y: %4d %4d", iVSpotX, iVSpotY );
+        qDebug("Ref  at x,y: %4d %4d", p_iRefX, p_iRefY );
 
         double dX = p_iRefX - iVSpotX;