Portage V3_0_0

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index f6d5ea9cc2a4d41d62118b80436e0156807b90ae..fd01839bacb4ad80a1133de565035f23fff5132c 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -61,6 +61,8 @@ QT_MT_LIBS = @QT_MT_LIBS@
 MOC = @MOC@
 UIC = @UIC@
 
+# msg2qm
+MSG2QM = @MSG2QM@
 
 #QWT
 
@@ -242,8 +244,7 @@ ac_cxx_mutable.m4                 check_mico.m4      libtool.m4             \
 ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4                \
 ac_cxx_partial_specialization.m4  check_opengl.m4    python.m4         \
 ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
-ac_cc_warnings.m4                 check_qt.m4        check_med2.m4      \
-check_swig.m4 
+ac_cc_warnings.m4                 check_qt.m4        check_swig.m4 
 
 $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
        cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files

diff --git a/configure.in.base b/configure.in.base
index 5c3c20c9630de708a17b9cf5936ce780bf52ba17..fbe274f8faca92838dff2e2c7a9d763e075006e6 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -273,6 +273,14 @@ echo
 
 CHECK_KERNEL
 
+echo
+echo ---------------------------------------------
+echo testing msg2qm
+echo ---------------------------------------------
+echo
+
+CHECK_MSG2QM
+
 echo
 echo ---------------------------------------------
 echo Testing Visu
@@ -296,7 +304,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok msg2qm_ok"
 
 for var in $variables
 do

diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py
index aa607ebe5fefa78213e9fac9fffdff692218862f..3517f71d0e14abd70d6076d870e5c4569ea14b95 100644 (file)
--- a/src/EFICASGUI/EFICASGUI.py
+++ b/src/EFICASGUI/EFICASGUI.py
@@ -28,8 +28,13 @@ qt.QObject.connect(qt.qApp,qt.SIGNAL("lastWindowClosed()"),g)
 
 import salome
 
-sg=salome.SalomeGUI()
+sg=salome.sg
 sgPyQt=SalomePyQt.SalomePyQt()
+
+# Communication with Salome : desktop, signal and slots
+desktop=sgPyQt.getDesktop()
+
+
 import salomedsgui
 aGuiDS=salomedsgui.guiDS()
 print "EFicasGUI :: :::::::::::::::::::::::::::::::::::::::::::::::::::::"
@@ -43,7 +48,8 @@ def setWorkSpace(workSpace):
    WORKSPACE=workSpace
    print "WORKSPACE: ",WORKSPACE
    # le desktop
-   d=sgPyQt.getDesktop()
+   desktop=sgPyQt.getDesktop()
+   print "setWorkSpace Desktop: ",desktop
 
    # creation d'une message box
    #qt.QMessageBox.information(d,"titre","message")
@@ -74,6 +80,9 @@ def setSettings():
    print "setSettings: currentStudyId = " + str(currentStudyId)
    # _CS_gbo_ Voir si on peut utiliser directement sgPyQt.getStudyId()
    # dans salomedsgui?
+   # le desktop
+   desktop=sgPyQt.getDesktop()
+   print "setSetting Desktop: ",desktop
 
 
 # -----------------------------------------------------------------------------
@@ -85,6 +94,9 @@ def activeStudyChanged(ID):
    currentStudyId=ID
    print "_CS_GBO_ : EFICASGUI.activeStudyChanged : currentStudyId = ", currentStudyId
    print "_CS_GBO_ : EFICASGUI.activeStudyChanged : sgPyQt.getStudyId() = ", sgPyQt.getStudyId()
+   # le desktop
+   desktop=sgPyQt.getDesktop()
+   print "activeStudyChanged Desktop: ",desktop
 
 def definePopup(theContext, theObject, theParent):
    print "EFICASGUI --- definePopup"