From: abd <abd@opencascade.com>
Date: Thu, 27 Apr 2006 12:04:36 +0000 (+0000)
Subject: Crossplatformed Load of plugins libraries
X-Git-Tag: LAST_STABLE_VERSION_21_09_2006_ON_3_2_0~34
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=128cfc72cae6870013f577a4ab51e33cfd683bc0;p=modules%2Fsmesh.git

Crossplatformed Load of plugins libraries
---

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index dfd448576..6210f6500 100644
--- 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 4b2fb7a35..a3d6311ed 100755
--- 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 c4b1b25c5..515e1fe10 100644
--- 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 054c9e64a..1c7aa8a39 100644
--- 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 9891bb9e8..c4cbf5c88 100644
--- 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 1a06cfde3..982ec6053 100644
--- 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 821a3d149..0163b0127 100644
--- 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 247cf97bc..51946b306 100644
--- 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 92ccb7567..b0113f3a0 100644
--- 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):
         """