Changeset 4506


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videodisplay.cpp

    r4494 r4506  
    154154        RefY->setText( QString::number( m_pPanel->getLaserY() ) );
    155155        m_videoFrame->setRef( m_pPanel->getLaserX(), m_pPanel->getLaserY() );
     156        double dX, dY;
     157        dX = m_pPanel->getLaserX();
     158  m_pPanel->getCorrectedRef( dX, dY);
     159        m_videoFrame->setCorrRef( dX, dY );
    156160        GRefX->setText( QString::number( g_dRefX ) );
    157161        GRefY->setText( QString::number( g_dRefY ) );
     
    183187        enableButtons( false );
    184188        g_theApp->processEvents();
     189
    185190        qDebug("Creating center thread");
    186191        m_pCenterThread = new CenterThread( this );
     
    188193        qDebug("Starting center thread");
    189194        m_pCenterThread->start();
     195
    190196/*      try
    191197        {
     
    233239       
    234240        enableButtons( false );
    235 //halt( true );
     241  halt( true );
    236242        try
    237243        {
     
    252258        }
    253259        enableButtons( true );
    254 //halt( false );
     260
     261  halt( false );
    255262        return;
    256263       
     
    341348void VideoDisplay::adjustRefSlot()
    342349{
    343         double dRefX = m_pPanel->getLaserX();
    344         double dRefY = m_pPanel->getLaserY();
     350        double dRefX;
     351        double dRefY;
     352//      dRefX = m_pPanel->getLaserX();
     353//      dRefY = m_pPanel->getLaserY();
     354  m_pPanel->getCorrectedRef( dRefX, dRefY );
     355
    345356  qDebug("Reference: %5.1f %5.1f", dRefX, dRefY );
    346357        if( ( dRefX < 0. ) && ( dRefY < 0. ) )
Note: See TracChangeset for help on using the changeset viewer.