-// 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
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 ) )
{
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;
}
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;
+}