Changeset 4505 for trunk/MagicSoft

Timestamp:

08/04/04 18:26:03 (20 years ago)

Author:

merck

Message:

MMerck: Added code to calculate corrected reference position for
MMerck: laser spot. Now we take the corrected position as the reference
MMerck: where we want to adjust to.

File:

• trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/laseradjustthread.cpp (modified) (2 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/laseradjustthread.cpp

@@ -212 +212 @@
 void LaserAdjustThread::getDistToRef( double& p_dX, double& p_dY )
 {
-        double dRefX = m_pPanel->getLaserX();
-        double dRefY = m_pPanel->getLaserY();
+        double dRefX;
+        double dRefY;
+//      dRefX = m_pPanel->getLaserX();
+//      dRefY = m_pPanel->getLaserY();
+        m_pPanel->getCorrectedRef( dRefX, dRefY );
 
         // Adapt spot for shift of camera center.
@@ -233 +236 @@
 {
   double dX, dY;
-//      if( m_pPanel->isReversed() )
-//              getDistToRef(dY, dX );
-//  else
+
         getDistToRef( dX, dY );
         m_pPanel->calcSteps( dX, dY, p_iX, p_iY );