Crossplatformed Load of plugins libraries

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index dfd448576d3116a9f724bea80afb76b95cd242f0..6210f65007a4e6e414a51914a18484e7385921e9 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -94,13 +94,16 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
  * (only client lib, because server lib translates in SMESH_Gen_i::createHypothesis
  *  for normal work of *.py files )
  */
+      if( !myClientLib.isEmpty() )
+      {
 #ifdef WNT
       //myServerLib += ".dll";
-      myClientLib += ".dll";
+        myClientLib += ".dll";
 #else
       //myServerLib = "lib" + myServerLib + ".so";
-      myClientLib = "lib" + myClientLib + ".so";
+        myClientLib = "lib" + myClientLib + ".so";
 #endif
+      }
 
 
       QString aResName = atts.value("resources");

diff --git a/src/SMESH_SWIG/SMESH_Nut.py b/src/SMESH_SWIG/SMESH_Nut.py
index 4b2fb7a354932e3137aafb099b9d71522a4123b4..a3d6311ed3f6676cd944d43269431aeed2fd8f72 100755 (executable)
--- a/src/SMESH_SWIG/SMESH_Nut.py
+++ b/src/SMESH_SWIG/SMESH_Nut.py
@@ -138,7 +138,7 @@ smeshgui.SetName(salome.ObjectToID(algoMef), "Triangle (Mefisto)")
 
 print "-------------------------- NETGEN_3D"
 
-algoNg = smesh.CreateHypothesis( "NETGEN_3D", "libNETGENEngine.so" )
+algoNg = smesh.CreateHypothesis( "NETGEN_3D", "NETGENEngine" )
 print algoNg.GetName()
 print algoNg.GetId()
 smeshgui.SetName(salome.ObjectToID(algoNg), "Tetrahedron (NETGEN)")

diff --git a/src/SMESH_SWIG/SMESH_Partition1_tetra.py b/src/SMESH_SWIG/SMESH_Partition1_tetra.py
index c4b1b25c59e319213e9a88755854118acabd46bf..515e1fe10d3221a8a0a41d86bef4f2e161e57146 100644 (file)
--- a/src/SMESH_SWIG/SMESH_Partition1_tetra.py
+++ b/src/SMESH_SWIG/SMESH_Partition1_tetra.py
@@ -158,7 +158,7 @@ smeshgui.SetName(salome.ObjectToID(mefisto2D), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-netgen3D = smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
+netgen3D = smesh.CreateHypothesis("NETGEN_3D", "NETGENEngine")
 smeshgui.SetName(salome.ObjectToID(netgen3D), "NETGEN_3D")
 
 # ---- init a Mesh with the alveole

diff --git a/src/SMESH_SWIG/SMESH_box2_tetra.py b/src/SMESH_SWIG/SMESH_box2_tetra.py
index 054c9e64aeb4419a51aa1821da383553c564bd4a..1c7aa8a39086d1bc1045d4f05d9d6385c37afd7f 100644 (file)
--- a/src/SMESH_SWIG/SMESH_box2_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box2_tetra.py
@@ -119,7 +119,7 @@ smeshgui.SetName(salome.ObjectToID(mefisto2D), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-netgen3D = smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
+netgen3D = smesh.CreateHypothesis("NETGEN_3D", "NETGENEngine")
 smeshgui.SetName(salome.ObjectToID(netgen3D), "NETGEN_3D")
 
 # ---- init a Mesh with the shell

diff --git a/src/SMESH_SWIG/SMESH_box3_tetra.py b/src/SMESH_SWIG/SMESH_box3_tetra.py
index 9891bb9e8848f43887d6cba468b0f00fd9cc1ae0..c4cbf5c8860e6ca97486a3f88f0a94e505676658 100644 (file)
--- a/src/SMESH_SWIG/SMESH_box3_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box3_tetra.py
@@ -130,7 +130,7 @@ smeshgui.SetName(salome.ObjectToID(mefisto2D), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-netgen3D = smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
+netgen3D = smesh.CreateHypothesis("NETGEN_3D", "NETGENEngine")
 smeshgui.SetName(salome.ObjectToID(netgen3D), "NETGEN_3D")
 
 # ---- init a Mesh with the shell

diff --git a/src/SMESH_SWIG/SMESH_box_tetra.py b/src/SMESH_SWIG/SMESH_box_tetra.py
index 1a06cfde36a5c3e34f7344dbaccf47016313e5a5..982ec60537c86755bbc3e0ea9b55a87755220521 100644 (file)
--- a/src/SMESH_SWIG/SMESH_box_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box_tetra.py
@@ -91,7 +91,7 @@ smeshgui.SetName(salome.ObjectToID(mefisto2D), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-netgen3D = smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
+netgen3D = smesh.CreateHypothesis("NETGEN_3D", "NETGENEngine")
 smeshgui.SetName(salome.ObjectToID(netgen3D), "NETGEN_3D")
 
 # ---- init a Mesh with the boxe

diff --git a/src/SMESH_SWIG/SMESH_fixation_tetra.py b/src/SMESH_SWIG/SMESH_fixation_tetra.py
index 821a3d149289cd956b053b6dafc8fcee38f342a0..0163b0127a5bb75c8e83e040e56647af01cffaad 100644 (file)
--- a/src/SMESH_SWIG/SMESH_fixation_tetra.py
+++ b/src/SMESH_SWIG/SMESH_fixation_tetra.py
@@ -90,7 +90,7 @@ smeshgui.SetName(salome.ObjectToID(mefisto2D), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-netgen3D = smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
+netgen3D = smesh.CreateHypothesis("NETGEN_3D", "NETGENEngine")
 
 smeshgui.SetName(salome.ObjectToID(netgen3D), "NETGEN_3D")
 

diff --git a/src/SMESH_SWIG/SMESH_mechanic_tetra.py b/src/SMESH_SWIG/SMESH_mechanic_tetra.py
index 247cf97bccc72edf9e0b3ac3fb22f1a89ffae4d2..51946b306a0402c83ad943e1b49080a16863f05f 100644 (file)
--- a/src/SMESH_SWIG/SMESH_mechanic_tetra.py
+++ b/src/SMESH_SWIG/SMESH_mechanic_tetra.py
@@ -171,7 +171,7 @@ smeshgui.SetName(salome.ObjectToID(algoMef), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-algoNg = smesh.CreateHypothesis( "NETGEN_3D", "libNETGENEngine.so" )
+algoNg = smesh.CreateHypothesis( "NETGEN_3D", "NETGENEngine" )
 listHyp = algoNg.GetCompatibleHypothesis()
 for hyp in listHyp:
     print hyp

diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py
index 92ccb75676aa259a73556d1c3ac0010f586d86c2..b0113f3a0d6a9d91289f02c51b1d38cb98ebce1f 100644 (file)
--- a/src/SMESH_SWIG/smesh.py
+++ b/src/SMESH_SWIG/smesh.py
@@ -228,7 +228,7 @@ class Mesh_Segment_Python(Mesh_Segment):
          Private constructor
         """
         import Python1dPlugin
-        self.Create(mesh, geom, "Python_1D", "libPython1dEngine.so")
+        self.Create(mesh, geom, "Python_1D", "Python1dEngine")
 
     def PythonSplit1D(self, n, func):
         """
@@ -236,7 +236,7 @@ class Mesh_Segment_Python(Mesh_Segment):
          \param n for the number of segments that cut an edge
          \param func for the python function that calculate the length of all segments
         """
-        hyp = self.Hypothesis("PythonSplit1D", [n], "libPython1dEngine.so")
+        hyp = self.Hypothesis("PythonSplit1D", [n], "Python1dEngine")
         hyp.SetNumberOfSegments(n)
         hyp.SetPythonLog10RatioFunction(func)
         return hyp
@@ -306,10 +306,10 @@ class Mesh_Tetrahedron(Mesh_Algorithm):
          Private constructor
         """
         if algo == NETGEN:
-            self.Create(mesh, geom, "NETGEN_3D", "libNETGENEngine.so")
+            self.Create(mesh, geom, "NETGEN_3D", "NETGENEngine")
         elif algo == GHS3D:
             import GHS3DPlugin
-            self.Create(mesh, geom, "GHS3D_3D" , "libGHS3DEngine.so")
+            self.Create(mesh, geom, "GHS3D_3D" , "GHS3DEngine")
 
     def MaxElementVolume(self, vol):
         """