X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageDlg.cxx;h=74fcfc1cf8f3de45f09bad785c77cb45f24b1197;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=158af2da7794c495e3e5d9b5eff20c543263e3c4;hpb=c0c1c32d5b02cf382e2567a12760cb541573cadb;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx index 158af2da..74fcfc1c 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx @@ -24,9 +24,16 @@ #include "HYDROGUI_PrsImage.h" #include "HYDROGUI_Tool.h" +#include "HYDROGUI_Module.h" +#include +#include + +#include #include #include +#include +#include #include #include @@ -43,14 +50,16 @@ #include #include #include +#include HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, const QString& theTitle ) -: HYDROGUI_InputPanel( theModule, theTitle ) +: HYDROGUI_InputPanel( theModule, theTitle ), + myIsInitialized( false ) { SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); // Import image from file - myFileNameGroup = new QGroupBox( tr( "IMPORT_IMAGE_FROM_FILE" ) ); + myFileNameGroup = new QGroupBox( tr( "IMPORT_IMAGE_FROM_FILE" ), this ); QLabel* aFileNameLabel = new QLabel( tr( "FILE_NAME" ), myFileNameGroup ); @@ -68,7 +77,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aFileNameLayout->addWidget( aBrowseBtn ); // Image name - myImageNameGroup = new QGroupBox( tr( "IMAGE_NAME" ) ); + myImageNameGroup = new QGroupBox( tr( "IMAGE_NAME" ), this ); QLabel* anImageNameLabel = new QLabel( tr( "NAME" ), myImageNameGroup ); myImageName = new QLineEdit( myImageNameGroup ); @@ -80,7 +89,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co anImageNameLayout->addWidget( myImageName ); // Transform image - myTransformGroup = new QGroupBox( tr( "TRANSFORM_IMAGE" ) ); + myTransformGroup = new QGroupBox( tr( "TRANSFORM_IMAGE" ), this ); // Make a pixmap for arrow QPixmap anArrowPixmap = aResMgr->loadPixmap( "HYDRO", tr( "ARROW_RIGHT_ICO" ) ); @@ -93,35 +102,51 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aPainter.drawPixmap( 0, 0, anArrowPixmap ); aPainter.end(); - QRadioButton* aManualBtn = new QRadioButton( tr( "MANUALLY" ), myTransformGroup ); + QRadioButton* aManualGeodesicBtn = new QRadioButton( tr( "MANUALLY_GEODESIC" ), myTransformGroup ); + QRadioButton* aManualCartesianBtn = new QRadioButton( tr( "MANUALLY_LAMBERT93" ), myTransformGroup ); QRadioButton* aRefImageBtn = new QRadioButton( tr( "BY_REFERENCE_IMAGE" ), myTransformGroup ); myModeGroup = new QButtonGroup( myTransformGroup ); - myModeGroup->addButton( aManualBtn, Manual ); - myModeGroup->addButton( aRefImageBtn, RefImage ); - - QBoxLayout* aModeLayout = new QHBoxLayout(); - aModeLayout->setMargin( 0 ); - aModeLayout->setSpacing( 5 ); - aModeLayout->addWidget( aManualBtn ); - aModeLayout->addWidget( aRefImageBtn ); - - myRefImageWg = new QWidget( myTransformGroup ); - QLabel* aRefImageLabel = new QLabel( tr( "REFERENCE_IMAGE" ), myRefImageWg ); - myRefImage = new QComboBox( myRefImageWg ); + myModeGroup->addButton( aManualGeodesicBtn, HYDROData_Image::ManualGeodesic ); + myModeGroup->addButton( aManualCartesianBtn, HYDROData_Image::ManualCartesian ); + myModeGroup->addButton( aRefImageBtn, HYDROData_Image::ReferenceImage ); - QBoxLayout* aRefImageLayout = new QHBoxLayout( myRefImageWg ); - aRefImageLayout->setMargin( 0 ); - aRefImageLayout->setSpacing( 5 ); - aRefImageLayout->addWidget( aRefImageLabel ); - aRefImageLayout->addWidget( myRefImage ); - aRefImageLayout->setStretch( 1, 1 ); + myRefImage = new QComboBox( myTransformGroup ); QGridLayout* aTransformLayout = new QGridLayout( myTransformGroup ); aTransformLayout->setMargin( 5 ); aTransformLayout->setSpacing( 5 ); + + QGridLayout* aModeLayout = new QGridLayout( myTransformGroup ); + aModeLayout->setMargin( 0 ); + aModeLayout->setSpacing( 5 ); + aModeLayout->addWidget( aManualGeodesicBtn, 0, 0 ); + aModeLayout->addWidget( aManualCartesianBtn, 1, 0 ); + aModeLayout->addWidget( aRefImageBtn, 2, 0 ); + aModeLayout->addWidget( myRefImage, 2, 1 ); + aModeLayout->setColumnStretch( 1, 1 ); + aTransformLayout->addLayout( aModeLayout, 0, 0, 1, 9 ); - aTransformLayout->addWidget( myRefImageWg, 1, 0, 1, 9 ); + + QLabel* aImageCSLabel = new QLabel( tr( "IMAGE_CS" ), myTransformGroup ); + QLabel* aGeodesicLabel = new QLabel( tr( "GEODESIC" ), myTransformGroup ); + QLabel* aLambertLabel = new QLabel( tr( "LAMBERT93" ), myTransformGroup ); + QLabel* aRefImageLabel = new QLabel( tr( "REFERENCE_IMAGE_CS" ), myTransformGroup ); + + aTransformLayout->addWidget( aImageCSLabel, 2, 1 ); + aTransformLayout->addWidget( aGeodesicLabel, 2, 3, 1, 6 ); + aTransformLayout->addWidget( aLambertLabel, 2, 3, 1, 6 ); + aTransformLayout->addWidget( aRefImageLabel, 2, 3, 1, 6 ); + + connect( aManualCartesianBtn, SIGNAL( toggled( bool ) ), aLambertLabel, SLOT( setVisible ( bool ) ) ); + connect( aManualCartesianBtn, SIGNAL( toggled( bool ) ), aGeodesicLabel, SLOT( setHidden ( bool ) ) ); + connect( aManualCartesianBtn, SIGNAL( toggled( bool ) ), aRefImageLabel, SLOT( setHidden ( bool ) ) ); + connect( aManualGeodesicBtn, SIGNAL( toggled( bool ) ), aGeodesicLabel, SLOT( setVisible ( bool ) ) ); + connect( aManualGeodesicBtn, SIGNAL( toggled( bool ) ), aLambertLabel, SLOT( setHidden ( bool ) ) ); + connect( aManualGeodesicBtn, SIGNAL( toggled( bool ) ), aRefImageLabel, SLOT( setHidden ( bool ) ) ); + connect( aRefImageBtn, SIGNAL( toggled( bool ) ), aRefImageLabel, SLOT( setVisible ( bool ) ) ); + connect( aRefImageBtn, SIGNAL( toggled( bool ) ), aGeodesicLabel, SLOT( setHidden ( bool ) ) ); + connect( aRefImageBtn, SIGNAL( toggled( bool ) ), aLambertLabel, SLOT( setHidden ( bool ) ) ); for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) @@ -151,22 +176,34 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co QLabel* aPointYMinLabel = new QLabel( "'", myTransformGroup ); QLabel* aPointXSecLabel = new QLabel( "\"", myTransformGroup ); QLabel* aPointYSecLabel = new QLabel( "\"", myTransformGroup ); - myLambertLabels << aPointXDegLabel << aPointYDegLabel + myGeodesicLabels << aPointXDegLabel << aPointYDegLabel << aPointXMinLabel << aPointYMinLabel << aPointXSecLabel << aPointYSecLabel; QtxIntSpinBox* aPointXDeg = new QtxIntSpinBox( -180, 180, 1, myTransformGroup ); - QtxIntSpinBox* aPointYDeg = new QtxIntSpinBox( -90, 90, 1, myTransformGroup ); + QtxIntSpinBox* aPointYDeg = new QtxIntSpinBox( 0, 90, 1, myTransformGroup ); QtxIntSpinBox* aPointXMin = new QtxIntSpinBox( 0, 59, 1, myTransformGroup ); QtxIntSpinBox* aPointYMin = new QtxIntSpinBox( 0, 59, 1, myTransformGroup ); QtxDoubleSpinBox* aPointXSec = new QtxDoubleSpinBox( 0, 59.9999, 1, 4, 4, myTransformGroup ); QtxDoubleSpinBox* aPointYSec = new QtxDoubleSpinBox( 0, 59.9999, 1, 4, 4, myTransformGroup ); + QtxDoubleSpinBox* aCartPointX = new QtxDoubleSpinBox( 0, 1e8, 1, 2, 2, myTransformGroup ); + QtxDoubleSpinBox* aCartPointY = new QtxDoubleSpinBox( 0, 1e8, 1, 2, 2, myTransformGroup ); + QtxIntSpinBox* aRefPointX = new QtxIntSpinBox( 0, 0, 1, myTransformGroup ); // max is updated later QtxIntSpinBox* aRefPointY = new QtxIntSpinBox( 0, 0, 1, myTransformGroup ); // max is updated later - int aRow = 4 * aPointType + 2; - aTransformLayout->addWidget( aPointBtn, aRow, 0, 1, 9 ); + int aRow = 4 * aPointType + 3; + if ( aPointType == HYDROGUI_PrsImage::PointC ) + { + myPointCEnabler = new QCheckBox( myTransformGroup ); + aTransformLayout->addWidget( myPointCEnabler, aRow, 0, 1, 2, Qt::AlignHCenter ); + aTransformLayout->addWidget( aPointBtn, aRow, 2, 1, 7 ); + } + else + { + aTransformLayout->addWidget( aPointBtn, aRow, 0, 1, 9 ); + } aTransformLayout->addWidget( aPointXLabel, aRow + 1, 0 ); aTransformLayout->addWidget( aPointX, aRow + 1, 1 ); @@ -178,6 +215,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aTransformLayout->addWidget( aPointXSec, aRow + 1, 7 ); aTransformLayout->addWidget( aPointXSecLabel, aRow + 1, 8 ); + aTransformLayout->addWidget( aCartPointX, aRow + 1, 3, 1, 6 ); aTransformLayout->addWidget( aRefPointX, aRow + 1, 3, 1, 6 ); aTransformLayout->addWidget( aPointYLabel, aRow + 2, 0 ); @@ -189,6 +227,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aTransformLayout->addWidget( aPointYSec, aRow + 2, 7 ); aTransformLayout->addWidget( aPointYSecLabel, aRow + 2, 8 ); + aTransformLayout->addWidget( aCartPointY, aRow + 2, 3, 1, 6 ); aTransformLayout->addWidget( aRefPointY, aRow + 2, 3, 1, 6 ); if( aPointType != HYDROGUI_PrsImage::PointC ) @@ -209,6 +248,9 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co myPointXSecMap[ aPointType ] = aPointXSec; myPointYSecMap[ aPointType ] = aPointYSec; + myCartPointXMap[ aPointType ] = aCartPointX; + myCartPointYMap[ aPointType ] = aCartPointY; + myRefPointXMap[ aPointType ] = aRefPointX; myRefPointYMap[ aPointType ] = aRefPointY; @@ -216,9 +258,38 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co connect( aPointX, SIGNAL( valueChanged( int ) ), this, SLOT( onPointCoordChanged( int ) ) ); connect( aPointY, SIGNAL( valueChanged( int ) ), this, SLOT( onPointCoordChanged( int ) ) ); + + connect( aPointXDeg, SIGNAL( valueChanged( int ) ), this, SLOT( onGeodesicCoordChanged() ) ); + connect( aPointYDeg, SIGNAL( valueChanged( int ) ), this, SLOT( onGeodesicCoordChanged() ) ); + connect( aPointXMin, SIGNAL( valueChanged( int ) ), this, SLOT( onGeodesicCoordChanged() ) ); + connect( aPointYMin, SIGNAL( valueChanged( int ) ), this, SLOT( onGeodesicCoordChanged() ) ); + connect( aPointXSec, SIGNAL( valueChanged( double ) ), this, SLOT( onGeodesicCoordChanged() ) ); + connect( aPointYSec, SIGNAL( valueChanged( double ) ), this, SLOT( onGeodesicCoordChanged() ) ); + + connect( aCartPointX, SIGNAL( valueChanged( double ) ), this, SLOT( onCartesianCoordChanged() ) ); + connect( aCartPointY, SIGNAL( valueChanged( double ) ), this, SLOT( onCartesianCoordChanged() ) ); + connect( aRefPointX, SIGNAL( valueChanged( int ) ), this, SLOT( onPointCoordChanged( int ) ) ); connect( aRefPointY, SIGNAL( valueChanged( int ) ), this, SLOT( onPointCoordChanged( int ) ) ); } + + // Connect checkbox enabling point C + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointBtnMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointXMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointYMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointXDegMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointYDegMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointXMinMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointYMinMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointXSecMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myPointYSecMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myCartPointXMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myCartPointYMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myRefPointXMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), myRefPointYMap[ HYDROGUI_PrsImage::PointC ], SLOT( setEnabled( bool ) ) ); + + connect( myPointCEnabler, SIGNAL( toggled( bool ) ), SLOT( onSetCIsUsed( bool ) ) ); + aTransformLayout->setColumnStretch( 1, 1 ); // double aTransformLayout->setColumnStretch( 3, 1 ); // degrees aTransformLayout->setColumnStretch( 5, 1 ); // minutes @@ -238,7 +309,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co connect( myRefImage, SIGNAL( activated( const QString& ) ), this, SLOT( onRefImageActivated( const QString& ) ) ); - onModeActivated( Manual ); + //setTransformationMode( HYDROData_Image::ManualCartesian ); setMinimumWidth( 350 ); } @@ -247,6 +318,16 @@ HYDROGUI_ImportImageDlg::~HYDROGUI_ImportImageDlg() { } +void HYDROGUI_ImportImageDlg::onSetCIsUsed( bool theCIsUsed ) +{ + if ( !theCIsUsed && myPointBtnMap[ HYDROGUI_PrsImage::PointC ]->isChecked() ) + { + // Turn on point A selection if point C selection has been activated and we disable point C. + myPointBtnMap[ HYDROGUI_PrsImage::PointA ]->toggle(); + } + emit setCIsUsed( theCIsUsed ); +} + void HYDROGUI_ImportImageDlg::setIsEdit( const bool theIsEdit ) { myFileNameGroup->setVisible( !theIsEdit ); @@ -278,14 +359,20 @@ void HYDROGUI_ImportImageDlg::reset() myRefPointXMap[ aPointType ]->clear(); myRefPointYMap[ aPointType ]->clear(); + + myCartPointXMap[ aPointType ]->clear(); + myCartPointYMap[ aPointType ]->clear(); } + myPointCEnabler->setChecked( true ); + myPointCEnabler->toggle(); myTransformGroup->setEnabled( false ); - myModeGroup->button( Manual )->setChecked( true ); myRefImage->clear(); - onModeActivated( Manual ); + setTransformationMode( HYDROData_Image::ManualCartesian ); myPrsPointDataList.clear(); + + myIsInitialized = false; } void HYDROGUI_ImportImageDlg::setImageName( const QString& theName ) @@ -298,6 +385,16 @@ QString HYDROGUI_ImportImageDlg::getImageName() const return myImageName->text(); } +void HYDROGUI_ImportImageDlg::setRefImageName( const QString& theName ) +{ + myRefImage->setCurrentIndex( myRefImage->findText( theName ) ); +} + +QString HYDROGUI_ImportImageDlg::getRefImageName() const +{ + return myRefImage->currentText(); +} + QString HYDROGUI_ImportImageDlg::getFileName() const { return myFileName->text(); @@ -324,15 +421,33 @@ void HYDROGUI_ImportImageDlg::setImageSize( const QSize& theSize, } } +void HYDROGUI_ImportImageDlg::setTransformationMode( const int theMode ) +{ + myModeGroup->button( theMode )->setChecked( true ); + onModeActivated( theMode ); +} + int HYDROGUI_ImportImageDlg::getTransformationMode() const { - return myModeGroup->button( Manual )->isChecked() ? Manual : RefImage; + return myModeGroup->checkedId(); +} + +void HYDROGUI_ImportImageDlg::setByTwoPoints( const bool theIsByTwoPoints ) +{ + myPointCEnabler->setChecked( !theIsByTwoPoints ); +} + +bool HYDROGUI_ImportImageDlg::isByTwoPoints() const +{ + return !myPointCEnabler->isChecked(); } void HYDROGUI_ImportImageDlg::setTransformationDataMap( const TransformationDataMap& theMap, const bool theIsOnlyInput, const bool theIsRefImage ) { + blockSignalsGeodesic( true ); + blockSignalsCartesian( true ); for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) { @@ -342,17 +457,17 @@ void HYDROGUI_ImportImageDlg::setTransformationDataMap( const TransformationData QtxIntSpinBox* aPointX = theIsRefImage ? myRefPointXMap[ aPointType ] : myPointXMap[ aPointType ]; QtxIntSpinBox* aPointY = theIsRefImage ? myRefPointYMap[ aPointType ] : myPointYMap[ aPointType ]; - aPointX->setValue( aData.first.x() ); - aPointY->setValue( aData.first.y() ); + aPointX->setValue( aData.ImagePoint.x() ); + aPointY->setValue( aData.ImagePoint.y() ); if( !theIsOnlyInput && !theIsRefImage ) { - QPointF aPoint = aData.second; + QPointF aLPoint = aData.GeodesicPoint; int aXDeg = 0, aYDeg = 0; int aXMin = 0, aYMin = 0; double aXSec = 0, aYSec = 0; - HYDROGUI_Tool::DoubleToLambert( aPoint.x(), aXDeg, aXMin, aXSec ); - HYDROGUI_Tool::DoubleToLambert( aPoint.y(), aYDeg, aYMin, aYSec ); + HYDROData_Lambert93::degToDMS( aLPoint.x(), aXDeg, aXMin, aXSec ); + HYDROData_Lambert93::degToDMS( aLPoint.y(), aYDeg, aYMin, aYSec ); myPointXDegMap[ aPointType ]->setValue( aXDeg ); myPointYDegMap[ aPointType ]->setValue( aYDeg ); @@ -360,9 +475,15 @@ void HYDROGUI_ImportImageDlg::setTransformationDataMap( const TransformationData myPointYMinMap[ aPointType ]->setValue( aYMin ); myPointXSecMap[ aPointType ]->setValue( aXSec ); myPointYSecMap[ aPointType ]->setValue( aYSec ); + + QPointF aCPoint = aData.CartesianPoint; + myCartPointXMap[ aPointType ]->setValue( aCPoint.x() ); + myCartPointYMap[ aPointType ]->setValue( aCPoint.y() ); } } } + blockSignalsGeodesic( false ); + blockSignalsCartesian( false ); } bool HYDROGUI_ImportImageDlg::getTransformationDataMap( TransformationDataMap& theMap, @@ -372,8 +493,8 @@ bool HYDROGUI_ImportImageDlg::getTransformationDataMap( TransformationDataMap& t for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) { - bool anIsOk[8]; - for( int i = 0; i < 8; i++ ) + bool anIsOk[10]; + for( int i = 0; i < 10; i++ ) anIsOk[ i ] = true; QtxIntSpinBox* aPointX = theIsRefImage ? myRefPointXMap[ aPointType ] : myPointXMap[ aPointType ]; @@ -384,6 +505,7 @@ bool HYDROGUI_ImportImageDlg::getTransformationDataMap( TransformationDataMap& t int aXDeg = 0, aYDeg = 0; int aXMin = 0, aYMin = 0; double aXSec = 0, aYSec = 0; + double aXCart = 0, aYCart = 0; if( !theIsRefImage ) { aXDeg = myPointXDegMap[ aPointType ]->text().toInt( &anIsOk[2] ); @@ -392,17 +514,20 @@ bool HYDROGUI_ImportImageDlg::getTransformationDataMap( TransformationDataMap& t aYMin = myPointYMinMap[ aPointType ]->text().toInt( &anIsOk[5] ); aXSec = myPointXSecMap[ aPointType ]->text().toDouble( &anIsOk[6] ); aYSec = myPointYSecMap[ aPointType ]->text().toDouble( &anIsOk[7] ); + + aXCart = myCartPointXMap[ aPointType ]->text().toDouble( &anIsOk[8] ); + aYCart = myCartPointYMap[ aPointType ]->text().toDouble( &anIsOk[9] ); } - for( int i = 0; i < 8; i++ ) + for( int i = 0; i < 10; i++ ) if( !anIsOk[ i ] ) return false; double aX2 = 0, aY2 = 0; - HYDROGUI_Tool::LambertToDouble( aXDeg, aXMin, aXSec, aX2 ); - HYDROGUI_Tool::LambertToDouble( aYDeg, aYMin, aYSec, aY2 ); + HYDROData_Lambert93::DMSToDeg( aXDeg, aXMin, aXSec, aX2 ); + HYDROData_Lambert93::DMSToDeg( aYDeg, aYMin, aYSec, aY2 ); - TransformationData aData( QPoint( aX1, aY1 ), QPointF( aX2, aY2 ) ); + TransformationData aData( QPoint( aX1, aY1 ), QPointF( aX2, aY2 ), QPointF( aXCart, aYCart ) ); theMap[ aPointType ] = aData; } return true; @@ -414,7 +539,7 @@ void HYDROGUI_ImportImageDlg::setPrsPointDataList( const PrsPointDataList& theLi if( !myPrsPointDataList.isEmpty() ) { - myModeGroup->button( RefImage )->setEnabled( true ); + myModeGroup->button( HYDROData_Image::ReferenceImage )->setEnabled( true ); myRefImage->clear(); myRefImage->addItem( "" ); // first empty item @@ -424,45 +549,87 @@ void HYDROGUI_ImportImageDlg::setPrsPointDataList( const PrsPointDataList& theLi myRefImage->addItem( anIter.next().first ); } else - myModeGroup->button( RefImage )->setEnabled( false ); + myModeGroup->button( HYDROData_Image::ReferenceImage )->setEnabled( false ); } void HYDROGUI_ImportImageDlg::initializePointSelection() { + if( myIsInitialized ) + return; + + myIsInitialized = true; + myPointBtnMap[ HYDROGUI_PrsImage::PointA ]->setChecked( true ); - // ouv: tmp - myPointXDegMap[ HYDROGUI_PrsImage::PointA ]->setValue( 50 ); - myPointXMinMap[ HYDROGUI_PrsImage::PointA ]->setValue( 0 ); - myPointXSecMap[ HYDROGUI_PrsImage::PointA ]->setValue( 0 ); - myPointYDegMap[ HYDROGUI_PrsImage::PointA ]->setValue( 50 ); - myPointYMinMap[ HYDROGUI_PrsImage::PointA ]->setValue( 0 ); - myPointYSecMap[ HYDROGUI_PrsImage::PointA ]->setValue( 0 ); - - myPointXDegMap[ HYDROGUI_PrsImage::PointB ]->setValue( 50 ); - myPointXMinMap[ HYDROGUI_PrsImage::PointB ]->setValue( 1 ); - myPointXSecMap[ HYDROGUI_PrsImage::PointB ]->setValue( 0 ); - myPointYDegMap[ HYDROGUI_PrsImage::PointB ]->setValue( 50 ); - myPointYMinMap[ HYDROGUI_PrsImage::PointB ]->setValue( 0 ); - myPointYSecMap[ HYDROGUI_PrsImage::PointB ]->setValue( 0 ); - - myPointXDegMap[ HYDROGUI_PrsImage::PointC ]->setValue( 50 ); - myPointXMinMap[ HYDROGUI_PrsImage::PointC ]->setValue( 0 ); - myPointXSecMap[ HYDROGUI_PrsImage::PointC ]->setValue( 0 ); - myPointYDegMap[ HYDROGUI_PrsImage::PointC ]->setValue( 50 ); - myPointYMinMap[ HYDROGUI_PrsImage::PointC ]->setValue( 1 ); - myPointYSecMap[ HYDROGUI_PrsImage::PointC ]->setValue( 0 ); + double aCartX0 = LAMBERT_X0; + double aCartY0 = LAMBERT_Y0; + + blockSignalsCartesian( true ); + + myCartPointXMap[ HYDROGUI_PrsImage::PointA ]->setValue( aCartX0 ); + myCartPointYMap[ HYDROGUI_PrsImage::PointA ]->setValue( aCartY0 + IMG_DELTA ); + + myCartPointXMap[ HYDROGUI_PrsImage::PointB ]->setValue( aCartX0 + IMG_DELTA ); + myCartPointYMap[ HYDROGUI_PrsImage::PointB ]->setValue( aCartY0 + IMG_DELTA ); + + myCartPointXMap[ HYDROGUI_PrsImage::PointC ]->setValue( aCartX0 ); + myCartPointYMap[ HYDROGUI_PrsImage::PointC ]->setValue( aCartY0 ); + + for( int aPointType = HYDROGUI_PrsImage::PointA; + aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) + onCartesianCoordChanged( aPointType ); + + blockSignalsCartesian( false ); +} + +HYDROGUI_ImportImageDlg::TransformationData HYDROGUI_ImportImageDlg::ComputeTrsfData( + const int theMode, + const QPoint& theLocalPoint, + const QPointF& theGlobalPoint ) +{ + TransformationData aResTrsfData; + aResTrsfData.ImagePoint = theLocalPoint; + + double arx = theGlobalPoint.x(); + double ary = theGlobalPoint.y(); + if ( theMode == HYDROData_Image::ManualGeodesic ) + { + // Geodesic to Cartesian + double aXCart = 0, aYCart = 0; + // Interpreting arY as attitude and arX as longitude + HYDROData_Lambert93::toXY( ary, arx, aXCart, aYCart ); + + aResTrsfData.GeodesicPoint = theGlobalPoint; + aResTrsfData.CartesianPoint = QPointF( aXCart, aYCart ); + } + else if ( theMode == HYDROData_Image::ManualCartesian ) + { + // Cartesian to Geodesic + double aLonDeg = 0, aLatDeg = 0; + HYDROData_Lambert93::toGeo( arx, ary, aLatDeg, aLonDeg ); + + aResTrsfData.CartesianPoint = theGlobalPoint; + aResTrsfData.GeodesicPoint = QPointF( aLonDeg, aLatDeg ); + } + + return aResTrsfData; } void HYDROGUI_ImportImageDlg::onBrowse() { QString aFilter( tr( "IMAGE_FILTER" ) ); QString aFileName = SUIT_FileDlg::getFileName( this, "", aFilter, tr( "IMPORT_IMAGE_FROM_FILE" ), true ); - //QString aFileName = "W:/Work/HYDRO/doc/samples/1.bmp"; if( !aFileName.isEmpty() ) { QImage anImage( aFileName ); - if( !anImage.isNull() ) + if( anImage.isNull() ) + { + QString aTitle = QObject::tr( "INPUT_VALID_DATA" ); + QString aMessage = QObject::tr( "FILE_CAN_NOT_BE_IMPORTED" ). + arg( aFileName ).arg( QFileInfo( aFileName ).suffix() ); + SUIT_MessageBox::warning( module()->getApp()->desktop(), aTitle, aMessage ); + } + else { myFileName->setText( aFileName ); emit createPreview( anImage ); @@ -474,26 +641,34 @@ void HYDROGUI_ImportImageDlg::onBrowse() void HYDROGUI_ImportImageDlg::onModeActivated( int theMode ) { - bool anIsManual = theMode == Manual; + bool anIsManualGeodesic = theMode == HYDROData_Image::ManualGeodesic; + bool anIsManualCartesian = theMode == HYDROData_Image::ManualCartesian; + bool anIsRefImage = theMode == HYDROData_Image::ReferenceImage; + + myRefImage->setEnabled( anIsRefImage ); + for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) { - myRefImageWg->setVisible( !anIsManual ); - - myPointXDegMap[ aPointType ]->setVisible( anIsManual ); - myPointYDegMap[ aPointType ]->setVisible( anIsManual ); - myPointXMinMap[ aPointType ]->setVisible( anIsManual ); - myPointYMinMap[ aPointType ]->setVisible( anIsManual ); - myPointXSecMap[ aPointType ]->setVisible( anIsManual ); - myPointYSecMap[ aPointType ]->setVisible( anIsManual ); - - myRefPointXMap[ aPointType ]->setVisible( !anIsManual ); - myRefPointYMap[ aPointType ]->setVisible( !anIsManual ); + myPointXDegMap[ aPointType ]->setVisible( anIsManualGeodesic ); + myPointYDegMap[ aPointType ]->setVisible( anIsManualGeodesic ); + myPointXMinMap[ aPointType ]->setVisible( anIsManualGeodesic ); + myPointYMinMap[ aPointType ]->setVisible( anIsManualGeodesic ); + myPointXSecMap[ aPointType ]->setVisible( anIsManualGeodesic ); + myPointYSecMap[ aPointType ]->setVisible( anIsManualGeodesic ); + + myCartPointXMap[ aPointType ]->setVisible( anIsManualCartesian ); + myCartPointYMap[ aPointType ]->setVisible( anIsManualCartesian ); + + myRefPointXMap[ aPointType ]->setVisible( anIsRefImage ); + myRefPointYMap[ aPointType ]->setVisible( anIsRefImage ); } - QListIterator anIter( myLambertLabels ); + QListIterator anIter( myGeodesicLabels ); while( anIter.hasNext() ) - anIter.next()->setVisible( anIsManual ); + anIter.next()->setVisible( anIsManualGeodesic ); + + emit modeActivated( theMode ); } void HYDROGUI_ImportImageDlg::onRefImageActivated( const QString& theName ) @@ -547,3 +722,133 @@ void HYDROGUI_ImportImageDlg::onPointCoordChanged( int theValue ) } } } + +void HYDROGUI_ImportImageDlg::onGeodesicCoordChanged() +{ + QObject* aSender = sender(); + if( !aSender ) + return; + + for( int aPointType = HYDROGUI_PrsImage::PointA; + aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) + { + if( aSender == myPointXDegMap[ aPointType ] || + aSender == myPointYDegMap[ aPointType ] || + aSender == myPointXMinMap[ aPointType ] || + aSender == myPointYMinMap[ aPointType ] || + aSender == myPointXSecMap[ aPointType ] || + aSender == myPointYSecMap[ aPointType ] ) + { + onGeodesicCoordChanged( aPointType ); + return; + } + } +} + +void HYDROGUI_ImportImageDlg::onGeodesicCoordChanged( const int thePointType ) +{ + bool anIsOk[6]; + for( int i = 0; i < 6; i++ ) + anIsOk[ i ] = true; + + int aXDeg = myPointXDegMap[ thePointType ]->text().toInt( &anIsOk[0] ); + int aYDeg = myPointYDegMap[ thePointType ]->text().toInt( &anIsOk[1] ); + int aXMin = myPointXMinMap[ thePointType ]->text().toInt( &anIsOk[2] ); + int aYMin = myPointYMinMap[ thePointType ]->text().toInt( &anIsOk[3] ); + double aXSec = myPointXSecMap[ thePointType ]->text().toDouble( &anIsOk[4] ); + double aYSec = myPointYSecMap[ thePointType ]->text().toDouble( &anIsOk[5] ); + + for( int i = 0; i < 6; i++ ) + if( !anIsOk[ i ] ) + return; + + double aLonDeg = 0, aLatDeg = 0; + HYDROData_Lambert93::DMSToDeg( aXDeg, aXMin, aXSec, aLonDeg ); + HYDROData_Lambert93::DMSToDeg( aYDeg, aYMin, aYSec, aLatDeg ); + + double aXCart = 0, aYCart = 0; + HYDROData_Lambert93::toXY( aLatDeg, aLonDeg, aXCart, aYCart ); + + blockSignalsCartesian( true ); + + myCartPointXMap[ thePointType ]->setValue( aXCart ); + myCartPointYMap[ thePointType ]->setValue( aYCart ); + + blockSignalsCartesian( false ); +} + +void HYDROGUI_ImportImageDlg::onCartesianCoordChanged() +{ + QObject* aSender = sender(); + if( !aSender ) + return; + + for( int aPointType = HYDROGUI_PrsImage::PointA; + aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) + { + if( aSender == myCartPointXMap[ aPointType ] || + aSender == myCartPointYMap[ aPointType ] ) + { + onCartesianCoordChanged( aPointType ); + return; + } + } +} + +void HYDROGUI_ImportImageDlg::onCartesianCoordChanged( const int thePointType ) +{ + bool anIsOk[2]; + for( int i = 0; i < 2; i++ ) + anIsOk[ i ] = true; + + double aXCart = myCartPointXMap[ thePointType ]->text().toDouble( &anIsOk[0] ); + double aYCart = myCartPointYMap[ thePointType ]->text().toDouble( &anIsOk[1] ); + + for( int i = 0; i < 2; i++ ) + if( !anIsOk[ i ] ) + return; + + double aLonDeg = 0, aLatDeg = 0; + HYDROData_Lambert93::toGeo( aXCart, aYCart, aLatDeg, aLonDeg ); + + int aXDeg = 0, aYDeg = 0; + int aXMin = 0, aYMin = 0; + double aXSec = 0, aYSec = 0; + HYDROData_Lambert93::degToDMS( aLonDeg, aXDeg, aXMin, aXSec ); + HYDROData_Lambert93::degToDMS( aLatDeg, aYDeg, aYMin, aYSec ); + + blockSignalsGeodesic( true ); + + myPointXDegMap[ thePointType ]->setValue( aXDeg ); + myPointYDegMap[ thePointType ]->setValue( aYDeg ); + myPointXMinMap[ thePointType ]->setValue( aXMin ); + myPointYMinMap[ thePointType ]->setValue( aYMin ); + myPointXSecMap[ thePointType ]->setValue( aXSec ); + myPointYSecMap[ thePointType ]->setValue( aYSec ); + + blockSignalsGeodesic( false ); +} + +void HYDROGUI_ImportImageDlg::blockSignalsGeodesic( const bool theState ) +{ + for( int aPointType = HYDROGUI_PrsImage::PointA; + aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) + { + myPointXDegMap[ aPointType ]->blockSignals( theState ); + myPointXMinMap[ aPointType ]->blockSignals( theState ); + myPointXSecMap[ aPointType ]->blockSignals( theState ); + myPointYDegMap[ aPointType ]->blockSignals( theState ); + myPointYMinMap[ aPointType ]->blockSignals( theState ); + myPointYSecMap[ aPointType ]->blockSignals( theState ); + } +} + +void HYDROGUI_ImportImageDlg::blockSignalsCartesian( const bool theState ) +{ + for( int aPointType = HYDROGUI_PrsImage::PointA; + aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) + { + myCartPointXMap[ aPointType ]->blockSignals( theState ); + myCartPointYMap[ aPointType ]->blockSignals( theState ); + } +}