Changeset 4485 for trunk/MagicSoft/AMC

Timestamp:

08/04/04 16:40:21 (20 years ago)

Author:

merck

Message:

MMerck: Handel laser positions as doubles.

Location:

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol

Files:

• calibratelasermovementdialog.cpp (modified) (5 diffs)
• calibratelasermovementdialog.h (modified) (2 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/calibratelasermovementdialog.cpp

@@ -145 +145 @@
                                 double dMaxX, dMaxY;
                                 m_pXLinearRegression->reset();
-                                for( int j= -2700; j<=2700; j+=300)
+                                for( int j= -1200; j<=1200; j+=300)
                                 {
                                         checkStop();
                                         processSpot( j, 0 );
-                                        m_pXLinearRegression->addPoint( m_iSpotX, m_iSpotY );
-                                        if( m_iSpotX != -1 )
+                                        m_pXLinearRegression->addPoint( m_dSpotX, m_dSpotY );
+                                        if( m_dSpotX != -1. )
                                         {
                                                 if ( iMinJ < -3000 )
                                                 {
                                                         iMinJ = j;
-                                                        dMinX = m_iSpotX;
-                                                        dMinY = m_iSpotY;
+                                                        dMinX = m_dSpotX;
+                                                        dMinY = m_dSpotY;
                                                 }
                                                 else
                                                 {
                                                         iMaxJ = j;
-                                                        dMaxX = m_iSpotX;
-                                                        dMaxY = m_iSpotY;
+                                                        dMaxX = m_dSpotX;
+                                                        dMaxY = m_dSpotY;
                                                 }
                                         }
-                                        m_qtsStream << j << " " << 0 << " " << m_iSpotX << " " << m_iSpotY << " ";
+                                        m_qtsStream << j << " " << 0 << " " << m_dSpotX << " " << m_dSpotY << " ";
                                         m_qtsStream << m_pXLinearRegression->getAxis() << " " << m_pXLinearRegression->getSlope() << endl;
                                         QCustomEvent* pEvent = new QCustomEvent( X_SPOT_EVENT );
@@ -192 +192 @@
                                 iMaxJ = -4000;
                                 m_pYLinearRegression->reset();
-                                for( int j= -2700; j<=2700; j+=300)
+                                for( int j= -1200; j<=1200; j+=300)
                                 {
                                         checkStop();
                                         processSpot( 0, j );
-                                        m_pYLinearRegression->addPoint( m_iSpotX, m_iSpotY );
-                                        if( m_iSpotX != -1 )
+                                        m_pYLinearRegression->addPoint( m_dSpotX, m_dSpotY );
+                                        if( m_dSpotX != -1. )
                                         {
                                                 if ( iMinJ < -3000 )
                                                 {
                                                         iMinJ = j;
-                                                        dMinX = m_iSpotX;
-                                                        dMinY = m_iSpotY;
+                                                        dMinX = m_dSpotX;
+                                                        dMinY = m_dSpotY;
                                                 }
                                                 else
                                                 {
                                                         iMaxJ = j;
-                                                        dMaxX = m_iSpotX;
-                                                        dMaxY = m_iSpotY;
+                                                        dMaxX = m_dSpotX;
+                                                        dMaxY = m_dSpotY;
                                                 }
                                         }
-                                        m_qtsStream << 0 << " " << j << " " << m_iSpotX << " " << m_iSpotY << " ";
+                                        m_qtsStream << 0 << " " << j << " " << m_dSpotX << " " << m_dSpotY << " ";
                                         m_qtsStream << m_pYLinearRegression->getAxis() << " " << m_pYLinearRegression->getSlope() << endl;
                                         QCustomEvent* pEvent = new QCustomEvent( Y_SPOT_EVENT );
@@ -357 +357 @@
 
 /** Find the Laser spot */
-void CalibrateLaserMovementDialog::findSpot( int& p_iX, int& p_iY )
+void CalibrateLaserMovementDialog::findSpot( double& p_dX, double& p_dY )
 {
   int threshold = getThreshold();
@@ -399 +399 @@
         {
                 VideoSpot* pSpot = m_qlSpotList.first();
-                p_iX = pSpot->getX();
-                p_iY = pSpot->getY();
+                p_dX = pSpot->getX();
+                p_dY = pSpot->getY();
         }
         else
         {
-                p_iX = -1;
-                p_iY = -1;
+                p_dX = -1.;
+                p_dY = -1.;
         }
 }
@@ -468 +468 @@
 
         substractDark();
-        findSpot( m_iSpotX, m_iSpotY );
-        qsMsg.sprintf("Spot at: (%d,%d)", m_iSpotX, m_iSpotY );
+        findSpot( m_dSpotX, m_dSpotY );
+        qsMsg.sprintf("Spot at: (%6.1f,%6.1f)", m_dSpotX, m_dSpotY );
         outputProgress( qsMsg );
 

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/calibratelasermovementdialog.h

@@ -31 +31 @@
 private:
         void processSpot( int p_iX, int p_iY );
-        void findSpot( int& p_iY, int& p_iY );
+        void findSpot( double& p_dY, double& p_dY );
         int getThreshold();
         void checkStop();
@@ -48 +48 @@
         uchar*                                          m_pDark;
         bool                                                    m_zRun;
-        int                                                             m_iSpotX;
-        int                                                             m_iSpotY;
+        double                                          m_dSpotX;
+        double                                          m_dSpotY;
         QFile                                                   m_qfFile;
         QTextStream                             m_qtsStream;