#include <TCollection_AsciiString.hxx>
#include <OSD.hxx>
-#include "Utils_CorbaException.hxx"
-
-#include "utilities.h"
-#include <fstream>
-#include <stdio.h>
-
#ifdef WNT
#include <windows.h>
#include <process.h>
#define UnLoadLib( handle ) dlclose( handle );
#endif
-#include <HDFOI.hxx>
-
#include "SMESH_Gen_i.hxx"
-#include "SMESH_Mesh_i.hxx"
-#include "SMESH_Hypothesis_i.hxx"
-#include "SMESH_Algo_i.hxx"
-#include "SMESH_Group_i.hxx"
-#include "SMESH_PythonDump.hxx"
-#include "SMESH_PreMeshInfo.hxx"
-
-#include "SMESHDS_Document.hxx"
-#include "SMESHDS_Group.hxx"
-#include "SMESHDS_GroupOnGeom.hxx"
-#include "SMESH_Mesh.hxx"
-#include "SMESH_Hypothesis.hxx"
-#include "SMESH_Group.hxx"
-#include "SMESH_MeshEditor.hxx"
#include "SMDS_EdgePosition.hxx"
#include "SMDS_FacePosition.hxx"
#include "SMDS_SetIterator.hxx"
#include "SMDS_SpacePosition.hxx"
#include "SMDS_VertexPosition.hxx"
+#include "SMESHDS_Document.hxx"
+#include "SMESHDS_Group.hxx"
+#include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESH_Algo_i.hxx"
+#include "SMESH_File.hxx"
+#include "SMESH_Group.hxx"
+#include "SMESH_Group_i.hxx"
+#include "SMESH_Hypothesis.hxx"
+#include "SMESH_Hypothesis_i.hxx"
+#include "SMESH_Mesh.hxx"
+#include "SMESH_MeshEditor.hxx"
+#include "SMESH_Mesh_i.hxx"
+#include "SMESH_PreMeshInfo.hxx"
+#include "SMESH_PythonDump.hxx"
#include CORBA_SERVER_HEADER(SMESH_Group)
#include CORBA_SERVER_HEADER(SMESH_Filter)
#ifdef WITH_CGNS
#include "DriverCGNS_Read.hxx"
#endif
+#include "memoire.h"
+
+#include <GEOM_Client.hxx>
-#include "SALOMEDS_Tool.hxx"
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "OpUtil.hxx"
+#include <Basics_Utils.hxx>
+#include <HDFOI.hxx>
+#include <OpUtil.hxx>
+#include <SALOMEDS_Tool.hxx>
+#include <SALOME_Container_i.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOME_NamingService.hxx>
+#include <Utils_CorbaException.hxx>
+#include <Utils_ExceptHandlers.hxx>
+#include <Utils_SINGLETON.hxx>
+#include <utilities.h>
#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
#include CORBA_CLIENT_HEADER(SALOME_Session)
-#include "GEOM_Client.hxx"
-#include "Utils_ExceptHandlers.hxx"
-#include "memoire.h"
-#include "Basics_Utils.hxx"
-
#include <map>
+#include <fstream>
+#include <cstdio>
using namespace std;
using SMESH::TPythonDump;
+using SMESH::TVar;
#define NUM_TMP_FILES 2
if ( strcmp(name, "historical_python_dump") == 0 )
{
myIsHistoricalPythonDump = ( value[0] == '1' || toupper(value[0]) == 'T' ); // 1 || true
- msgToGUI = "preferences:SMESH:historical_python_dump:";
+ msgToGUI = "preferences/SMESH/historical_python_dump/";
msgToGUI += myIsHistoricalPythonDump ? "true" : "false";
}
else if ( strcmp(name, "forget_mesh_on_hyp_modif") == 0 )
{
myToForgetMeshDataOnHypModif = ( value[0] == '1' || toupper(value[0]) == 'T' ); // 1 || true
- msgToGUI = "preferences:SMESH:forget_mesh_on_hyp_modif:";
+ msgToGUI = "preferences/SMESH/forget_mesh_on_hyp_modif/";
msgToGUI += myToForgetMeshDataOnHypModif ? "true" : "false";
}
try {
// get mesh servant
SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+ meshServant->Load();
ASSERT( meshServant );
if ( meshServant ) {
// NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation"
try {
// get mesh servant
SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+ meshServant->Load();
ASSERT( meshServant );
if ( meshServant ) {
// NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation"
aPythonDump << "], ";
aPythonDump << theUniteIdenticalGroups << ", "
<< theMergeNodesAndElements << ", "
- << theMergeTolerance << ")";
+ << TVar( theMergeTolerance ) << ")";
delete pPythonDump; // enable python dump from GetGroups()
delete aFile;
// Remove temporary files created from the stream
- // if ( !isMultiFile )
- // SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.ToCString(), aFileSeq.in(), true );
-
+ if ( !isMultiFile )
+ {
+ SMESH_File meshFile( meshfile.ToCString() );
+ if ( !meshFile ) // no meshfile exists
+ {
+ SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.ToCString(), aFileSeq.in(), true );
+ }
+ else
+ {
+ Engines::Container_var container = GetContainerRef();
+ if ( Engines_Container_i* container_i = SMESH::DownCast<Engines_Container_i*>( container ))
+ {
+ container_i->registerTemporaryFile( filename.ToCString() );
+ container_i->registerTemporaryFile( meshfile.ToCString() );
+ container_i->registerTemporaryFile( tmpDir.ToCString() );
+ }
+ }
+ }
pd << ""; // prevent optimizing pd out
INFOS( "SMESH_Gen_i::Load completed" );