X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.cxx;h=625d263612f4ab2b9f8578523314c326200820c8;hb=17f7f1768ec576845662eba383627385c46d718e;hp=82de7403539b8b971b7840dbdd4ed93afed7f3a5;hpb=844c6abc897469c996e8df5a1569c3aeaa08c446;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx index 82de7403..625d2636 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx @@ -41,8 +41,10 @@ #include #include +#include #include #include +#include HYDROGUI_ImportImageOp::HYDROGUI_ImportImageOp( HYDROGUI_Module* theModule, const bool theIsEdit ) @@ -270,19 +272,19 @@ HYDROGUI_InputPanel* HYDROGUI_ImportImageOp::createInputPanel() const connect( aPanel, SIGNAL( modeActivated( int ) ), SLOT( onModeActivated( int ) ) ); connect( aPanel, SIGNAL( refImageActivated( const QString& ) ), SLOT( onRefImageActivated( const QString& ) ) ); - connect( aPanel, SIGNAL( setIsByTwoPoints( bool ) ), SLOT( onSetIsByTwoPoints( bool ) ) ); + connect( aPanel, SIGNAL( setCIsUsed( bool ) ), SLOT( onSetCIsUsed( bool ) ) ); return aPanel; } -void HYDROGUI_ImportImageOp::onSetIsByTwoPoints( bool theIsSetByTwoPoints ) +void HYDROGUI_ImportImageOp::onSetCIsUsed( bool theCIsUsed ) { if ( myPreviewPrs ) { - myPreviewPrs->setIsByTwoPoints( theIsSetByTwoPoints ); + myPreviewPrs->setIsByTwoPoints( !theCIsUsed ); } if ( myRefPreviewPrs ) { - myRefPreviewPrs->setIsByTwoPoints( theIsSetByTwoPoints ); + myRefPreviewPrs->setIsByTwoPoints( !theCIsUsed ); } } @@ -310,30 +312,30 @@ bool HYDROGUI_ImportImageOp::checkPoints( const QPointF& thePointA, theErrorMsg = theLineErrMsg; return false; } + + if ( theIsToCheckInvertibles ) + { + QTransform aTransform1( xa, ya, 1, xb, yb, 1, xc, yc, 1 ); + + bool anIsInvertible = false; + QTransform aTransform1Inverted = aTransform1.inverted( &anIsInvertible ); + if( !anIsInvertible ) + { + theErrorMsg = tr( "TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED" ); + return false; + } + } } else { // check that two points are not identical - if ( ValuesEquals( xa, ya ) && ValuesEquals( xb, yb ) ) + if ( ValuesEquals( xa, xb ) && ValuesEquals( ya, yb ) ) { theErrorMsg = thePoinErrMsg; return false; } } - if ( theIsToCheckInvertibles ) - { - QTransform aTransform1( xa, ya, 1, xb, yb, 1, xc, yc, 1 ); - - bool anIsInvertible = false; - QTransform aTransform1Inverted = aTransform1.inverted( &anIsInvertible ); - if( !anIsInvertible ) - { - theErrorMsg = tr( "TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED" ); - return false; - } - } - return true; } @@ -357,74 +359,82 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, } } - HYDROGUI_ImportImageDlg::TransformationDataMap aMap; - if( !aPanel->getTransformationDataMap( aMap ) ) - return false; + HYDROData_Image::TransformationMode aTransformationMode = + (HYDROData_Image::TransformationMode)aPanel->getTransformationMode(); + + QPoint aPointA, aPointB, aPointC; + QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC( INT_MIN, INT_MIN ); + Handle(HYDROData_Image) aRefImageObj; - bool anIsByTwoPoints = aPanel->isByTwoPoints(); + if ( aTransformationMode != HYDROData_Image::CartesianFromFile ) { + HYDROGUI_ImportImageDlg::TransformationDataMap aMap; + if( !aPanel->getTransformationDataMap( aMap ) ) + return false; - QPoint aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint; - QPoint aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint; - QPoint aPointC = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) : - aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint; + bool anIsByTwoPoints = aPanel->isByTwoPoints(); - // first, we check correctness of image points - if ( !checkPoints( aPointA, aPointB, aPointC, anIsByTwoPoints, - tr( "POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ), - tr( "POINTS_A_B_ARE_IDENTICAL" ), - theErrorMsg, true ) ) - return false; + aPointA = aMap[ HYDROGUI_PrsImage::PointA ].ImagePoint; + aPointB = aMap[ HYDROGUI_PrsImage::PointB ].ImagePoint; + aPointC = anIsByTwoPoints ? QPoint( INT_MIN, INT_MIN ) : + aMap[ HYDROGUI_PrsImage::PointC ].ImagePoint; - Handle(HYDROData_Image) aRefImageObj; - QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC( INT_MIN, INT_MIN ); + // first, we check correctness of image points + if ( !checkPoints( aPointA, aPointB, aPointC, anIsByTwoPoints, + tr( "POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ), + tr( "POINTS_A_B_ARE_IDENTICAL" ), + theErrorMsg, true ) ) + return false; - HYDROData_Image::TransformationMode aTransformationMode = - (HYDROData_Image::TransformationMode)aPanel->getTransformationMode(); - if ( aTransformationMode == HYDROData_Image::ReferenceImage ) - { - QString aRefImageName = aPanel->getRefImageName(); - if( aRefImageName.isEmpty() ) + if ( aTransformationMode == HYDROData_Image::ReferenceImage ) { - theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" ); - return false; - } + QString aRefImageName = aPanel->getRefImageName(); + if( aRefImageName.isEmpty() ) + { + theErrorMsg = tr( "REFERENCE_IMAGE_IS_NOT_SELECTED" ); + return false; + } - HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap; - if( !aPanel->getTransformationDataMap( aRefMap, true ) ) - return false; + HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap; + if( !aPanel->getTransformationDataMap( aRefMap, true ) ) + return false; - aRefImageObj = Handle(HYDROData_Image)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aRefImageName, KIND_IMAGE ) ); - if( aRefImageObj.IsNull() ) - return false; + aRefImageObj = Handle(HYDROData_Image)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aRefImageName, KIND_IMAGE ) ); + if( aRefImageObj.IsNull() ) { + return false; + } + else if ( !isReferenceCorrect() ) { + aRefImageObj->RemoveAllReferences(); + } - aTrsfPointA = aRefMap[ HYDROGUI_PrsImage::PointA ].ImagePoint; - aTrsfPointB = aRefMap[ HYDROGUI_PrsImage::PointB ].ImagePoint; - if ( !anIsByTwoPoints ) + aTrsfPointA = aRefMap[ HYDROGUI_PrsImage::PointA ].ImagePoint; + aTrsfPointB = aRefMap[ HYDROGUI_PrsImage::PointB ].ImagePoint; + if ( !anIsByTwoPoints ) aTrsfPointC = aRefMap[ HYDROGUI_PrsImage::PointC ].ImagePoint; - // the same check of correctness for the reference points - if ( !checkPoints( aTrsfPointA, aTrsfPointB, aTrsfPointC, anIsByTwoPoints, - tr( "REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ), - tr( "REFERENCE_POINTS_A_B_ARE_IDENTICAL" ), - theErrorMsg, false ) ) - return false; - } - else - { - if ( aTransformationMode == HYDROData_Image::ManualGeodesic ) - { - aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].GeodesicPoint; - aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].GeodesicPoint; - if ( !anIsByTwoPoints ) - aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].GeodesicPoint; + // the same check of correctness for the reference points + if ( !checkPoints( aTrsfPointA, aTrsfPointB, aTrsfPointC, anIsByTwoPoints, + tr( "REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ), + tr( "REFERENCE_POINTS_A_B_ARE_IDENTICAL" ), + theErrorMsg, false ) ) + return false; } else { - aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].CartesianPoint; - aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].CartesianPoint; - if ( !anIsByTwoPoints ) - aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].CartesianPoint; + if ( aTransformationMode == HYDROData_Image::ManualGeodesic ) + { + aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].GeodesicPoint; + aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].GeodesicPoint; + if ( !anIsByTwoPoints ) + aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].GeodesicPoint; + } + else + { + aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].CartesianPoint; + aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].CartesianPoint; + if ( !anIsByTwoPoints ) + aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].CartesianPoint; + } } } @@ -439,17 +449,34 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, anImageObj->SetName( anImageName ); anImageObj->SetImage( myImage ); - anImageObj->SetLocalPoints( aPointA, aPointB, aPointC, false ); + + if ( aTransformationMode == HYDROData_Image::CartesianFromFile ) { + QString aGeoreferencementFileName = aPanel->getGeoreferencementFileName(); + if ( aGeoreferencementFileName.isEmpty() ) { + return false; + } - if ( aTransformationMode == HYDROData_Image::ReferenceImage ) - { - anImageObj->SetReferencePoints( aRefImageObj, + QPoint aLocalPointA( 0, 0 ), + aLocalPointB( anImageObj->Image().width(), 0 ), + aLocalPointC( INT_MIN, INT_MIN ); + anImageObj->SetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC, false ); + if ( !anImageObj->SetGlobalPointsFromFile( aGeoreferencementFileName ) ) { + theErrorMsg = tr( "CANT_LOAD_GEOREFERENCEMENT_FILE" ); + return false; + } + } else { + anImageObj->SetLocalPoints( aPointA, aPointB, aPointC, false ); + + if ( aTransformationMode == HYDROData_Image::ReferenceImage ) + { + anImageObj->SetReferencePoints( aRefImageObj, aTrsfPointA, aTrsfPointB, aTrsfPointC ); - } - else - { - anImageObj->SetGlobalPoints( aTransformationMode, + } + else + { + anImageObj->SetGlobalPoints( aTransformationMode, aTrsfPointA, aTrsfPointB, aTrsfPointC ); + } } if( !myIsEdit ) @@ -465,13 +492,59 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, if( !myIsEdit ) module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), anImageObj, true ); - if( myIsEdit ) - anImageObj->Update(); + anImageObj->Update(); theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced; return true; } +bool HYDROGUI_ImportImageOp::isReferenceCorrect() const +{ + bool isCorrect = true; + + if( myIsEdit && !myEditedObject.IsNull() ) + { + HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel(); + Handle(HYDROData_Image) aRefImageObj = Handle(HYDROData_Image)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aPanel->getRefImageName(), KIND_IMAGE ) ); + if( !aRefImageObj.IsNull() ) + { + bool isFoundEdited = false; + HYDROData_SequenceOfObjects aRefSeq = aRefImageObj->GetAllReferenceObjects(); + for ( int i = 1, n = aRefSeq.Length(); i <= n && !isFoundEdited; ++i ) + { + Handle(HYDROData_Entity) anObject = aRefSeq.Value( i ); + isFoundEdited = anObject->GetName() == myEditedObject->GetName(); + } + isCorrect = !isFoundEdited; + } + } + return isCorrect; +} + +void HYDROGUI_ImportImageOp::onApply() +{ + HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel(); + + bool aCanApply = isReferenceCorrect(); + if ( !aCanApply && !myEditedObject.IsNull() ) + { + Handle(HYDROData_Image) aRefImageObj = Handle(HYDROData_Image)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aPanel->getRefImageName(), KIND_IMAGE ) ); + if ( !aRefImageObj.IsNull() ) + aCanApply = SUIT_MessageBox::question( module()->getApp()->desktop(), + tr( "CORRECT_INPUT_DATA" ), tr( "CONFIRM_REMOVE_REFERENCE_FROM_IMAGE" ). + arg( aRefImageObj->GetName() ).arg( myEditedObject->GetName() ), + QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::Yes; + } + if ( aCanApply ) + HYDROGUI_Operation::onApply(); + else { + aPanel->setRefImageName( "" ); + onRefImageActivated( aPanel->getRefImageName() ); + } +} + void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) { HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel(); @@ -530,14 +603,27 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) } } - QString anImageName; - if( myIsEdit ) + // Set the image name in the dialog + QString anImageName = aPanel->getImageName().simplified(); + // If edit mode and the name was not set yet then get from the edited object + if( myIsEdit && anImageName.isEmpty() ) { if( !myEditedObject.IsNull() ) anImageName = myEditedObject->GetName(); } - else - anImageName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMAGE_NAME" ) ); + // If the name was not set then initialize it from the selected file name + if ( anImageName.isEmpty() ) + { + anImageName = aPanel->getFileName(); + if ( !anImageName.isEmpty() ) { + anImageName = QFileInfo( anImageName ).baseName(); + } + // If no file name then generate a new image name + if ( anImageName.isEmpty() ) { + anImageName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMAGE_NAME" ) ); + } + } + aPanel->setImageName( anImageName ); } @@ -545,6 +631,7 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) aPanel->initializePointSelection(); onPointSelected( false ); + onSetCIsUsed( !aPanel->isByTwoPoints() ); } void HYDROGUI_ImportImageOp::onActivatePointSelection( int thePointType ) @@ -596,7 +683,11 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName ) ///// Get a view port for the reference image preview if( myRefViewManager ) { - if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() ) + if( theName.isEmpty() ) + { + closeView( myRefViewManager ); + } + else if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() ) { aViewPort = aViewer->getActiveViewPort(); } @@ -700,6 +791,7 @@ void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage ) const HYDROGUI_PrsImage::TransformationPointMap& aPointMap = aPrs->getTransformationPointMap(); + HYDROGUI_PrsImage::TransformationPointMapIterator anIter( aPointMap ); while( anIter.hasNext() ) {