Changeset 4480

Timestamp:

08/04/04 16:34:14 (20 years ago)

Author:

merck

Message:

MMerck: Laser positions are now double precission in the LUTs
MMerck: Changed path to directory where to look for LUTs.

File:

• trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amclookuptable.cpp (modified) (3 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amclookuptable.cpp

@@ -38 +38 @@
         qDebug( "Searching for LUT near Alt: %2d Az: %3d", iZd, iAz );
 
-        QDir shareDir( "/home/amc/share/amc", "*.lut" );
+        QDir shareDir( "/home/amc/AMC/share/amc", "*.lut" );
 
         int iZdMin = 90;
@@ -109 +109 @@
                         {
                                 AMCMirrorPanel* pPanel = g_theMirror->panelAt( i, j );
-                                line.sprintf( "%3d %3d\t%5d\t%5d\t%5d\t%5d\n",
+                                line.sprintf( "%3d %3d\t%5d\t%5d\t%7.2f\t%7.2f\n",
                                                                                         pPanel->i(),
                                                                                         pPanel->j(),
@@ -140 +140 @@
                                 continue;
                                         
-                        int ii, ij, iX, iY, iLaserX, iLaserY;
-                        sscanf( line.data(),"%d %d %d %d %d %d",
-                                                        &ii, &ij, &iX, &iY, &iLaserX, &iLaserY );
+                        int ii, ij, iX, iY;
+                        double dLaserX, dLaserY;
+                        sscanf( line.data(),"%d %d %d %d %f %f",
+                                                        &ii, &ij, &iX, &iY, &dLaserX, &dLaserY );
                         AMCMirrorPanel* pPanel = g_theMirror->panelAt( ii+8, ij+8 );
                         pPanel->setRefX( iX );
                         pPanel->setRefY( iY );
-//                      pPanel->setLaserX( iLaserX );
-//                      pPanel->setLaserY( iLaserY );
+//                      pPanel->setLaserX( dLaserX );
+//                      pPanel->setLaserY( dLaserY );
                 }
         }