X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageDlg.cxx;h=0b63f5f45c84d6b108c42d302c1bb0eafab47c62;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=798b95955e26d139e2e894d290daef98a2c9b822;hpb=7417316f226b67abf0565ce2d0b9e3962a86f5a2;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx index 798b9595..0b63f5f4 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx @@ -181,9 +181,9 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co myGeodesicLabels << aPointXDegLabel << aPointYDegLabel << aPointXMinLabel << aPointYMinLabel << aPointXSecLabel << aPointYSecLabel - << aPointLatLabel << aPointLonLabel; + << aPointLonLabel << aPointLatLabel; - QtxIntSpinBox* aPointXDeg = new QtxIntSpinBox( -180, 180, 1, myTransformGroup ); + QtxIntSpinBox* aPointXDeg = new QtxIntSpinBox( -179, 179, 1, myTransformGroup ); QtxIntSpinBox* aPointYDeg = new QtxIntSpinBox( 0, 89, 1, myTransformGroup ); QtxIntSpinBox* aPointXMin = new QtxIntSpinBox( 0, 59, 1, myTransformGroup ); QtxIntSpinBox* aPointYMin = new QtxIntSpinBox( 0, 59, 1, myTransformGroup ); @@ -217,7 +217,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aTransformLayout->addWidget( aPointXMinLabel, aRow + 1, 6 ); aTransformLayout->addWidget( aPointXSec, aRow + 1, 7 ); aTransformLayout->addWidget( aPointXSecLabel, aRow + 1, 8 ); - aTransformLayout->addWidget( aPointLatLabel, aRow + 1, 9 ); + aTransformLayout->addWidget( aPointLonLabel, aRow + 1, 9 ); aTransformLayout->addWidget( aCartPointX, aRow + 1, 3, 1, 6 ); aTransformLayout->addWidget( aRefPointX, aRow + 1, 3, 1, 6 ); @@ -230,7 +230,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aTransformLayout->addWidget( aPointYMinLabel, aRow + 2, 6 ); aTransformLayout->addWidget( aPointYSec, aRow + 2, 7 ); aTransformLayout->addWidget( aPointYSecLabel, aRow + 2, 8 ); - aTransformLayout->addWidget( aPointLonLabel, aRow + 2, 9 ); + aTransformLayout->addWidget( aPointLatLabel, aRow + 2, 9 ); aTransformLayout->addWidget( aCartPointY, aRow + 2, 3, 1, 6 ); aTransformLayout->addWidget( aRefPointY, aRow + 2, 3, 1, 6 ); @@ -368,8 +368,28 @@ void HYDROGUI_ImportImageDlg::reset() myCartPointXMap[ aPointType ]->clear(); myCartPointYMap[ aPointType ]->clear(); } - myPointCEnabler->setChecked( true ); - myPointCEnabler->toggle(); + + // Emulate turning off C point usage + myPointCEnabler->blockSignals( true ); + + myPointCEnabler->setChecked( false ); + myPointBtnMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointXMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointYMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointXDegMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointYDegMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointXMinMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointYMinMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointXSecMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myPointYSecMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myCartPointXMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myCartPointYMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myRefPointXMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + myRefPointYMap[ HYDROGUI_PrsImage::PointC ]->setEnabled( false ); + onSetCIsUsed( false ); + + myPointCEnabler->blockSignals( false ); + myTransformGroup->setEnabled( false ); myRefImage->clear();