Merge with PAL/SALOME 2.1.0d

diff --git a/resources/VISUCatalog.xml b/resources/VISUCatalog.xml
index 46eb84b282efdb8233c27e3c5f62d1136fefc94a..7c59871e9968ee3c8fdc2e4263a80a293e46d7ef 100644 (file)
--- a/resources/VISUCatalog.xml
+++ b/resources/VISUCatalog.xml
@@ -16,7 +16,7 @@
                <component-username>Post-Pro</component-username>
                <component-type>VISU</component-type>
                <component-author>NRI</component-author>
-               <component-version> 1.0</component-version>
+               <component-version>2.1.0</component-version>
                <component-comment>Visu component - Maquette septembre</component-comment>
                <component-multistudy>1</component-multistudy>
                <component-icone>ModuleVisu.png</component-icone>

diff --git a/src/ENGINE/Makefile.in b/src/ENGINE/Makefile.in
index 320f6a4bb0208bb017ae7897ceb2fbc9d7765056..d26a08ba6eb3d0b5c03765f46c2848498cad90d2 100644 (file)
--- a/src/ENGINE/Makefile.in
+++ b/src/ENGINE/Makefile.in
@@ -24,7 +24,7 @@ LIB_MOC =
 LIB_SERVER_IDL = VISU_Gen.idl SALOME_Component.idl \
                  SALOME_Exception.idl SALOME_GenericObj.idl \
                  SALOME_Session.idl MED.idl
-LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
+LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Comm.idl
 
 # Executables targets
 BIN = 

diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index 1072770079436e8caac3ae88a18a10e5b768c73d..cb4b270505af606b1cc010001061eb4960466bdf 100644 (file)
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -83,7 +83,8 @@ LIB_CLIENT_IDL = SALOME_Exception.idl \
                 SALOMEDS.idl \
                 SALOME_ModuleCatalog.idl \
                 SALOME_Component.idl \
-                 SALOMEDS_Attributes.idl \
+                SALOMEDS_Attributes.idl \
+                SALOME_Comm.idl
 
 LIB_SERVER_IDL = 
 

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 42f213b315c8f48b9e6e17d585f6243f6a0be68f..eb81af8ac08ee601a6babe536dcaf8384cad09bc 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -3140,7 +3140,8 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri
 //===========================================================================
 // BuildPresentation
 //===========================================================================
-void VisuGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
+void VisuGUI::BuildPresentation( const Handle(SALOME_InteractiveObject)& theIO,
+                                 QAD_ViewFrame* )
 {
   BEGIN_OF("VisuGUI::BuildPresentation");
 

diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h
index 9bed10f884c35eba421a51a8f26a7d9cb5f39d1a..aa78fe3455279282c285bdc74dea3cadad28acda 100644 (file)
--- a/src/VISUGUI/VisuGUI.h
+++ b/src/VISUGUI/VisuGUI.h
@@ -189,7 +189,8 @@ class VisuGUI : public SALOMEGUI{
                                          const QString & theContext,
                                          const QString & theParent,
                                          const QString & theObject);
-  virtual void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
+  virtual void BuildPresentation( const Handle(SALOME_InteractiveObject)&,
+                                  QAD_ViewFrame*  = 0 );
   virtual bool OnMousePress(QMouseEvent* pe ,
                                           QAD_Desktop* parent, 
                                           QAD_StudyFrame* studyFrame);

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index 93df0b42e80059df6c85368362c062df368d2c27..057a12f3e5bb9de162a04d20f754a693b351b019 100644 (file)
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -30,7 +30,8 @@ LIB_MOC = VISU_TimeAnimation.h
 LIB_SERVER_IDL = VISU_Gen.idl SALOME_Component.idl \
                  SALOME_Exception.idl SALOME_GenericObj.idl MED.idl
 
-LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
+LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl \
+                SALOME_Comm.idl
 
 # Executables targets
 BIN =