Merge pull request #26 from jnbrunet/replace_sofaallcommoncomponents

jnbrunet · web-flow · commit e6599934e361 · 2020-07-01T12:49:49.000+02:00
Replace all SofaAllCommonComponents occurrences by SofaComponentAll.
diff --git a/bindings/Sofa/package/__init__.py b/bindings/Sofa/package/__init__.py
@@ -8,7 +8,7 @@
     import Sofa.Core
     import Sofa.Simulation
     import SofaRuntime
-    SofaRuntime.importPlugin("SofaAllCommonComponents")
+    SofaRuntime.importPlugin("SofaComponentAll")
 
     n = Sofa.Core.Node("MyNode")
     n.addChild("Node2")
diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera_doc.h
@@ -39,7 +39,7 @@ static auto baseCameraClass =
 
             import Sofa.Core
             import SofaRuntime
-            SofaRuntime.importPlugin("SofaAllCommonComponents")
+            SofaRuntime.importPlugin("SofaComponentAll")
 
             root = Sofa.Core.Node("root")
             root.addObject("Camera", name="c")
diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink_doc.h
@@ -40,7 +40,7 @@ static auto baseLinkClass =
 
             import Sofa.Core
             import SofaRuntime
-            SofaRuntime.importPlugin("SofaAllCommonComponents")
+            SofaRuntime.importPlugin("SofaComponentAll")
 
             root = Sofa.Core.Node("root")
             root.addObject("MechanicalObject", name="t")
diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject_doc.h
@@ -44,7 +44,7 @@ static auto Class =
 
             import Sofa.Core
             import SofaRuntime
-            SofaRuntime.importPlugin("SofaAllCommonComponents")
+            SofaRuntime.importPlugin("SofaComponentAll")
 
             root = Sofa.Core.Node("root")
             root.addObject("MechanicalObject", name="obj") # Add a common Sofa object
diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h
@@ -43,7 +43,7 @@ static auto Class =
 
              import Sofa.Core
              import SofaRuntime
-             SofaRuntime.importPlugin("SofaAllCommonComponents")
+             SofaRuntime.importPlugin("SofaComponentAll")
 
              n = Sofa.Core.Node("MyNode")
              Sofa.Simulation.init(n)
diff --git a/bindings/Sofa/tests/Core/ForceField.py b/bindings/Sofa/tests/Core/ForceField.py
@@ -41,7 +41,7 @@ def createParticle(node, node_name, use_implicit_scheme, use_iterative_solver):
 
 
 def rssffScene(use_implicit_scheme=True, use_iterative_solver=True):
-    SofaRuntime.importPlugin("SofaAllCommonComponents")
+    SofaRuntime.importPlugin("SofaComponentAll")
     SofaRuntime.importPlugin("SofaSparseSolver")
     node = Sofa.Core.Node("root")
     node.gravity = [0, -10, 0]
diff --git a/bindings/Sofa/tests/bench_datacontainer.py b/bindings/Sofa/tests/bench_datacontainer.py
@@ -6,7 +6,7 @@
 import Sofa.Core
 import SofaRuntime
 
-SofaRuntime.importPlugin("SofaAllCommonComponents")
+SofaRuntime.importPlugin("SofaComponentAll")
 
 rawcpy = numpy.zeros((1000000,3), dtype=numpy.float64)
 
diff --git a/bindings/Sofa/tests/bench_node.py b/bindings/Sofa/tests/bench_node.py
@@ -10,7 +10,7 @@
 import Sofa.Core
 import SofaRuntime
 
-SofaRuntime.importPlugin("SofaAllCommonComponents")
+SofaRuntime.importPlugin("SofaComponentAll")
 
 it=1000
 
diff --git a/bindings/Sofa/tests/benchmark.py b/bindings/Sofa/tests/benchmark.py
@@ -9,7 +9,7 @@
 import Sofa.Core
 import SofaRuntime
 
-SofaRuntime.importPlugin("SofaAllCommonComponents")
+SofaRuntime.importPlugin("SofaComponentAll")
 
 import numpy
 rawcpy = numpy.zeros((1000000,3), dtype=numpy.float64)
diff --git a/bindings/Sofa/tests/dataaccess.py b/bindings/Sofa/tests/dataaccess.py
@@ -8,7 +8,7 @@
 import Sofa.Core
 import SofaRuntime
 
-SofaRuntime.importPlugin("SofaAllCommonComponents")
+SofaRuntime.importPlugin("SofaComponentAll")
                         
 def oldSofa(obj):
         ol = obj.position.tolist()
diff --git a/bindings/Sofa/tests/minitest.py b/bindings/Sofa/tests/minitest.py
@@ -9,7 +9,7 @@
 import Sofa
 
 ## Register all the common component in the factory. 
-#SofaRuntime.importPlugin("SofaAllCommonComponents")
+#SofaRuntime.importPlugin("SofaComponentAll")
 
 ## Init the simulation singleton. 
 
diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp
@@ -106,7 +106,7 @@ PYBIND11_MODULE(SofaRuntime, m) {
                 .. code-block:: python
 
                    import SofaRuntime
-                   SofaRuntime.importPlugin("SofaAllCommonComponents")
+                   SofaRuntime.importPlugin("SofaComponentAll")
 
               )doc";
 
diff --git a/docs/sphinx-stubs/SofaRuntime/__init__.py b/docs/sphinx-stubs/SofaRuntime/__init__.py
@@ -12,7 +12,7 @@
                 .. code-block:: python
 
                    import SofaRuntime
-                   SofaRuntime.importPlugin("SofaAllCommonComponents")
+                   SofaRuntime.importPlugin("SofaComponentAll")
 
               """
 import SofaRuntime
diff --git a/docs/sphinx/source/menu/SofaPlugin.rst b/docs/sphinx/source/menu/SofaPlugin.rst
@@ -32,10 +32,10 @@ The following code should cover most basic SOFA elements:
 .. code-block:: python
 
         # to be able to create sofa objects you need to first load the plugins that implement them.
-        # For simplicity you can load the plugin "SofaAllCommonComponents" that will load all most
+        # For simplicity you can load the plugin "SofaComponentAll" that will load all most
         # common sofa objects.
         import SofaRuntime
-        SofaRuntime.importPlugin("SofaAllCommonComponents")
+        SofaRuntime.importPlugin("SofaComponentAll")
 
         # to create elements like Node or objects
 	import Sofa.Core
diff --git a/examples/ControllerScene.py b/examples/ControllerScene.py
@@ -108,7 +108,7 @@ def main():
     # can be executed from terminal directly:
 
     # Register all the common component in the factory.
-    SofaRuntime.importPlugin("SofaAllCommonComponents")
+    SofaRuntime.importPlugin("SofaComponentAll")
     SofaRuntime.importPlugin("SofaOpenglVisual")
     global _runAsPythonScript
     _runAsPythonScript = True
diff --git a/examples/ReadTheDocs_Example.py b/examples/ReadTheDocs_Example.py
@@ -8,7 +8,7 @@
 import SofaRuntime
 
 ## Register all the common component in the factory. 
-SofaRuntime.importPlugin("SofaAllCommonComponents")
+SofaRuntime.importPlugin("SofaComponentAll")
 
 def createScene(rootNode):
         rootNode.addObject("OglGrid", nbSubdiv=10, size=1000)
diff --git a/examples/pygame_renderingloop/pygame_test.py b/examples/pygame_renderingloop/pygame_test.py
@@ -22,7 +22,7 @@ def onEvent(self, e):
                         #print("SIMULATION: " + " "+ str(self.target) +"  " + str(cameraMVM))
                 
 def createScene(root):
-        root.addObject("RequiredPlugin", name="SofaAllCommonComponents")
+        root.addObject("RequiredPlugin", name="SofaComponentAll")
         root.addObject("RequiredPlugin", name="SofaOpenglVisual")
         root.addObject("DefaultAnimationLoop")
         root.addObject("DefaultVisualManagerLoop")
@@ -46,7 +46,7 @@ def createScene(root):
         import threading
         from backend_pygame import show
 
-        SofaRuntime.importPlugin("SofaAllCommonComponents")
+        SofaRuntime.importPlugin("SofaComponentAll")
         
         scene = createScene(Sofa.Core.Node("root"))
 
