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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ExportCalculationOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
b/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
index 93467ea163c0cb457549bfa8ef3c3a4b4a20040f..77978ee51bc52b9902ac70383030e6603f3f16eb 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
@@
-65,7
+65,7
@@
void HYDROGUI_ExportCalculationOp::commitOperation()
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
QString& theErrorMsg,
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
QString& theErrorMsg,
- QStringList& theBrowseObjectsEntries
)
+ QStringList& theBrowseObjectsEntries)
{
// Get the selected calculation case
Handle(HYDROData_CalculationCase) aCalculation =
{
// Get the selected calculation case
Handle(HYDROData_CalculationCase) aCalculation =
@@
-84,12
+84,13
@@
bool HYDROGUI_ExportCalculationOp::processApply( int& theUpdateFlags,
dynamic_cast<SalomeApp_Study*>( module()->getApp()->activeStudy() );
// Export
dynamic_cast<SalomeApp_Study*>( module()->getApp()->activeStudy() );
// Export
+ myStatMess.clear();
QString anErrorMsg;
if ( aStudy ) {
SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy->studyDS() );
GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen();
QString anEntry;
QString anErrorMsg;
if ( aStudy ) {
SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy->studyDS() );
GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen();
QString anEntry;
- if ( aCalculation->Export( aGeomEngine, aDSStudy, anEntry, theErrorMsg ) ) {
+ if ( aCalculation->Export( aGeomEngine, aDSStudy, anEntry, theErrorMsg
, myStatMess
) ) {
theUpdateFlags = UF_ObjBrowser;
isOk = true;
}
theUpdateFlags = UF_ObjBrowser;
isOk = true;
}
@@
-132,7
+133,7
@@
void HYDROGUI_ExportCalculationOp::onApply()
// Show message box
SUIT_MessageBox::information( module()->getApp()->desktop(),
tr( "EXPORT_STATUS" ),
// Show message box
SUIT_MessageBox::information( module()->getApp()->desktop(),
tr( "EXPORT_STATUS" ),
- tr( "EXPORT_FINISHED") );
+ tr( "EXPORT_FINISHED")
+ "\n" + getStatMess()
);
}
else {
abort();
}
else {
abort();
@@
-147,3
+148,8
@@
void HYDROGUI_ExportCalculationOp::onApply()
anErrorMsg );
}
}
anErrorMsg );
}
}
+
+QString HYDROGUI_ExportCalculationOp::getStatMess()
+{
+ return myStatMess;
+}