Merge from V6_main_20120808 08Aug12

[modules/visu.git] / src / VISU_SWIG / visu_med.py

diff --git a/src/VISU_SWIG/visu_med.py b/src/VISU_SWIG/visu_med.py
index edaab1c60c0a21e79a2ca2ad9202d011a8d37c3f..be4c35e3c32eb725c2839908213d3075b7a7afd3 100644 (file)
--- a/src/VISU_SWIG/visu_med.py
+++ b/src/VISU_SWIG/visu_med.py
@@ -1,20 +1,39 @@
-#  VISU VISU_SWIG : binding of C++ implementation and Python
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  Copyright (C) 2003  CEA/DEN, EDF R&D
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+#  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_med.py
 #  Module : VISU
-
+#
 import os
 import salome
 import SALOMEDS
 import SALOME_MED
 import VISU
 
-from libSALOME_Swig import *
-sg = SALOMEGUI_Swig()
+if salome.hasDesktop():
+    from libSALOME_Swig import *
+    sg = SALOMEGUI_Swig()
 
 def getMedObjectFromStudy():
     mySO = salome.myStudy.FindObject("Objet MED")
@@ -40,20 +59,22 @@ def getFieldObjectFromStudy(number,subnumber):
         print "ERROR: No Field Object stored in this Study"
         return None
 
-med_comp = salome.lcc.FindOrLoadComponent("FactoryServer", "Med")
+med_comp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED")
 
-medDir = os.getenv('SALOME_ROOT_DIR') + '/data/'
+medDir = os.getenv('DATA_DIR') + '/MedFiles/'
 
 def importMedFrom(medDir,medFile):
     medFile = medDir + medFile
     med_comp.readStructFileWithFieldType(medFile,salome.myStudyName)
-    sg.updateObjBrowser(1)
+    if salome.hasDesktop():
+        sg.updateObjBrowser(1)
   
 def importMed(medFile):
     importMedFrom(medDir,medFile)
 
 #med_obj = getMedObjectFromStudy()
-myVisu = salome.lcc.FindOrLoadComponent("FactoryServer", "Visu")
+myVisu = salome.lcc.FindOrLoadComponent("FactoryServer", "VISU")
+myVisu.SetCurrentStudy(salome.myStudy)
 print "Use importMed(medFile) or importMedFrom(medDir,medFile) functions !"
 
 #myField = getFieldObjectFromStudy(2,1)