Changeset 4507


Ignore:
Timestamp:
08/04/04 18:29:35 (20 years ago)
Author:
merck
Message:
MMerck: Added setter to set the corrected reference position.
MMerck: We draw both laser reference positions. The stored during
MMerck: Roque lamp calibration and the corrected one for infinity
MMerck: focus.
CVc: Committing in .
Location:
trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol
Files:
2 edited

Legend:

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

    r4495 r4507  
    125125        windowPainter->drawEllipse( LED4_X-4, LED4_Y-4, 9, 9);
    126126
    127         // Draw the calibration pointa and the regression fits.
     127        // Draw the calibration points and the regression fits.
    128128        if( m_pCalibDlg != 0 )
    129129        {
     
    183183        if( m_dRefX > 0)
    184184        {
     185                // Draw a green rectangle showing the reference point for this panel
    185186                windowPainter->setPen( Qt::green );
    186187                if( m_dCenterX > 1.0 )
     
    193194                } else
    194195                        windowPainter->drawRect( m_dRefX-4., m_dRefY-4., 9., 9. );
     196        }
     197
     198        // Draw a cyan rectangle showing the corrected reference point for this panel
     199        if( m_dRef1X > 0)
     200        {
     201                windowPainter->setPen( Qt::cyan );
     202                if( m_dCenterX > 1.0 )
     203                {
     204                        // Adapt spot for shift of camera center.
     205                        double dDx, dDy;
     206                        dDx = m_dCenterX - CAMERA_X;
     207                        dDy = m_dCenterY - CAMERA_Y;
     208                        windowPainter->drawRect( m_dRef1X+dDx-4., m_dRef1Y+dDy-4., 9., 9. );
     209                } else
     210                        windowPainter->drawRect( m_dRef1X-4., m_dRef1Y-4., 9., 9. );
     211
    195212        }
    196213
  • trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/videoframe.h

    r4495 r4507  
    5151  /** Set the reference position */
    5252  void setRef( double p_dX, double p_dY ) { m_dRefX = p_dX; m_dRefY = p_dY; };
     53  /** Set the corrected reference position */
     54  void setCorrRef( double p_dX, double p_dY ) { m_dRef1X = p_dX; m_dRef1Y = p_dY; };
    5355  /** Set list of spots used to calibrate panel movement */
    5456  void setCalibDlg( CalibratePanelDialog* p_pDlg ) { m_pCalibDlg = p_pDlg; };
     
    104106  double m_dRefY;
    105107  /**  */
     108  double m_dRef1X;
     109  /**  */
     110  double m_dRef1Y;
     111  /**  */
    106112  double m_dCenterX;
    107113  /**  */
Note: See TracChangeset for help on using the changeset viewer.