Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #740 (p.1 + p.2)
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ExportCalculationOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
b/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
index d91522bbe093b1b6dc28b9f2b7e710c037949675..93467ea163c0cb457549bfa8ef3c3a4b4a20040f 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ExportCalculationOp.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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,7
+20,7
@@
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool
2
.h"
#include <HYDROData_CalculationCase.h>
#include <HYDROData_CalculationCase.h>
@@
-88,10
+84,12
@@
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
dynamic_cast<SalomeApp_Study*>( module()->getApp()->activeStudy() );
// Export
dynamic_cast<SalomeApp_Study*>( module()->getApp()->activeStudy() );
// Export
+ QString anErrorMsg;
if ( aStudy ) {
SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy->studyDS() );
GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen();
if ( aStudy ) {
SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy->studyDS() );
GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen();
- if ( aCalculation->Export( aGeomEngine, aDSStudy ) ) {
+ QString anEntry;
+ if ( aCalculation->Export( aGeomEngine, aDSStudy, anEntry, theErrorMsg ) ) {
theUpdateFlags = UF_ObjBrowser;
isOk = true;
}
theUpdateFlags = UF_ObjBrowser;
isOk = true;
}