X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesOp.cxx;h=38375491e69589af4e8b15b80029f11cfd1affd1;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=74deaf716f1e178ad6f5c9d3fbd6803096467413;hpb=0006900f9b7798b199a295169d0d798ecaad6340;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx index 74deaf71..38375491 100644 --- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx +++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx @@ -29,42 +29,28 @@ #include #include +#include -#include +#include #include +#include #include -HYDROGUI_TwoImagesOp::HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType ) +HYDROGUI_TwoImagesOp::HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, + const int theType, + const bool theIsEdit ) : HYDROGUI_Operation( theModule ), myType( theType ), - myIsEdit( false ), + myIsEdit( theIsEdit ), myEditedObject( 0 ) { - if( myType == Edit ) - { - myIsEdit = true; - myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); - if( !myEditedObject.IsNull() ) - { - if( HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory() ) - { - if( ImageComposer_Operator* anOperator = aFactory->Operator( myEditedObject ) ) - { - if( dynamic_cast( anOperator ) ) - myType = Fuse; - else if( dynamic_cast( anOperator ) ) - myType = Cut; - } - } - } - } - QString aName; switch( myType ) { - case Fuse: aName = tr( "FUSE" ); break; - case Cut: aName = tr( "CUT" ); break; + case Fuse: aName = theIsEdit ? tr( "EDIT_FUSED_IMAGE" ) : tr( "FUSE_IMAGES" ); break; + case Cut: aName = theIsEdit ? tr( "EDIT_CUT_IMAGE" ) : tr( "CUT_IMAGES" ); break; + case Split: aName = theIsEdit ? tr( "EDIT_SPLITTED_IMAGE" ) : tr( "SPLIT_IMAGE" ); break; default: break; } setName( aName ); @@ -86,14 +72,30 @@ void HYDROGUI_TwoImagesOp::startOperation() HYDROGUI_TwoImagesDlg* aPanel = (HYDROGUI_TwoImagesDlg*)inputPanel(); aPanel->reset(); + if( myType == Fuse || myType == Cut ) + aPanel->setMode( HYDROGUI_TwoImagesDlg::TwoImages, myIsEdit ); + else if( myType == Split ) + aPanel->setMode( HYDROGUI_TwoImagesDlg::ImageAndPolyline, myIsEdit ); + QString anImageName; if( myIsEdit ) { + myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); if( !myEditedObject.IsNull() ) anImageName = myEditedObject->GetName(); } else - anImageName = HYDROGUI_Tool::GenerateObjectName( module(), getName() ); + { + QString aPrefix; + switch( myType ) + { + case Fuse: aPrefix = tr( "FUSE" ); break; + case Cut: aPrefix = tr( "CUT" ); break; + case Split: aPrefix = tr( "SPLIT" ); break; + default: break; + } + anImageName = HYDROGUI_Tool::GenerateObjectName( module(), aPrefix ); + } aPanel->setImageName( anImageName ); QString aSelectedName1, aSelectedName2; @@ -101,19 +103,19 @@ void HYDROGUI_TwoImagesOp::startOperation() { if( myEditedObject->NbReferences() > 0 ) { - Handle(HYDROData_Image) anImage1 = myEditedObject->Reference( 0 ); - if( !anImage1.IsNull() ) - aSelectedName1 = anImage1->GetName(); + Handle(HYDROData_Entity) anObject1 = myEditedObject->Reference( 0 ); + if( !anObject1.IsNull() ) + aSelectedName1 = anObject1->GetName(); } if( myEditedObject->NbReferences() > 1 ) { - Handle(HYDROData_Image) anImage2 = myEditedObject->Reference( 1 ); - if( !anImage2.IsNull() ) - aSelectedName2 = anImage2->GetName(); + Handle(HYDROData_Entity) anObject2 = myEditedObject->Reference( 1 ); + if( !anObject2.IsNull() ) + aSelectedName2 = anObject2->GetName(); } - aPanel->setSelectedImages( aSelectedName1, aSelectedName2 ); + aPanel->setSelectedObjects( aSelectedName1, aSelectedName2 ); - HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory(); + HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory(); if( ImageComposer_Operator* anOperator = aFactory->Operator( myEditedObject ) ) { QColor aColor; @@ -121,6 +123,16 @@ void HYDROGUI_TwoImagesOp::startOperation() aPanel->setColor( aColor ); } } + else if( !myIsEdit ) + { + Handle(HYDROData_Image) aSelectedImage = + Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + if( !aSelectedImage.IsNull() ) + { + QString aSelectedName = aSelectedImage->GetName(); + aPanel->setPreselectedObject( aSelectedName ); + } + } } bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, @@ -128,18 +140,21 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, { HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast( inputPanel() ); + bool anIsModifySelected = myType == Split && aPanel->isModifySelected(); + QString anImageName = aPanel->getImageName(); - if( anImageName.isEmpty() ) + if( !anIsModifySelected && anImageName.isEmpty() ) return false; QString aSelectedName1, aSelectedName2; - if( !aPanel->getSelectedImages( aSelectedName1, aSelectedName2 ) ) + if( !aPanel->getSelectedObjects( aSelectedName1, aSelectedName2 ) ) return false; - if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) ) + if( !anIsModifySelected && + ( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) ) ) { // check that there are no other objects with the same name in the document - Handle(HYDROData_Object) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName ); + Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anImageName ); if( !anObject.IsNull() ) { theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anImageName ); @@ -147,59 +162,72 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, } } - Handle(HYDROData_Image) anImage1 = Handle(HYDROData_Image)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_IMAGE ) ); - Handle(HYDROData_Image) anImage2 = Handle(HYDROData_Image)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_IMAGE ) ); - if( anImage1.IsNull() || anImage2.IsNull() ) + Handle(HYDROData_Entity) anObject1 = + HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_UNKNOWN ) ; + Handle(HYDROData_Entity) anObject2 = + HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_UNKNOWN ); + if( anObject1.IsNull() || anObject2.IsNull() ) return false; - HYDROOperations_Factory* aFactory = HYDROOperations_Factory::Factory(); - Handle(HYDROData_Image) aResult = 0; + HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory(); + + Handle(HYDROData_Image) aResult; + ImageComposer_Operator* anOperator = 0; if( myIsEdit ) { aResult = myEditedObject; aResult->ClearReferences(); + anOperator = aFactory->Operator( aResult ); } else { - ImageComposer_Operator* anOperator = 0; + QString anOperatorName; switch( myType ) { - case Fuse: anOperator = new ImageComposer_FuseOperator(); break; - case Cut: anOperator = new ImageComposer_CutOperator(); break; + case Fuse: anOperatorName = ImageComposer_FuseOperator::Type(); break; + case Cut: anOperatorName = ImageComposer_CutOperator::Type(); break; + case Split: anOperatorName = ImageComposer_CropOperator::Type(); break; default: break; } - if( !anOperator ) - return false; + anOperator = aFactory->Operator( anOperatorName ); aResult = aFactory->CreateImage( doc(), anOperator ); } - if( aResult.IsNull() ) + if( aResult.IsNull() || !anOperator ) return false; + // Setting the operator arguments + anOperator->setArgs( aPanel->getColor() ); + aResult->SetArgs( anOperator->getBinArgs() ); + aResult->SetName( anImageName ); - aResult->AppendReference( anImage1 ); - aResult->AppendReference( anImage2 ); + aResult->AppendReference( anObject1 ); + aResult->AppendReference( anObject2 ); + + aResult->Update(); - if( ImageComposer_Operator* anOperator = aFactory->Operator( aResult ) ) + if( anIsModifySelected ) { - anOperator->setArgs( aPanel->getColor() ); - aResult->SetArgs( anOperator->getBinArgs() ); + Handle(HYDROData_Image) aSelectedImage = Handle(HYDROData_Image)::DownCast( anObject1 ); + if( !aSelectedImage.IsNull() ) + { + aSelectedImage->SetIsSelfSplitted( true ); + aSelectedImage->SetImage( aResult->Image() ); + aSelectedImage->SetTrsf( aResult->Trsf() ); + aResult->Remove(); + } } - aFactory->UpdateImage( doc(), aResult ); - - if( !myIsEdit ) + if( !myIsEdit && !anIsModifySelected ) { size_t aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); - module()->setObjectVisible( aViewId, anImage1, false ); - module()->setObjectVisible( aViewId, anImage2, false ); + module()->setObjectVisible( aViewId, anObject1, false ); + module()->setObjectVisible( aViewId, anObject2, false ); module()->setObjectVisible( aViewId, aResult, true ); } - theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced; + theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced; return true; }