PR: dump new init mode

diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 59f62042116e21e6a38ee96dfb68f6f7ed168838..2375a485b89b19c621fc6aa53fe25d346abd4e54 100644 (file)
--- a/resources/StdMeshers.xml
+++ b/resources/StdMeshers.xml
@@ -227,7 +227,7 @@
                output   ="EDGE"
                dim      ="1">
       <python-wrap>
                output   ="EDGE"
                dim      ="1">
       <python-wrap>

-        <algo>CompositeSegment_1D=Segment(algo=smesh.COMPOSITE)</algo>
+        <algo>CompositeSegment_1D=Segment(algo=smeshDC.COMPOSITE)</algo>

         <hypo>LocalLength=LocalLength(SetLength(), ,SetPrecision())</hypo>
         <hypo>MaxLength=MaxSize(SetLength())</hypo>
         <hypo>Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges())</hypo>
         <hypo>LocalLength=LocalLength(SetLength(), ,SetPrecision())</hypo>
         <hypo>MaxLength=MaxSize(SetLength())</hypo>
         <hypo>Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges())</hypo>


@@ -244,7 +244,7 @@
                output="EDGE"
                dim="1">
       <python-wrap>
                output="EDGE"
                dim="1">
       <python-wrap>

-        <algo>Python_1D=Segment(algo=smesh.PYTHON)</algo>
+        <algo>Python_1D=Segment(algo=smeshDC.PYTHON)</algo>

         <hypo>PythonSplit1D=PythonSplit1D(SetNumberOfSegments(),SetPythonLog10RatioFunction())</hypo>
       </python-wrap>
     </algorithm>
         <hypo>PythonSplit1D=PythonSplit1D(SetNumberOfSegments(),SetPythonLog10RatioFunction())</hypo>
       </python-wrap>
     </algorithm>


@@ -258,7 +258,7 @@
                output    ="TRIA"
                dim       ="2">
       <python-wrap>
                output    ="TRIA"
                dim       ="2">
       <python-wrap>

-        <algo>MEFISTO_2D=Triangle(algo=smesh.MEFISTO)</algo>
+        <algo>MEFISTO_2D=Triangle(algo=smeshDC.MEFISTO)</algo>

         <hypo>LengthFromEdges=LengthFromEdges()</hypo>
         <hypo>MaxElementArea=MaxElementArea(SetMaxElementArea())</hypo>
         <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
         <hypo>LengthFromEdges=LengthFromEdges()</hypo>
         <hypo>MaxElementArea=MaxElementArea(SetMaxElementArea())</hypo>
         <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>


@@ -274,7 +274,7 @@
                output   ="QUAD"
                dim      ="2">
       <python-wrap>
                output   ="QUAD"
                dim      ="2">
       <python-wrap>

-        <algo>Quadrangle_2D=Quadrangle(algo=smesh.QUADRANGLE)</algo>
+        <algo>Quadrangle_2D=Quadrangle(algo=smeshDC.QUADRANGLE)</algo>

         <hypo>QuadrangleParams=QuadrangleParameters(SetQuadType(),SetTriaVertex())</hypo>
         <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
       </python-wrap>
         <hypo>QuadrangleParams=QuadrangleParameters(SetQuadType(),SetTriaVertex())</hypo>
         <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
       </python-wrap>


@@ -288,7 +288,7 @@
                opt-hypos="ViscousLayers"
                dim      ="3">
       <python-wrap>
                opt-hypos="ViscousLayers"
                dim      ="3">
       <python-wrap>

-        <algo>Hexa_3D=Hexahedron(algo=smesh.Hexa)</algo>
+        <algo>Hexa_3D=Hexahedron(algo=smeshDC.Hexa)</algo>

         <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo>
       </python-wrap>
     </algorithm>
         <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo>
       </python-wrap>
     </algorithm>


@@ -419,7 +419,7 @@
                output  ="QUAD,TRIA"
                dim     ="2">
       <python-wrap>
                output  ="QUAD,TRIA"
                dim     ="2">
       <python-wrap>

-        <algo>RadialQuadrangle_1D2D=Quadrangle(algo=smesh.RADIAL_QUAD)</algo>
+        <algo>RadialQuadrangle_1D2D=Quadrangle(algo=smeshDC.RADIAL_QUAD)</algo>

         <hypo>NumberOfLayers2D=NumberOfLayers(SetNumberOfLayers())</hypo>
       </python-wrap>
     </algorithm>
         <hypo>NumberOfLayers2D=NumberOfLayers(SetNumberOfLayers())</hypo>
       </python-wrap>
     </algorithm>

diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx
index b609c57501ef9d686398557ee7507a9d9dfeb5dc..200ed9ec34adebbb356d5d885f5fa5a7af607515 100644 (file)
--- a/src/SMESH_I/SMESH_DumpPython.cxx
+++ b/src/SMESH_I/SMESH_DumpPython.cxx
@@ -831,9 +831,9 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
   aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t";
   aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t";
   if ( isPublished )
   aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t";
   aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t";
   if ( isPublished )

-    aScript += aSMESHGen + ".SetCurrentStudy(theStudy)";
+    aScript += aSMESHGen + " = smeshDC.smeshInstance(theStudy)";

   else
   else

-    aScript += aSMESHGen + ".SetCurrentStudy(None)";
+    aScript += aSMESHGen + " = smeshDC.smeshInstance(None)";

 
   // import python files corresponding to plugins
   set<string> moduleNameSet;
 
   // import python files corresponding to plugins
   set<string> moduleNameSet;


@@ -963,7 +963,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
   TCollection_AsciiString initPart = "import ";
   if ( isMultiFile )
     initPart += helper + "salome, ";
   TCollection_AsciiString initPart = "import ";
   if ( isMultiFile )
     initPart += helper + "salome, ";

-  initPart += aSmeshpy + ", SMESH, SALOMEDS\n";
+  initPart += " smeshDC, SMESH, SALOMEDS\n";

   if ( importGeom && isMultiFile )
   {
     initPart += ("\n## import GEOM dump file ## \n"
   if ( importGeom && isMultiFile )
   {
     initPart += ("\n## import GEOM dump file ## \n"