Salome HOME
Merge branch 'V7_dev'
authorvsr <vsr@opencascade.com>
Thu, 24 Mar 2016 13:01:26 +0000 (16:01 +0300)
committervsr <vsr@opencascade.com>
Thu, 24 Mar 2016 13:01:26 +0000 (16:01 +0300)
23 files changed:
1  2 
CMakeLists.txt
src/SMESHGUI/CMakeLists.txt
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
src/SMESH_I/SMESH_Gen_i.cxx
src/StdMeshersGUI/CMakeLists.txt
src/Tools/MGCleanerPlug/CMakeLists.txt
src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
src/Tools/MGCleanerPlug/MGCleanerplug_plugin.py
src/Tools/MeshCut/CMakeLists.txt
src/Tools/MeshCut/meshcut_plugin.py
src/Tools/Verima/Gui/CMakeLists.txt
src/Tools/YamsPlug/CMakeLists.txt
src/Tools/YamsPlug/monViewText.py
src/Tools/YamsPlug/monYamsPlugDialog.py
src/Tools/YamsPlug/yamsplug_plugin.py
src/Tools/blocFissure/ihm/CMakeLists.txt
src/Tools/blocFissure/ihm/fissureCoude_plugin.py
src/Tools/padder/spadderpy/gui/CMakeLists.txt
src/Tools/padder/spadderpy/gui/inputdialog.py
src/Tools/padder/spadderpy/gui/plugindialog.py
src/Tools/padder/spadderpy/plugin/spadderPlugin.py

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  # Modules Eficas
  
  import os, subprocess
+ import tempfile
  from MGCleanerPlugDialog_ui import Ui_MGCleanerPlugDialog
  from MGCleanerMonViewText import MGCleanerMonViewText
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 +from qtsalome import *
  
  
  class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
  #
  
  # Modules Python
- import string,types,os
+ import string,types,os,sys
+ import tempfile
  import traceback
  
 -from PyQt4 import *
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 +from qtsalome import *
  
  # Import des panels
  
Simple merge
Simple merge
Simple merge
Simple merge
  #
  
  # Modules Python
- import string,types,os
+ import string,types,os, sys
  import traceback
+ import tempfile
  
 -from PyQt4 import *
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 +from qtsalome import *
  
  # Import des panels
  
  # Modules Eficas
  
  import os, subprocess
+ import tempfile
  from YamsPlugDialog_ui import Ui_YamsPlugDialog
  from monViewText import MonViewText
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 -
 +from qtsalome import *
  
  class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
    """
Simple merge