X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportImageOp.cxx;h=15c73fdecb3b1ce405a5f5bcad2abc2dea9d841c;hb=9d44116e703eee10527cef6c81ab5f6805515111;hp=3533cee2c7d4f651860227a4c2b8efa7b7a30d01;hpb=66d416b1aa5a5d48fc64b5080eb9280fb58573ba;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx index 3533cee2..15c73fde 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.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 @@ -23,10 +19,11 @@ #include "HYDROGUI_ImportImageOp.h" #include "HYDROGUI_DataModel.h" +#include #include "HYDROGUI_ImportImageDlg.h" #include "HYDROGUI_Module.h" #include "HYDROGUI_PrsImage.h" -#include "HYDROGUI_Tool.h" +#include "HYDROGUI_Tool2.h" #include "HYDROGUI_UpdateFlags.h" #include @@ -77,7 +74,8 @@ void HYDROGUI_ImportImageOp::startOperation() if( myIsEdit ) { - myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + if ( isApplyAndClose() ) + myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); if( !myEditedObject.IsNull() ) { QImage anImage = myEditedObject->Image(); @@ -166,36 +164,8 @@ void HYDROGUI_ImportImageOp::startOperation() } } - // Collect information about existing images and initialize the combobox - // reference image selector in the dialog. 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 && IsEqual( anImageObj, myEditedObject ) ) - continue; - - QPoint aLocalPointA, aLocalPointB, aLocalPointC; - anImageObj->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC ); - - HYDROData_Image::TransformationMode aImgTrsfMode; - QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC; - anImageObj->GetGlobalPoints( aImgTrsfMode, - aTrsfPointA, aTrsfPointB, aTrsfPointC ); - - HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap; - computeTrsfData( aImgTrsfMode, false, aLocalPointA, aLocalPointB, aLocalPointC, - aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap ); - - HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap ); - aPrsPointDataList.append( aPrsPointData ); - } - } - - // Initialize the combobox in the dialog with the list of available reference images + getReferenceDataList( aPrsPointDataList ); aPanel->setPrsPointDataList( aPrsPointDataList ); // Select the current reference image in the dialog combobox aPanel->setRefImageName( aRefImageName ); @@ -225,6 +195,38 @@ void HYDROGUI_ImportImageOp::setPresentationTrsfPoints( HYDROGUI_PrsImage* thePr } } +void HYDROGUI_ImportImageOp::getReferenceDataList( + HYDROGUI_ImportImageDlg::PrsPointDataList& theList ) const +{ + // Collect information about existing images and initialize the combobox + // reference image selector in the dialog. + 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 && IsEqual( anImageObj, myEditedObject ) ) + continue; + + QPoint aLocalPointA, aLocalPointB, aLocalPointC; + anImageObj->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC ); + + HYDROData_Image::TransformationMode aImgTrsfMode; + QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC; + anImageObj->GetGlobalPoints( aImgTrsfMode, + aTrsfPointA, aTrsfPointB, aTrsfPointC ); + + HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap; + computeTrsfData( aImgTrsfMode, false, aLocalPointA, aLocalPointB, aLocalPointC, + aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap ); + + HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap ); + theList.append( aPrsPointData ); + } + } +} + void HYDROGUI_ImportImageOp::computeTrsfData( HYDROData_Image::TransformationMode theTrsfMode, bool theIsByTwoPoints, const QPoint& theLocalPointA, @@ -257,7 +259,8 @@ void HYDROGUI_ImportImageOp::abortOperation() void HYDROGUI_ImportImageOp::commitOperation() { - closePreview(); + if ( isApplyAndClose() ) + closePreview(); HYDROGUI_Operation::commitOperation(); } @@ -273,6 +276,8 @@ HYDROGUI_InputPanel* HYDROGUI_ImportImageOp::createInputPanel() const connect( aPanel, SIGNAL( refImageActivated( const QString& ) ), SLOT( onRefImageActivated( const QString& ) ) ); connect( aPanel, SIGNAL( setCIsUsed( bool ) ), SLOT( onSetCIsUsed( bool ) ) ); + connect( aPanel, SIGNAL( filesSelected( const QStringList& ) ), + SLOT( onFilesSelected( const QStringList& ) ) ); return aPanel; } @@ -340,13 +345,27 @@ bool HYDROGUI_ImportImageOp::checkPoints( const QPointF& thePointA, } bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel(); + if( !myIsEdit ) + { + QString aFilePath = aPanel->getFileName(); + if( aFilePath.isEmpty() ) + { + theErrorMsg = tr( "SELECT_IMAGE_FILE" ).arg( aFilePath ); + return false; + } + } + QString anImageName = aPanel->getImageName(); if( anImageName.isEmpty() ) + { + theErrorMsg = tr( "SELECT_IMAGE_NAME" ).arg( anImageName ); return false; + } if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) ) { @@ -442,7 +461,11 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, if( myIsEdit ) anImageObj = myEditedObject; else + { anImageObj = Handle(HYDROData_Image)::DownCast( doc()->CreateObject( KIND_IMAGE ) ); + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( anImageObj ); + theBrowseObjectsEntries.append( anEntry ); + } if( anImageObj.IsNull() ) return false; @@ -487,14 +510,35 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags, } // must be done after all checks and before calling SetVisible() method below - closePreview(); + if ( isApplyAndClose() ) + closePreview(); if( !myIsEdit ) module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), anImageObj, true ); anImageObj->Update(); - theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced; + theUpdateFlags = UF_Model; + if ( isApplyAndClose() ) + theUpdateFlags |= UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced; + + if( isApplyAndClose() ) + { + commitDocOperation(); // to save the modifications in the data model + return true; + } + + if( SetNextFile() ) + { + theErrorMsg = ""; + module()->updateObjBrowser(); + return false; // and to continue the operation + } + + /*if( myFiles.count() > 1 ) + { + setIsApplyAndClose( true ); + }*/ return true; } @@ -522,7 +566,7 @@ bool HYDROGUI_ImportImageOp::isReferenceCorrect() const return isCorrect; } -void HYDROGUI_ImportImageOp::onApply() +void HYDROGUI_ImportImageOp::apply() { HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel(); @@ -538,7 +582,7 @@ void HYDROGUI_ImportImageOp::onApply() QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::Yes; } if ( aCanApply ) - HYDROGUI_Operation::onApply(); + HYDROGUI_Operation::apply(); else { aPanel->setRefImageName( "" ); onRefImageActivated( aPanel->getRefImageName() ); @@ -553,9 +597,20 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) if( myPreviewPrs ) // if the image is changed by choosing another file { - myPreviewPrs->setImage( myImage ); - myPreviewPrs->compute(); - + myPreviewPrs->setImage( myImage, true ); + if ( sender() ) // reset the previous presentation settings + { + QString aFileName = aPanel->getFileName(); + + aPanel->reset(); + aPanel->setIsEdit( myIsEdit ); + // restore the file name + aPanel->setFileName( aFileName ); + // fill the reference list + HYDROGUI_ImportImageDlg::PrsPointDataList aPrsPointDataList; + getReferenceDataList( aPrsPointDataList ); + aPanel->setPrsPointDataList( aPrsPointDataList ); + } if( myPreviewViewManager ) { if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() ) @@ -575,8 +630,7 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) myActiveViewManager = anApp->activeViewManager(); myPreviewPrs = new HYDROGUI_PrsImage( myIsEdit ? myEditedObject : 0 ); - myPreviewPrs->setImage( myImage ); - myPreviewPrs->compute(); + myPreviewPrs->setImage( myImage, true ); myPreviewViewManager = dynamic_cast( anApp->createViewManager( GraphicsView_Viewer::Type() ) ); @@ -595,37 +649,42 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage ) aViewPort->addItem( myPreviewPrs ); aViewPort->fitAll(); - + + if ( myEditedObject ) { + size_t aViewId = (size_t)aViewer; + module()->setObjectVisible( aViewId, myEditedObject, true ); + } + myPreviewPrs->setIsTransformationPointPreview( true ); + myPreviewPrs->setTransformationPointCursorShape( module()->getPrefEditCursor().shape() ); } connect( aViewer, SIGNAL( selectionChanged( GV_SelectionChangeStatus ) ), this, SLOT( onPointSelected() ) ); } } + } - // 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(); + // 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(); + } + // 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 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" ) ); - } + // 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 ); } + aPanel->setImageName( anImageName ); aPanel->setImageSize( myImage.size() ); @@ -677,17 +736,19 @@ void HYDROGUI_ImportImageOp::onModeActivated( int theMode ) void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName ) { + if( theName.isEmpty() ) { + if( myRefViewManager ) + closeView( myRefViewManager ); + return; + } + GraphicsView_ViewPort* aViewPort = 0; LightApp_Application* anApp = module()->getApp(); ///// Get a view port for the reference image preview if( myRefViewManager ) { - if( theName.isEmpty() ) - { - closeView( myRefViewManager ); - } - else if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() ) + if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() ) { aViewPort = aViewer->getActiveViewPort(); } @@ -717,9 +778,13 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName ) if( !aViewPort ) return; + size_t aViewId = (size_t)myRefViewManager->getViewer(); + // Remove the old presentation of the reference image if any if( myRefPreviewPrs ) { + module()->setObjectVisible( aViewId, myRefPreviewPrs->getObject(), false ); + myRefPreviewPrs->setCaption( QString() ); aViewPort->removeItem( myRefPreviewPrs ); @@ -737,16 +802,19 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName ) anImage = anImageObj->Image(); myRefPreviewPrs = new HYDROGUI_PrsImage( anImageObj ); - myRefPreviewPrs->setImage( anImage ); - myRefPreviewPrs->compute(); + myRefPreviewPrs->setImage( anImage, true ); myRefPreviewPrs->setIsTransformationPointPreview( true ); myRefPreviewPrs->setTransformationPointType( myPointType ); myRefPreviewPrs->setIsByTwoPoints( aPanel->isByTwoPoints() ); + myRefPreviewPrs->setTransformationPointCursorShape( module()->getPrefEditCursor().shape() ); + // Add the new reference image presentation to the appropriate view aViewPort->addItem( myRefPreviewPrs ); + + module()->setObjectVisible( aViewId, anImageObj, true ); } aViewPort->fitAll(); @@ -854,3 +922,22 @@ void HYDROGUI_ImportImageOp::closeView( GraphicsView_ViewManager* &aViewMgr ) aViewMgr = 0; } } + +void HYDROGUI_ImportImageOp::onFilesSelected( const QStringList& theFileNames ) +{ + myFiles = theFileNames; + myFileIndex = -1; + SetNextFile(); +} + +bool HYDROGUI_ImportImageOp::SetNextFile() +{ + myFileIndex++; + bool isEnabledEdit = myFiles.count()==1 || myFileIndex==myFiles.count(); + bool isValid = ( myFileIndex>=0 && myFileIndex( inputPanel() ); + aPanel->ActivateFile( aFile, isEnabledEdit ); + return isValid; +}