Fixing #22791: some entries not appearing in teh Filters menu of PARAVIS.

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index 2cba7bc1ed8f5f14137a37a04ceaee0a1bd26510..8dea53da89c07bcb0f0176fa4c8fdc617fa9f1c4 100755 (executable)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -572,12 +572,12 @@ int CAM_Module::createTool( const int id, const QString& tBar, const int idx )
   \return menu item ID or -1 if menu item could not be added
 */
 int CAM_Module::createMenu( const QString& subMenu, const int menu,
-                            const int id, const int group, const int idx )
+                            const int id, const int group, const int idx, QMenu * menuObj )
 {
   if ( !menuMgr() )
     return -1;
   
-  return menuMgr()->insert( subMenu, menu, group, id, idx );
+  return menuMgr()->insert( subMenu, menu, group, id, idx, menuObj );
 }
 
 /*!

diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h
index 49fbaf4e702e8517be474e564231710e9ceeff9d..a49447a9fec22f1c74c98a7800aef478247ac353 100755 (executable)
--- a/src/CAM/CAM_Module.h
+++ b/src/CAM/CAM_Module.h
@@ -105,7 +105,7 @@ public:
   int                    createTool( QAction*, const int, const int = -1, const int = -1 );
   int                    createTool( QAction*, const QString&, const int = -1, const int = -1 );
 
-  int                    createMenu( const QString&, const int, const int = -1, const int = -1, const int = -1 );
+  int                    createMenu( const QString&, const int, const int = -1, const int = -1, const int = -1,QMenu * = 0);
   int                    createMenu( const QString&, const QString&, const int = -1, const int = -1, const int = -1 );
   int                    createMenu( const int, const int, const int = -1, const int = -1 );
   int                    createMenu( const int, const QString&, const int = -1, const int = -1 );

diff --git a/src/PVViewer/PVViewer_Behaviors.cxx b/src/PVViewer/PVViewer_Behaviors.cxx
index 4b85167b4147e8c899bd41fb4d485bac9df96a5c..5b2a4772a662f74d598a204f4b78750f9569b5af 100644 (file)
--- a/src/PVViewer/PVViewer_Behaviors.cxx
+++ b/src/PVViewer/PVViewer_Behaviors.cxx
@@ -79,7 +79,6 @@ void PVViewer_Behaviors::instanciateMinimalBehaviors(SUIT_Desktop * desk)
 
       new pqDefaultViewBehavior(this);  // shows a 3D view as soon as a server connection is made
       new pqAlwaysConnectedBehavior(this);  // client always connected to a server
-      new pqAutoLoadPluginXMLBehavior(this);  // auto load plugins
       new pqVerifyRequiredPluginBehavior(this);
       new pqPluginSettingsBehavior(this);
       new pqFixPathsInStateFilesBehavior(this);
@@ -111,6 +110,7 @@ void PVViewer_Behaviors::instanciateAllBehaviors(SUIT_Desktop * desk)
       new pqSpreadSheetVisibilityBehavior(this);
       new pqPipelineContextMenuBehavior(this);
       new pqUndoRedoBehavior(this);
+      new pqAutoLoadPluginXMLBehavior(this);  // auto load plugins GUI stuff
       new pqPluginDockWidgetsBehavior(desk);
       new pqPluginActionGroupBehavior(desk);
       new pqPersistentMainWindowStateBehavior(desk);

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index b68bc1eada5146f0908516c8f70a30116177d288..c534b8a72aafedcd991954780103a74a338cbd38 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -40,12 +40,12 @@ PVViewer_GUIElements::PVViewer_GUIElements(SUIT_Desktop* desk) :
   pipelineBrowserWidget  = new pqPipelineBrowserWidget(desk);
   pipelineBrowserWidget->hide();
 
-//  sourcesMenu = new QMenu(desk);
-//  pqParaViewMenuBuilders::buildSourcesMenu(*sourcesMenu, desk);
-//  filtersMenu = new QPVMenu(desk);
-//  pqParaViewMenuBuilders::buildFiltersMenu(*filtersMenu, desk);
-//  macrosMenu = new QMenu(desk);
-//  pqParaViewMenuBuilders::buildMacrosMenu(*macrosMenu);
+  sourcesMenu = new QMenu(0);
+  pqParaViewMenuBuilders::buildSourcesMenu(*sourcesMenu, desk);
+  filtersMenu = new QMenu(0);
+  pqParaViewMenuBuilders::buildFiltersMenu(*filtersMenu, desk);
+  macrosMenu = new QMenu(0);
+  pqParaViewMenuBuilders::buildMacrosMenu(*macrosMenu);
 }
 
 PVViewer_GUIElements * PVViewer_GUIElements::GetInstance(SUIT_Desktop* desk)

diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index 1615efc48ef77cf0dca70a501d747c64665ec657..c9d2d3f2d07f4684ce7977355564a51cbc7803ed 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -44,10 +44,10 @@ public:
   pqPropertiesPanel * getPropertiesPanel() { return propertiesPanel; }
   pqPipelineBrowserWidget * getPipelineBrowserWidget() { return pipelineBrowserWidget; }
 
-  // Update the sources menu from what was built in private member 'sourcesMenu'
-//  void updateSourcesMenu(QMenu *);
-//  void updateFiltersMenu(QMenu *);
-//  void updateMacrosMenu(QMenu *);
+  QMenu * getFiltersMenu() { return filtersMenu; }
+  QMenu * getSourcesMenu() { return sourcesMenu; }
+  QMenu * getMacrosMenu()  { return macrosMenu; }
+
 
 public slots:
   void onEmulateApply();  // better use the slot from PVViewer_ViewManager if you want to trigger "Apply"

diff --git a/src/Qtx/QtxActionMenuMgr.cxx b/src/Qtx/QtxActionMenuMgr.cxx
index c6b8affc40280e0796073d48ff1a682e832c9a7d..f0b8d162d56b2fd1d30529717fd6f08d621249e5 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.cxx
+++ b/src/Qtx/QtxActionMenuMgr.cxx
@@ -312,7 +312,8 @@ int QtxActionMenuMgr::insert( QAction* a, const int pId, const int group, const
   \param idx menu index inside the menu group
   \return action ID
 */
-int QtxActionMenuMgr::insert( const QString& title, const int pId, const int group, const int id, const int idx )
+int QtxActionMenuMgr::insert( const QString& title, const int pId, const int group,
+                              const int id, const int idx,  QMenu* _menu)
 {
   MenuNode* pNode = pId == -1 ? myRoot : find( pId );
   if ( !pNode )
@@ -333,7 +334,11 @@ int QtxActionMenuMgr::insert( const QString& title, const int pId, const int gro
 
   int gid = (id == -1 || eNode ) ? generateId() : id;
 
-  QMenu* menu = new QMenu( 0 );
+  QMenu* menu;
+  if (_menu)
+    menu = _menu;
+  else
+    menu = new QMenu( 0 );
   QAction* ma = menu->menuAction();
   ma->setText( title );
 

diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h
index cea6ddedd4981963b67c2b1d8340cadebf1738a4..a09ddc7e26325fa7b658cc42c76c0341232223e1 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.h
+++ b/src/Qtx/QtxActionMenuMgr.h
@@ -71,7 +71,7 @@ public:
 
   int          insert( const QString&, const QString&, const int, const int = -1, const int = -1 );
   int          insert( const QString&, const QStringList&, const int, const int = -1, const int = -1 );
-  virtual int  insert( const QString&, const int, const int, const int = -1, const int = -1 );
+  virtual int  insert( const QString&, const int, const int, const int = -1, const int = -1 , QMenu* = 0);
 
   int          append( const int, const int, const int );
   int          append( QAction*, const int, const int );