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 #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ExportCalculationOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
b/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
index 8e3f852269c927ff25d3d220ff6a4747b65b3493..4ee707347258db6519a6c85f9041314163de9ccd 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
@@
-68,7
+64,8
@@
void HYDROGUI_ExportCalculationOp::commitOperation()
}
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
// Get the selected calculation case
Handle(HYDROData_CalculationCase) aCalculation =
{
// Get the selected calculation case
Handle(HYDROData_CalculationCase) aCalculation =
@@
-90,7
+87,8
@@
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
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 ) ) {
theUpdateFlags = UF_ObjBrowser;
isOk = true;
}
theUpdateFlags = UF_ObjBrowser;
isOk = true;
}
@@
-107,9
+105,10
@@
void HYDROGUI_ExportCalculationOp::onApply()
QString anErrorMsg;
bool aResult = false;
QString anErrorMsg;
bool aResult = false;
-
+ QStringList aBrowseObjectsEntries;
+
try {
try {
- aResult = processApply( anUpdateFlags, anErrorMsg );
+ aResult = processApply( anUpdateFlags, anErrorMsg
, aBrowseObjectsEntries
);
}
catch ( Standard_Failure )
{
}
catch ( Standard_Failure )
{
@@
-127,6
+126,7
@@
void HYDROGUI_ExportCalculationOp::onApply()
if ( aResult ) {
module()->update( anUpdateFlags );
commit();
if ( aResult ) {
module()->update( anUpdateFlags );
commit();
+ browseObjects( aBrowseObjectsEntries );
// Show message box
SUIT_MessageBox::information( module()->getApp()->desktop(),
// Show message box
SUIT_MessageBox::information( module()->getApp()->desktop(),