Avoid crash at "import smesh_selection" in terminal mode

+ don't print useless mesh log

diff --git a/src/SMESH_SWIG/SMESH_Partition1_tetra.py b/src/SMESH_SWIG/SMESH_Partition1_tetra.py
index c12165c0dd60815b84c143d3932469af60ab06b5..5907e3a7f651ffeb6f627722ce8e894115e43ca0 100644 (file)
--- a/src/SMESH_SWIG/SMESH_Partition1_tetra.py
+++ b/src/SMESH_SWIG/SMESH_Partition1_tetra.py
@@ -172,8 +172,8 @@ ret = mesh.Compute()
 
 if ret != 0:
     log=mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the Mesh_mechanic:")
     print("Number of nodes       : ", mesh.NbNodes())
     print("Number of edges       : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_box2_tetra.py b/src/SMESH_SWIG/SMESH_box2_tetra.py
index bab8d4abb796f0ca2f86a0b97112eb7f3d6e1a48..40c2ff2894b8e185fb28a92ba120a8d392b5e17d 100644 (file)
--- a/src/SMESH_SWIG/SMESH_box2_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box2_tetra.py
@@ -126,8 +126,8 @@ ret = mesh.Compute()
 print(ret)
 if ret != 0:
     log = mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the MeshBox2:")
     print("Number of nodes       : ", mesh.NbNodes())
     print("Number of edges       : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_box3_tetra.py b/src/SMESH_SWIG/SMESH_box3_tetra.py
index 5f521343890c7e131c9ec5e5155c2ef41a7e157b..e97be188472d3da323aa57576196f2a5919382a9 100644 (file)
--- a/src/SMESH_SWIG/SMESH_box3_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box3_tetra.py
@@ -136,8 +136,8 @@ ret = mesh.Compute()
 print(ret)
 if ret != 0:
     log = mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the MeshBox3:")
     print("Number of nodes       : ", mesh.NbNodes())
     print("Number of edges       : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_box_tetra.py b/src/SMESH_SWIG/SMESH_box_tetra.py
index f4b257c87ac59f0062f9f0393a1d0156d12ba3f2..d9d425c7f220b6c5f9de92537f0927a46cb60737 100644 (file)
--- a/src/SMESH_SWIG/SMESH_box_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box_tetra.py
@@ -95,8 +95,8 @@ ret = mesh.Compute()
 print(ret)
 if ret != 0:
     log = mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the MeshBox:")
     print("Number of nodes       : ", mesh.NbNodes())
     print("Number of edges       : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_fixation_hexa.py b/src/SMESH_SWIG/SMESH_fixation_hexa.py
index 076e13bf264fcc1fd5b5fb1eed919d336f7f961c..ac94fb2c4094b762f869ab7c2da1040b84e7fd34 100644 (file)
--- a/src/SMESH_SWIG/SMESH_fixation_hexa.py
+++ b/src/SMESH_SWIG/SMESH_fixation_hexa.py
@@ -87,8 +87,8 @@ ret = mesh.Compute()
 print(ret)
 if ret != 0:
     log = mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the MeshcompShel:")
     print("Number of nodes       : ", mesh.NbNodes())
     print("Number of edges       : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_fixation_tetra.py b/src/SMESH_SWIG/SMESH_fixation_tetra.py
index ecbd2988354ec3f2823f4f6f8b85d594d4b352c1..e760a8348c78349595deadb751cb4b353850bf0d 100644 (file)
--- a/src/SMESH_SWIG/SMESH_fixation_tetra.py
+++ b/src/SMESH_SWIG/SMESH_fixation_tetra.py
@@ -110,8 +110,8 @@ ret = mesh.Compute(mesh)
 print(ret)
 if ret != 0:
     log = mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the MeshcompShel:")
     print("Number of nodes        : ", mesh.NbNodes())
     print("Number of edges        : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_flight_skin.py b/src/SMESH_SWIG/SMESH_flight_skin.py
index 05d1f94f920c11dbc2073ee5d7bfe95969d87baa..0805c28423cc2c5807e5ccb4f2b3b53d9ee29112 100644 (file)
--- a/src/SMESH_SWIG/SMESH_flight_skin.py
+++ b/src/SMESH_SWIG/SMESH_flight_skin.py
@@ -96,8 +96,8 @@ ret = mesh.Compute()
 print(ret)
 if ret != 0:
     log = mesh.GetLog(0) # no erase trace
-    for linelog in log:
-        print(linelog)
+    # for linelog in log:
+    #     print(linelog)
     print("Information about the Mesh_mechanic_tetra:")
     print("Number of nodes      : ", mesh.NbNodes())
     print("Number of edges      : ", mesh.NbEdges())

diff --git a/src/SMESH_SWIG/SMESH_test.py b/src/SMESH_SWIG/SMESH_test.py
index 7b61472b154884e3baa3bac701d0f51c1c5a29e5..3b46f54800a57c320168de78f030a055e2e14350 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test.py
+++ b/src/SMESH_SWIG/SMESH_test.py
@@ -103,7 +103,7 @@ face = salome.IDToObject(idf)
 
 ret = mesh.Compute(face)
 print(ret)
-log = mesh.GetLog(0) # 0 - GetLog without ClearLog after, else if 1 - ClearLog after
+log = [] #mesh.GetLog(0) # 0 - GetLog without ClearLog after, else if 1 - ClearLog after
 for a in log:
     print("-------")
     ii = 0

diff --git a/src/SMESH_SWIG/SMESH_test2.py b/src/SMESH_SWIG/SMESH_test2.py
index 271d4261e1ae082f8a028942b584abcb135a3366..9bd7f1016f9f164a83550b9574098c287287e4a3 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test2.py
+++ b/src/SMESH_SWIG/SMESH_test2.py
@@ -32,7 +32,7 @@ print("-------------------------- compute box")
 ret = mesh.Compute()
 print(ret)
 log = mesh.GetLog(0); # no erase trace
-for linelog in log:
-    print(linelog)
+# for linelog in log:
+#     print(linelog)
 
 salome.sg.updateObjBrowser()

diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
index f44a29d9046baa1ab4d765c8e6da018da6071159..8e8ed0ad832e96d9efcf0ef438076f7e065030c5 100644 (file)
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
@@ -564,8 +564,11 @@ void SMESH_Swig::init()
   };
 
   // load SMESH GUI if it's not yet loaded
-  ProcessVoidEvent( new TInitEvent() );
-  SMESHGUI::GetSMESHGen()->UpdateStudy();
+  if ( SUIT_Session::session() )
+  {
+    ProcessVoidEvent( new TInitEvent() );
+    SMESHGUI::GetSMESHGen()->UpdateStudy();
+  }
 }
 
 /////////////////////////////////////////////////////////////////