Changeset 4506 for trunk

Timestamp:

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

Author:

merck

Message:

MMerck: Added code to set the corrected laser position also to the
MMerck: videoframe and use the corrected position when adjusting to the
MMerck: reference.

File:

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

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

@@ -154 +154 @@
         RefY->setText( QString::number( m_pPanel->getLaserY() ) );
         m_videoFrame->setRef( m_pPanel->getLaserX(), m_pPanel->getLaserY() );
+        double dX, dY;
+        dX = m_pPanel->getLaserX();
+  m_pPanel->getCorrectedRef( dX, dY);
+        m_videoFrame->setCorrRef( dX, dY );
         GRefX->setText( QString::number( g_dRefX ) );
         GRefY->setText( QString::number( g_dRefY ) );
@@ -183 +187 @@
         enableButtons( false );
         g_theApp->processEvents();
+
         qDebug("Creating center thread");
         m_pCenterThread = new CenterThread( this );
@@ -188 +193 @@
         qDebug("Starting center thread");
         m_pCenterThread->start();
+
 /*      try
         {
@@ -233 +239 @@
         
         enableButtons( false );
-//halt( true );
+  halt( true );
         try
         {
@@ -252 +258 @@
         }
         enableButtons( true );
-//halt( false );
+
+  halt( false );
         return;
         
@@ -341 +348 @@
 void VideoDisplay::adjustRefSlot()
 {
-        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 );
+
   qDebug("Reference: %5.1f %5.1f", dRefX, dRefY );
         if( ( dRefX < 0. ) && ( dRefY < 0. ) )