Changeset 4506
- Timestamp:
- 08/04/04 18:27:29 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videodisplay.cpp
r4494 r4506 154 154 RefY->setText( QString::number( m_pPanel->getLaserY() ) ); 155 155 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 ); 156 160 GRefX->setText( QString::number( g_dRefX ) ); 157 161 GRefY->setText( QString::number( g_dRefY ) ); … … 183 187 enableButtons( false ); 184 188 g_theApp->processEvents(); 189 185 190 qDebug("Creating center thread"); 186 191 m_pCenterThread = new CenterThread( this ); … … 188 193 qDebug("Starting center thread"); 189 194 m_pCenterThread->start(); 195 190 196 /* try 191 197 { … … 233 239 234 240 enableButtons( false ); 235 //halt( true );241 halt( true ); 236 242 try 237 243 { … … 252 258 } 253 259 enableButtons( true ); 254 //halt( false ); 260 261 halt( false ); 255 262 return; 256 263 … … 341 348 void VideoDisplay::adjustRefSlot() 342 349 { 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 345 356 qDebug("Reference: %5.1f %5.1f", dRefX, dRefY ); 346 357 if( ( dRefX < 0. ) && ( dRefY < 0. ) )
Note:
See TracChangeset
for help on using the changeset viewer.