Enable popups for TPART objects if MULTIPR is present in MED build.

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 5cf88e8c0034c8fe791332b92434881cbee3de32..61ac45c295729803a21a655a8c4b7d39ffc131c3 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -84,6 +84,10 @@ Visu_tree_gauss_points.png \
 Visu_tree_isosurfaces_gr.png \
 Visu_tree_isosurfaces.png \
 Visu_tree_mesh.png \
+Visu_tree_multipr_full.png \
+Visu_tree_multipr_hide.png \
+Visu_tree_multipr_low.png \
+Visu_tree_multipr_medium.png \
 Visu_tree_plot3d_gr.png \
 Visu_tree_plot3d.png \
 Visu_tree_result.png \
@@ -108,6 +112,6 @@ Visu_slider_play.png \
 Visu_slider_pause.png \
 Visu_slider_next.png \
 Visu_slider_last.png
-        
+
 EXTRA_DIST+= VISUCatalog.xml.in
 nodist_salomeres_DATA=VISUCatalog.xml

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index caa01983ea2d6b3c8a87949268c87106478e9d70..36251fa5985af1209cb8c86b83a190b34577bb17 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -2291,7 +2291,7 @@ VisuGUI
                 tr("MEN_CACHE_PROPERTIES"), "", 0, aParent, false,
                 this, SLOT(OnCacheProperties()));
 
-#ifdef MED_ENABLE_MULTIPR
+#ifdef ENABLE_MULTIPR
   // MULTIPR
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_MULTIPR_VIEW_FULL"));
   createAction( VISU_MULTIPR_FULL_RES, tr("MEN_MULTIPR_VIEW_FULL_RES"), QIconSet(aPixmap),
@@ -2490,7 +2490,7 @@ VisuGUI
 
   mgr->insert( action( VISU_SELECTION_INFO ), -1, -1, -1 ); // Selection info
 
-#ifdef MED_ENABLE_MULTIPR
+#ifdef ENABLE_MULTIPR
   // MULTIPR
   mgr->insert( action( VISU_MULTIPR_FULL_RES ), -1, -1, -1 );
   mgr->insert( action( VISU_MULTIPR_MED_RES ), -1, -1, -1 );
@@ -2673,7 +2673,7 @@ VisuGUI
   //aRule = "client='ObjectBrowser' and type='MEDFIELD'";
   //mgr->setRule( action( VISU_IMPORT_MED ), aRule, true );
   
-#ifdef MED_ENABLE_MULTIPR
+#ifdef ENABLE_MULTIPR
   // MULTIPR
   aRule = "client='ObjectBrowser' and $type in {'VISU::TPART'}";
   mgr->setRule( action( VISU_MULTIPR_FULL_RES ), aRule + " and selcount>=1", true );
@@ -3499,7 +3499,7 @@ void VisuGUI::OnCacheProperties()
   aDlg->exec();
 }
 
-#ifdef MED_ENABLE_MULTIPR
+#ifdef ENABLE_MULTIPR
 
 // MULTIPR
 void VisuGUI::OnMultiprViewFullRes()
@@ -3591,4 +3591,4 @@ void VisuGUI::OnMultiprChangeRes(char resolution)
   UpdateObjBrowser(this, false);
 }
 
-#endif // MED_ENABLE_MULTIPR
+#endif // ENABLE_MULTIPR