X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageDlg.cxx;h=2a65913e0af635fdbfcb97f1b48283a3c3d2421e;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=74fcfc1cf8f3de45f09bad785c77cb45f24b1197;hpb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx index 74fcfc1c..2a65913e 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -66,15 +62,15 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co myFileName = new QLineEdit( myFileNameGroup ); myFileName->setReadOnly( true ); - QToolButton* aBrowseBtn = new QToolButton( myFileNameGroup ); - aBrowseBtn->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "BROWSE_ICO" ) ) ); + myBrowseBtn = new QToolButton( myFileNameGroup ); + myBrowseBtn->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "BROWSE_ICO" ) ) ); QBoxLayout* aFileNameLayout = new QHBoxLayout( myFileNameGroup ); aFileNameLayout->setMargin( 5 ); aFileNameLayout->setSpacing( 5 ); aFileNameLayout->addWidget( aFileNameLabel ); aFileNameLayout->addWidget( myFileName ); - aFileNameLayout->addWidget( aBrowseBtn ); + aFileNameLayout->addWidget( myBrowseBtn ); // Image name myImageNameGroup = new QGroupBox( tr( "IMAGE_NAME" ), this ); @@ -104,16 +100,18 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co QRadioButton* aManualGeodesicBtn = new QRadioButton( tr( "MANUALLY_GEODESIC" ), myTransformGroup ); QRadioButton* aManualCartesianBtn = new QRadioButton( tr( "MANUALLY_LAMBERT93" ), myTransformGroup ); + QRadioButton* aCartesianFromFileBtn = new QRadioButton( tr( "LAMBERT93_FROM_FILE" ), myTransformGroup ); QRadioButton* aRefImageBtn = new QRadioButton( tr( "BY_REFERENCE_IMAGE" ), myTransformGroup ); myModeGroup = new QButtonGroup( myTransformGroup ); myModeGroup->addButton( aManualGeodesicBtn, HYDROData_Image::ManualGeodesic ); myModeGroup->addButton( aManualCartesianBtn, HYDROData_Image::ManualCartesian ); + myModeGroup->addButton( aCartesianFromFileBtn, HYDROData_Image::CartesianFromFile ); myModeGroup->addButton( aRefImageBtn, HYDROData_Image::ReferenceImage ); myRefImage = new QComboBox( myTransformGroup ); - QGridLayout* aTransformLayout = new QGridLayout( myTransformGroup ); + QVBoxLayout* aTransformLayout = new QVBoxLayout( myTransformGroup ); aTransformLayout->setMargin( 5 ); aTransformLayout->setSpacing( 5 ); @@ -122,31 +120,28 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aModeLayout->setSpacing( 5 ); aModeLayout->addWidget( aManualGeodesicBtn, 0, 0 ); aModeLayout->addWidget( aManualCartesianBtn, 1, 0 ); - aModeLayout->addWidget( aRefImageBtn, 2, 0 ); - aModeLayout->addWidget( myRefImage, 2, 1 ); + aModeLayout->addWidget( aCartesianFromFileBtn, 2, 0 ); + aModeLayout->addWidget( aRefImageBtn, 3, 0 ); + aModeLayout->addWidget( myRefImage, 3, 1 ); aModeLayout->setColumnStretch( 1, 1 ); - aTransformLayout->addLayout( aModeLayout, 0, 0, 1, 9 ); + aTransformLayout->addLayout( aModeLayout ); - 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 ); + // Manual input widget + QWidget* aManualInputGroup = new QWidget( myTransformGroup ); + QGridLayout* aManualInputLayout = new QGridLayout( aManualInputGroup ); + aManualInputLayout->setMargin( 5 ); + aManualInputLayout->setSpacing( 5 ); - 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 ); + QLabel* aImageCSLabel = new QLabel( tr( "IMAGE_CS" ), aManualInputGroup ); + QLabel* aGeodesicLabel = new QLabel( tr( "GEODESIC" ), aManualInputGroup ); + QLabel* aLambertLabel = new QLabel( tr( "LAMBERT93" ), aManualInputGroup ); + QLabel* aRefImageLabel = new QLabel( tr( "REFERENCE_IMAGE_CS" ), aManualInputGroup ); - 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 ) ) ); + aManualInputLayout->addWidget( aImageCSLabel, 0, 1 ); + aManualInputLayout->addWidget( aGeodesicLabel, 0, 2, 1, 6 ); + aManualInputLayout->addWidget( aLambertLabel, 0, 2, 1, 6 ); + aManualInputLayout->addWidget( aRefImageLabel, 0, 2, 1, 6 ); for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) @@ -161,81 +156,86 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co QPushButton* aPointBtn = new QPushButton( aPointStr, myTransformGroup ); aPointBtn->setCheckable( true ); - QLabel* aPointXLabel = new QLabel( "X", myTransformGroup ); - QLabel* aPointYLabel = new QLabel( "Y", myTransformGroup ); + QLabel* aPointXLabel = new QLabel( "X", aManualInputGroup ); + QLabel* aPointYLabel = new QLabel( "Y", aManualInputGroup ); - QtxIntSpinBox* aPointX = new QtxIntSpinBox( 0, 0, 1, myTransformGroup ); // max is updated later - QtxIntSpinBox* aPointY = new QtxIntSpinBox( 0, 0, 1, myTransformGroup ); // max is updated later + QtxIntSpinBox* aPointX = new QtxIntSpinBox( 0, 0, 1, aManualInputGroup ); // max is updated later + QtxIntSpinBox* aPointY = new QtxIntSpinBox( 0, 0, 1, aManualInputGroup ); // max is updated later - QLabel* aPointArrowLabel = new QLabel( myTransformGroup ); + QLabel* aPointArrowLabel = new QLabel( aManualInputGroup ); aPointArrowLabel->setPicture( anArrowPicture ); - QLabel* aPointXDegLabel = new QLabel( QChar( 0x00B0 ), myTransformGroup ); - QLabel* aPointYDegLabel = new QLabel( QChar( 0x00B0 ), myTransformGroup ); - QLabel* aPointXMinLabel = new QLabel( "'", myTransformGroup ); - QLabel* aPointYMinLabel = new QLabel( "'", myTransformGroup ); - QLabel* aPointXSecLabel = new QLabel( "\"", myTransformGroup ); - QLabel* aPointYSecLabel = new QLabel( "\"", myTransformGroup ); + QLabel* aPointXDegLabel = new QLabel( QChar( 0x00B0 ), aManualInputGroup ); + QLabel* aPointYDegLabel = new QLabel( QChar( 0x00B0 ), aManualInputGroup ); + QLabel* aPointXMinLabel = new QLabel( "'", aManualInputGroup ); + QLabel* aPointYMinLabel = new QLabel( "'", aManualInputGroup ); + QLabel* aPointXSecLabel = new QLabel( "\"", aManualInputGroup ); + QLabel* aPointYSecLabel = new QLabel( "\"", aManualInputGroup ); + QLabel* aPointLatLabel = new QLabel( tr( "POINT_LATITUDE" ), aManualInputGroup ); + QLabel* aPointLonLabel = new QLabel( tr( "POINT_LONGITUDE" ), aManualInputGroup ); myGeodesicLabels << aPointXDegLabel << aPointYDegLabel << aPointXMinLabel << aPointYMinLabel - << aPointXSecLabel << aPointYSecLabel; + << aPointXSecLabel << aPointYSecLabel + << aPointLonLabel << aPointLatLabel; - QtxIntSpinBox* aPointXDeg = new QtxIntSpinBox( -180, 180, 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 ); + QtxIntSpinBox* aPointXDeg = new QtxIntSpinBox( -179, 179, 1, aManualInputGroup ); + QtxIntSpinBox* aPointYDeg = new QtxIntSpinBox( 0, 89, 1, aManualInputGroup ); + QtxIntSpinBox* aPointXMin = new QtxIntSpinBox( 0, 59, 1, aManualInputGroup ); + QtxIntSpinBox* aPointYMin = new QtxIntSpinBox( 0, 59, 1, aManualInputGroup ); + QtxDoubleSpinBox* aPointXSec = new QtxDoubleSpinBox( 0, 59.9999, 1, 4, 4, aManualInputGroup ); + QtxDoubleSpinBox* aPointYSec = new QtxDoubleSpinBox( 0, 59.9999, 1, 4, 4, aManualInputGroup ); - QtxDoubleSpinBox* aCartPointX = new QtxDoubleSpinBox( 0, 1e8, 1, 2, 2, myTransformGroup ); - QtxDoubleSpinBox* aCartPointY = new QtxDoubleSpinBox( 0, 1e8, 1, 2, 2, myTransformGroup ); + QtxDoubleSpinBox* aCartPointX = new QtxDoubleSpinBox( 0, 1e8, 1, 2, 2, aManualInputGroup ); + QtxDoubleSpinBox* aCartPointY = new QtxDoubleSpinBox( 0, 1e8, 1, 2, 2, aManualInputGroup ); - QtxIntSpinBox* aRefPointX = new QtxIntSpinBox( 0, 0, 1, myTransformGroup ); // max is updated later - QtxIntSpinBox* aRefPointY = new QtxIntSpinBox( 0, 0, 1, myTransformGroup ); // max is updated later + QtxIntSpinBox* aRefPointX = new QtxIntSpinBox( 0, 0, 1, aManualInputGroup ); // max is updated later + QtxIntSpinBox* aRefPointY = new QtxIntSpinBox( 0, 0, 1, aManualInputGroup ); // max is updated later - int aRow = 4 * aPointType + 3; + int aRow = 4 * aPointType; 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 ); + myPointCEnabler = new QCheckBox( aManualInputGroup ); + aManualInputLayout->addWidget( myPointCEnabler, aRow, 0, 1, 2, Qt::AlignHCenter ); + aManualInputLayout->addWidget( aPointBtn, aRow, 2, 1, 8 ); } else { - aTransformLayout->addWidget( aPointBtn, aRow, 0, 1, 9 ); + aManualInputLayout->addWidget( aPointBtn, aRow, 0, 1, 10 ); } - aTransformLayout->addWidget( aPointXLabel, aRow + 1, 0 ); - aTransformLayout->addWidget( aPointX, aRow + 1, 1 ); - aTransformLayout->addWidget( aPointArrowLabel, aRow + 1, 2, 2, 1 ); - aTransformLayout->addWidget( aPointXDeg, aRow + 1, 3 ); - aTransformLayout->addWidget( aPointXDegLabel, aRow + 1, 4 ); - aTransformLayout->addWidget( aPointXMin, aRow + 1, 5 ); - aTransformLayout->addWidget( aPointXMinLabel, aRow + 1, 6 ); - 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 ); - aTransformLayout->addWidget( aPointY, aRow + 2, 1 ); - aTransformLayout->addWidget( aPointYDeg, aRow + 2, 3 ); - aTransformLayout->addWidget( aPointYDegLabel, aRow + 2, 4 ); - aTransformLayout->addWidget( aPointYMin, aRow + 2, 5 ); - aTransformLayout->addWidget( aPointYMinLabel, aRow + 2, 6 ); - 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 ); + aManualInputLayout->addWidget( aPointXLabel, aRow + 1, 0 ); + aManualInputLayout->addWidget( aPointX, aRow + 1, 1 ); + aManualInputLayout->addWidget( aPointArrowLabel, aRow + 1, 2, 2, 1 ); + aManualInputLayout->addWidget( aPointXDeg, aRow + 1, 3 ); + aManualInputLayout->addWidget( aPointXDegLabel, aRow + 1, 4 ); + aManualInputLayout->addWidget( aPointXMin, aRow + 1, 5 ); + aManualInputLayout->addWidget( aPointXMinLabel, aRow + 1, 6 ); + aManualInputLayout->addWidget( aPointXSec, aRow + 1, 7 ); + aManualInputLayout->addWidget( aPointXSecLabel, aRow + 1, 8 ); + aManualInputLayout->addWidget( aPointLonLabel, aRow + 1, 9 ); + + aManualInputLayout->addWidget( aCartPointX, aRow + 1, 3, 1, 6 ); + aManualInputLayout->addWidget( aRefPointX, aRow + 1, 3, 1, 6 ); + + aManualInputLayout->addWidget( aPointYLabel, aRow + 2, 0 ); + aManualInputLayout->addWidget( aPointY, aRow + 2, 1 ); + aManualInputLayout->addWidget( aPointYDeg, aRow + 2, 3 ); + aManualInputLayout->addWidget( aPointYDegLabel, aRow + 2, 4 ); + aManualInputLayout->addWidget( aPointYMin, aRow + 2, 5 ); + aManualInputLayout->addWidget( aPointYMinLabel, aRow + 2, 6 ); + aManualInputLayout->addWidget( aPointYSec, aRow + 2, 7 ); + aManualInputLayout->addWidget( aPointYSecLabel, aRow + 2, 8 ); + aManualInputLayout->addWidget( aPointLatLabel, aRow + 2, 9 ); + + aManualInputLayout->addWidget( aCartPointY, aRow + 2, 3, 1, 6 ); + aManualInputLayout->addWidget( aRefPointY, aRow + 2, 3, 1, 6 ); if( aPointType != HYDROGUI_PrsImage::PointC ) { - QFrame* aLine = new QFrame( myTransformGroup ); + QFrame* aLine = new QFrame( aManualInputGroup ); aLine->setFrameShape( QFrame::HLine ); aLine->setFrameShadow( QFrame::Sunken ); - aTransformLayout->addWidget( aLine, aRow + 3, 0, 1, 9 ); + aManualInputLayout->addWidget( aLine, aRow + 3, 0, 1, 10 ); } myPointBtnMap[ aPointType ] = aPointBtn; @@ -290,10 +290,48 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co connect( myPointCEnabler, SIGNAL( toggled( bool ) ), SLOT( onSetCIsUsed( bool ) ) ); - aTransformLayout->setColumnStretch( 1, 1 ); // double - aTransformLayout->setColumnStretch( 3, 1 ); // degrees - aTransformLayout->setColumnStretch( 5, 1 ); // minutes - aTransformLayout->setColumnStretch( 7, 2 ); // seconds (double with 4 digits) + aManualInputLayout->setColumnStretch( 1, 1 ); // double + aManualInputLayout->setColumnStretch( 3, 1 ); // degrees + aManualInputLayout->setColumnStretch( 5, 1 ); // minutes + aManualInputLayout->setColumnStretch( 7, 2 ); // seconds (double with 4 digits) + + // Image georeferencement file widget + QWidget* aFromFileInputGroup = new QWidget( myTransformGroup ); + QBoxLayout* aFromFileInputLayout = new QHBoxLayout( aFromFileInputGroup ); + aFromFileInputLayout->setMargin( 5 ); + aFromFileInputLayout->setSpacing( 5 ); + + QLabel* aGeoFileNameLabel = new QLabel( tr( "FILE_NAME" ), aFromFileInputGroup ); + + myGeoFileName = new QLineEdit( aFromFileInputGroup ); + myGeoFileName->setReadOnly( true ); + + QToolButton* aGeoBrowseBtn = new QToolButton( aFromFileInputGroup ); + aGeoBrowseBtn->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "BROWSE_ICO" ) ) ); + + aFromFileInputLayout->addWidget( aGeoFileNameLabel ); + aFromFileInputLayout->addWidget( myGeoFileName ); + aFromFileInputLayout->addWidget( aGeoBrowseBtn ); + + // Widgets connections + 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( aManualCartesianBtn, SIGNAL( toggled( bool ) ), aFromFileInputGroup, 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( aManualGeodesicBtn, SIGNAL( toggled( bool ) ), aFromFileInputGroup, 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 ) ) ); + connect( aRefImageBtn, SIGNAL( toggled( bool ) ), aFromFileInputGroup, SLOT( setHidden ( bool ) ) ); + connect( aCartesianFromFileBtn, SIGNAL( toggled( bool ) ), aFromFileInputGroup, SLOT( setVisible ( bool ) ) ); + connect( aCartesianFromFileBtn, SIGNAL( toggled( bool ) ), aManualInputGroup, SLOT( setHidden ( bool ) ) ); + + // Input widgets + aTransformLayout->addWidget( aManualInputGroup ); + aTransformLayout->addWidget( aFromFileInputGroup ); // Common addWidget( myFileNameGroup ); @@ -301,11 +339,13 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co addWidget( myTransformGroup ); addStretch(); - connect( aBrowseBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) ); + connect( myBrowseBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) ); connect( myModeGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( onModeActivated( int ) ) ); + connect( aGeoBrowseBtn, SIGNAL( clicked() ), this, SLOT( onGeoBrowse() ) ); + connect( myRefImage, SIGNAL( activated( const QString& ) ), this, SLOT( onRefImageActivated( const QString& ) ) ); @@ -340,6 +380,10 @@ void HYDROGUI_ImportImageDlg::reset() myFileName->clear(); myImageName->clear(); myImageNameGroup->setEnabled( false ); + myGeoFileName->clear(); + bool isPBlocked = blockSignalsPoints( true ); + bool isGBlocked = blockSignalsGeodesic( true ); + bool isCBlocked = blockSignalsCartesian( true ); for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) { @@ -348,23 +392,46 @@ void HYDROGUI_ImportImageDlg::reset() aBtn->setChecked( false ); aBtn->blockSignals( anIsBlocked ); - myPointXMap[ aPointType ]->clear(); - myPointYMap[ aPointType ]->clear(); - myPointXDegMap[ aPointType ]->clear(); - myPointYDegMap[ aPointType ]->clear(); - myPointXMinMap[ aPointType ]->clear(); - myPointYMinMap[ aPointType ]->clear(); - myPointXSecMap[ aPointType ]->clear(); - myPointYSecMap[ aPointType ]->clear(); + clearSpins( myPointXMap[ aPointType ] ); + clearSpins( myPointYMap[ aPointType ] ); + clearSpins( myPointXDegMap[ aPointType ] ); + clearSpins( myPointYDegMap[ aPointType ] ); + clearSpins( myPointXMinMap[ aPointType ] ); + clearSpins( myPointYMinMap[ aPointType ] ); + clearSpins( myPointXSecMap[ aPointType ] ); + clearSpins( myPointYSecMap[ aPointType ] ); - myRefPointXMap[ aPointType ]->clear(); - myRefPointYMap[ aPointType ]->clear(); + clearSpins( myRefPointXMap[ aPointType ] ); + clearSpins( myRefPointYMap[ aPointType ] ); - myCartPointXMap[ aPointType ]->clear(); - myCartPointYMap[ aPointType ]->clear(); + clearSpins( myCartPointXMap[ aPointType ] ); + clearSpins( myCartPointYMap[ aPointType ] ); } - myPointCEnabler->setChecked( true ); - myPointCEnabler->toggle(); + blockSignalsPoints( isPBlocked ); + blockSignalsGeodesic( isGBlocked ); + blockSignalsCartesian( isCBlocked ); + + // 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(); @@ -400,6 +467,18 @@ QString HYDROGUI_ImportImageDlg::getFileName() const return myFileName->text(); } +void HYDROGUI_ImportImageDlg::setFileName( const QString& theName ) +{ + myFileName->setText( theName ); + myImageNameGroup->setEnabled( true ); + myTransformGroup->setEnabled( true ); +} + +QString HYDROGUI_ImportImageDlg::getGeoreferencementFileName() const +{ + return myGeoFileName->text(); +} + void HYDROGUI_ImportImageDlg::setImageSize( const QSize& theSize, const bool theIsRefImage ) { @@ -618,27 +697,43 @@ HYDROGUI_ImportImageDlg::TransformationData HYDROGUI_ImportImageDlg::ComputeTrsf void HYDROGUI_ImportImageDlg::onBrowse() { QString aFilter( tr( "IMAGE_FILTER" ) ); - QString aFileName = SUIT_FileDlg::getFileName( this, "", aFilter, tr( "IMPORT_IMAGE_FROM_FILE" ), true ); - if( !aFileName.isEmpty() ) + QStringList aFileNamesList = SUIT_FileDlg::getOpenFileNames( this, "", aFilter, tr( "IMPORT_IMAGE_FROM_FILE" ), true ); + emit filesSelected( aFileNamesList ); +} + +void HYDROGUI_ImportImageDlg::ActivateFile( const QString& theFileName, bool isEnableFilesChoice ) +{ + myFileName->setEnabled( isEnableFilesChoice ); + myBrowseBtn->setEnabled( isEnableFilesChoice ); + + if( !theFileName.isEmpty() ) { - QImage anImage( aFileName ); + QImage anImage( theFileName ); 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() ); + arg( theFileName ).arg( QFileInfo( theFileName ).suffix() ); SUIT_MessageBox::warning( module()->getApp()->desktop(), aTitle, aMessage ); } else { - myFileName->setText( aFileName ); + setFileName( theFileName ); + setImageName( "" ); emit createPreview( anImage ); - myImageNameGroup->setEnabled( true ); - myTransformGroup->setEnabled( true ); } } } +void HYDROGUI_ImportImageDlg::onGeoBrowse() +{ + QString aFilter( tr( "IMAGE_GEOREFERENCEMENT_FILTER" ) ); + QString aGeoFileName = SUIT_FileDlg::getFileName( this, "", aFilter, tr( "IMPORT_GEO_DATA_FROM_FILE" ), true ); + if( !aGeoFileName.isEmpty() ) { + myGeoFileName->setText( aGeoFileName ); + } +} + void HYDROGUI_ImportImageDlg::onModeActivated( int theMode ) { bool anIsManualGeodesic = theMode == HYDROData_Image::ManualGeodesic; @@ -829,26 +924,64 @@ void HYDROGUI_ImportImageDlg::onCartesianCoordChanged( const int thePointType ) blockSignalsGeodesic( false ); } -void HYDROGUI_ImportImageDlg::blockSignalsGeodesic( const bool theState ) +void HYDROGUI_ImportImageDlg::clearSpins( QAbstractSpinBox* theSpin ) +{ + if ( dynamic_cast( theSpin ) ) + { + QtxIntSpinBox* aSpin = dynamic_cast( theSpin ); + aSpin->setValue( aSpin->minimum() ); + } + else if ( dynamic_cast( theSpin ) ) + { + QtxDoubleSpinBox* aDblSpin = dynamic_cast( theSpin ); + aDblSpin->setValue( aDblSpin->minimum() ); + } + + theSpin->clear(); +} + +bool HYDROGUI_ImportImageDlg::blockSignalsPoints( const bool theState ) +{ + bool isBlocked = false; + for( int aPointType = HYDROGUI_PrsImage::PointA; + aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) + { + isBlocked = + myPointXMap[ aPointType ]->blockSignals( theState ) || isBlocked; + myPointYMap[ aPointType ]->blockSignals( theState ); + + myRefPointXMap[ aPointType ]->blockSignals( theState ); + myRefPointYMap[ aPointType ]->blockSignals( theState ); + } + return isBlocked; +} + +bool HYDROGUI_ImportImageDlg::blockSignalsGeodesic( const bool theState ) { + bool isBlocked = false; for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) { - myPointXDegMap[ aPointType ]->blockSignals( theState ); + isBlocked = + myPointXDegMap[ aPointType ]->blockSignals( theState ) || isBlocked; myPointXMinMap[ aPointType ]->blockSignals( theState ); myPointXSecMap[ aPointType ]->blockSignals( theState ); myPointYDegMap[ aPointType ]->blockSignals( theState ); myPointYMinMap[ aPointType ]->blockSignals( theState ); myPointYSecMap[ aPointType ]->blockSignals( theState ); } + return isBlocked; } -void HYDROGUI_ImportImageDlg::blockSignalsCartesian( const bool theState ) +bool HYDROGUI_ImportImageDlg::blockSignalsCartesian( const bool theState ) { + bool isBlocked = false; for( int aPointType = HYDROGUI_PrsImage::PointA; aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ ) { - myCartPointXMap[ aPointType ]->blockSignals( theState ); + isBlocked = + myCartPointXMap[ aPointType ]->blockSignals( theState ) || isBlocked; myCartPointYMap[ aPointType ]->blockSignals( theState ); } + return isBlocked; }