X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.cxx;h=52ea65d9c32263bb5033fef06b230f79b6709471;hb=df4b53b331bde1dc61e040d12f180009b5ecc468;hp=3d844bc1e70cd2a2632a13b295070090375a268e;hpb=bae0e2c1d1267ee4d445dff9f0f5b546e685bfd9;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx index 3d844bc1..52ea65d9 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx @@ -29,7 +29,9 @@ #include "HYDROGUI_Tool.h" #include "HYDROGUI_UpdateFlags.h" -#include +#include + +#include #include #include @@ -46,9 +48,10 @@ HYDROGUI_ImportImageOp::HYDROGUI_ImportImageOp( HYDROGUI_Module* theModule, myActiveViewManager( 0 ), myPreviewViewManager( 0 ), myPreviewPrs( 0 ), + myRefPreviewPrs( 0 ), myPointType( HYDROGUI_PrsImage::None ) { - setName( theIsEdit ? tr( "EDIT_IMAGE" ) : tr( "IMPORT_IMAGE" ) ); + setName( theIsEdit ? tr( "EDIT_IMPORTED_IMAGE" ) : tr( "IMPORT_IMAGE" ) ); } HYDROGUI_ImportImageOp::~HYDROGUI_ImportImageOp() @@ -100,6 +103,36 @@ void HYDROGUI_ImportImageOp::startOperation() ( (HYDROGUI_ImportImageDlg*)inputPanel() )->setTransformationDataMap( aDataMap ); } } + + // collect information about existing images + HYDROGUI_ImportImageDlg::PrsPointDataList aPrsPointDataList; + HYDROData_Iterator anIterator( doc(), KIND_IMAGE ); + for( ; anIterator.More(); anIterator.Next() ) + { + Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anIterator.Current() ); + if( !anImageObj.IsNull() ) + { + if( myIsEdit && HYDROGUI_Tool::IsEqual( anImageObj, myEditedObject ) ) + continue; + + QPoint aPointA1, aPointB1, aPointC1; + QPointF aPointA2, aPointB2, aPointC2; + anImageObj->TrsfPoints( aPointA1, aPointB1, aPointC1, + aPointA2, aPointB2, aPointC2 ); + + HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap; + aDataMap[ HYDROGUI_PrsImage::PointA ] = + HYDROGUI_ImportImageDlg::TransformationData( aPointA1, aPointA2 ); + aDataMap[ HYDROGUI_PrsImage::PointB ] = + HYDROGUI_ImportImageDlg::TransformationData( aPointB1, aPointB2 ); + aDataMap[ HYDROGUI_PrsImage::PointC ] = + HYDROGUI_ImportImageDlg::TransformationData( aPointC1, aPointC2 ); + + HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap ); + aPrsPointDataList.append( aPrsPointData ); + } + } + ( (HYDROGUI_ImportImageDlg*)inputPanel() )->setPrsPointDataList( aPrsPointDataList ); } void HYDROGUI_ImportImageOp::abortOperation() @@ -123,6 +156,10 @@ HYDROGUI_InputPanel* HYDROGUI_ImportImageOp::createInputPanel() const this, SLOT( onCreatePreview( QImage ) ) ); connect( aPanel, SIGNAL( activatePointSelection( int ) ), this, SLOT( onActivatePointSelection( int ) ) ); + connect( aPanel, SIGNAL( pointCoordChanged( bool, int, bool, int ) ), + this, SLOT( onPointCoordChanged( bool, int, bool, int ) ) ); + connect( aPanel, SIGNAL( refImageActivated( const QString& ) ), + this, SLOT( onRefImageActivated( const QString& ) ) ); return aPanel; } @@ -138,7 +175,7 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) ) { // check that there are no other objects with the same name in the document - Handle(HYDROData_Object) anObject = findObjectByName( anImageName, KIND_UNKNOWN ); + Handle(HYDROData_Object) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName ); if( !anObject.IsNull() ) { theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anImageName ); @@ -146,11 +183,28 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, } } + if( !myPreviewPrs ) + return false; + QImage anImage = myPreviewPrs->getImage(); + bool anIsRefImage = aPanel->getTransformationMode() == HYDROGUI_ImportImageDlg::RefImage; + + QTransform aRefTransform; + if( anIsRefImage && myRefPreviewPrs ) + { + Handle(HYDROData_Image) aRefImageObj = + Handle(HYDROData_Image)::DownCast( myRefPreviewPrs->getObject() ); + if( !aRefImageObj.IsNull() ) + aRefTransform = aRefImageObj->Trsf(); + } + HYDROGUI_ImportImageDlg::TransformationDataMap aMap; - bool anIsOk = aPanel->getTransformationDataMap( aMap ); - if( !anIsOk || !myPreviewPrs ) + if( !aPanel->getTransformationDataMap( aMap ) ) + return false; + + HYDROGUI_ImportImageDlg::TransformationDataMap aRefMap; + if( anIsRefImage && !aPanel->getTransformationDataMap( aRefMap, true ) ) return false; QPoint aPointA1 = aMap[ HYDROGUI_PrsImage::PointA ].first; @@ -161,6 +215,14 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, QPointF aPointB2 = aMap[ HYDROGUI_PrsImage::PointB ].second; QPointF aPointC2 = aMap[ HYDROGUI_PrsImage::PointC ].second; + QPoint aPointA3, aPointB3, aPointC3; + if( anIsRefImage ) + { + aPointA3 = aRefMap[ HYDROGUI_PrsImage::PointA ].first; + aPointB3 = aRefMap[ HYDROGUI_PrsImage::PointB ].first; + aPointC3 = aRefMap[ HYDROGUI_PrsImage::PointC ].first; + } + int xa1 = aPointA1.x(); int ya1 = aPointA1.y(); int xb1 = aPointB1.x(); @@ -175,6 +237,13 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, double xc2 = aPointC2.x(); double yc2 = aPointC2.y(); + int xa3 = aPointA3.x(); + int ya3 = aPointA3.y(); + int xb3 = aPointB3.x(); + int yb3 = aPointB3.y(); + int xc3 = aPointC3.x(); + int yc3 = aPointC3.y(); + // first, check that three input points don't belong to a single line if( ( yb1 - ya1 ) * ( xc1 - xa1 ) == ( yc1 - ya1 ) * ( xb1 - xa1 ) ) { @@ -182,17 +251,31 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, return false; } + // the same check for the reference points + if( anIsRefImage && ( ( yb3 - ya3 ) * ( xc3 - xa3 ) == ( yc3 - ya3 ) * ( xb3 - xa3 ) ) ) + { + theErrorMsg = tr( "REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE" ); + return false; + } + QTransform aTransform1( xa1, ya1, 1, xb1, yb1, 1, xc1, yc1, 1 ); QTransform aTransform2( xa2, ya2, 1, xb2, yb2, 1, xc2, yc2, 1 ); + QTransform aTransform3( xa3, ya3, 1, xb3, yb3, 1, xc3, yc3, 1 ); bool anIsInvertible = false; - QTransform aTransform = aTransform1.inverted( &anIsInvertible ) * aTransform2; + QTransform aTransform1Inverted = aTransform1.inverted( &anIsInvertible ); if( !anIsInvertible ) { theErrorMsg = tr( "TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED" ); return false; } + QTransform aTransform; + if( anIsRefImage ) + aTransform = aTransform1Inverted * aTransform3 * aRefTransform; + else + aTransform = aTransform1Inverted * aTransform2; + Handle(HYDROData_Image) anImageObj; if( myIsEdit ) anImageObj = myEditedObject; @@ -207,10 +290,25 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, anImageObj->SetImage( anImage ); anImageObj->SetTrsf( aTransform ); + if( anIsRefImage ) + { + aPointA2 = QPointF( aTransform.map( aPointA1 ) ); + aPointB2 = QPointF( aTransform.map( aPointB1 ) ); + aPointC2 = QPointF( aTransform.map( aPointC1 ) ); + } + anImageObj->SetTrsfPoints( aPointA1, aPointB1, aPointC1, aPointA2, aPointB2, aPointC2 ); - anImageObj->SetVisibility( true ); + // must be done after all checks and before calling SetVisible() method below + closePreview(); + + if( !myIsEdit ) + module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), anImageObj, true ); + + if( myIsEdit ) + if( HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory() ) + aFactory->UpdateImage( doc(), anImageObj ); theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced; return true; @@ -230,13 +328,13 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) dynamic_cast( anApp->createViewManager( GraphicsView_Viewer::Type() ) ); if( myPreviewViewManager ) { - module()->setViewManagerRole( myPreviewViewManager, HYDROGUI_Module::VMR_Mapping ); - myPreviewViewManager->setTitle( tr( "MAPPING" ) ); + module()->setViewManagerRole( myPreviewViewManager, HYDROGUI_Module::VMR_TransformImage ); + myPreviewViewManager->setTitle( tr( "TRANSFORM_IMAGE" ) ); if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() ) { if( GraphicsView_ViewPort* aViewPort = aViewer->getActiveViewPort() ) { - aViewPort->setMousePositionEnabled( true ); + //aViewPort->setMousePositionEnabled( true ); //ouv: temporarily commented aViewPort->addItem( myPreviewPrs ); aViewPort->fitAll(); @@ -257,37 +355,109 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) anImageName = myEditedObject->GetName(); } else - { - int anImageId = 1; - while( anImageId < 100 ) - { - anImageName = QString( "Image_%1" ).arg( QString::number( anImageId++ ) ); - - // check that there are no other objects with the same name in the document - Handle(HYDROData_Object) anObject = findObjectByName( anImageName, KIND_UNKNOWN ); - if( anObject.IsNull() ) - break; - } - } + anImageName = HYDROGUI_Tool::GenerateObjectName( module(), "Image" ); aPanel->setImageName( anImageName ); + aPanel->setImageSize( theImage.size() ); + aPanel->initializePointSelection(); - onPointSelected(); + onPointSelected( false ); } void HYDROGUI_ImportImageOp::onActivatePointSelection( int thePointType ) { myPointType = thePointType; if( myPreviewPrs ) - myPreviewPrs->setTransformationPointMode( thePointType ); + myPreviewPrs->setTransformationPointType( thePointType ); + if( myRefPreviewPrs ) + myRefPreviewPrs->setTransformationPointType( thePointType ); +} + +void HYDROGUI_ImportImageOp::onPointCoordChanged( bool theIsRef, + int thePointType, + bool theIsY, + int theValue ) +{ + if( !theIsRef && myPreviewPrs ) + myPreviewPrs->updateTransformationPoint( thePointType, theIsY, theValue ); + else if( theIsRef && myRefPreviewPrs ) + myRefPreviewPrs->updateTransformationPoint( thePointType, theIsY, theValue ); +} + +void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName ) +{ + GraphicsView_ViewPort* aViewPort = 0; + if( myPreviewViewManager ) + if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() ) + aViewPort = aViewer->getActiveViewPort(); + + if( !aViewPort ) + return; + + if( myPreviewPrs ) + myPreviewPrs->setCaption( QString() ); + + if( myRefPreviewPrs ) + { + myRefPreviewPrs->setCaption( QString() ); + aViewPort->removeItem( myRefPreviewPrs ); + + delete myRefPreviewPrs; + myRefPreviewPrs = 0; + } + + QImage anImage; + Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), theName, KIND_IMAGE ) ); + if( !anImageObj.IsNull() ) + { + anImage = anImageObj->Image(); + + myRefPreviewPrs = new HYDROGUI_PrsImage( anImageObj ); + myRefPreviewPrs->setImage( anImage ); + myRefPreviewPrs->compute(); + + myRefPreviewPrs->setIsTransformationPointPreview( true ); + myRefPreviewPrs->setTransformationPointType( myPointType ); + + // vertically shift the reference prs relatively to the main prs + if( myPreviewPrs ) + { + myPreviewPrs->setCaption( tr( "IMPORTED_IMAGE" ) ); + + QImage anImage = myPreviewPrs->getImage(); + myRefPreviewPrs->moveBy( 0, anImage.height() + 60 ); + myRefPreviewPrs->setCaption( tr( "REFERENCE_IMAGE" ) ); + } + + aViewPort->addItem( myRefPreviewPrs ); + } + + aViewPort->fitAll(); + + HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel(); + + aPanel->setImageSize( anImage.size(), true ); + + aPanel->initializePointSelection(); + onPointSelected( true ); } void HYDROGUI_ImportImageOp::onPointSelected() { + onPointSelected( myRefPreviewPrs && myRefPreviewPrs->isSelected() ); +} + +void HYDROGUI_ImportImageOp::onPointSelected( bool theIsRefImage ) +{ + HYDROGUI_PrsImage* aPrs = theIsRefImage ? myRefPreviewPrs : myPreviewPrs; + if( !aPrs ) + return; + HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap; const HYDROGUI_PrsImage::TransformationPointMap& aPointMap = - myPreviewPrs->getTransformationPointMap(); + aPrs->getTransformationPointMap(); HYDROGUI_PrsImage::TransformationPointMapIterator anIter( aPointMap ); while( anIter.hasNext() ) { @@ -299,7 +469,7 @@ void HYDROGUI_ImportImageOp::onPointSelected() aDataMap[ aPointType ] = aData; } - ( (HYDROGUI_ImportImageDlg*)inputPanel() )->setTransformationDataMap( aDataMap, true ); + ( (HYDROGUI_ImportImageDlg*)inputPanel() )->setTransformationDataMap( aDataMap, true, theIsRefImage ); } void HYDROGUI_ImportImageOp::closePreview() @@ -310,6 +480,12 @@ void HYDROGUI_ImportImageOp::closePreview() myPreviewPrs = 0; } + if( myRefPreviewPrs ) + { + delete myRefPreviewPrs; + myRefPreviewPrs = 0; + } + if( myPreviewViewManager ) { module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here