-// Copyright (C) 2007-2015 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
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();
void HYDROGUI_ImportImageOp::commitOperation()
{
- closePreview();
+ if ( isApplyAndClose() )
+ closePreview();
HYDROGUI_Operation::commitOperation();
}
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;
}
{
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 ) )
{
}
// 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;
}
return isCorrect;
}
-void HYDROGUI_ImportImageOp::onApply()
+void HYDROGUI_ImportImageOp::apply()
{
HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::Yes;
}
if ( aCanApply )
- HYDROGUI_Operation::onApply();
+ HYDROGUI_Operation::apply();
else {
aPanel->setRefImageName( "" );
onRefImageActivated( aPanel->getRefImageName() );
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() ) );
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 );
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();
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<myFiles.count() );
+ QString aFile = isValid ? myFiles[myFileIndex] : "";
+
+ HYDROGUI_ImportImageDlg* aPanel = dynamic_cast<HYDROGUI_ImportImageDlg*>( inputPanel() );
+ aPanel->ActivateFile( aFile, isEnabledEdit );
+ return isValid;
+}