Merge with branch V2_2_0_VISU_improvement

diff --git a/src/VISUGUI/VISU_images.po b/src/VISUGUI/VISU_images.po
index c2d0783a239dd78c533cb600c4b2a831fcdbaf6d..0f7909b97036ba398f078ec58fda61c0580db251 100644 (file)
--- a/src/VISUGUI/VISU_images.po
+++ b/src/VISUGUI/VISU_images.po
@@ -93,3 +93,6 @@ msgstr "Visu_scalars_anim.png"
 
 msgid "ICON_PLOT_3D"
 msgstr "Visu_plot3d.png"
+
+msgid "ICON_CUBE_AXES"
+msgstr "Visu_graduated_axes.png"

diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po
index 43230bf44d0d80a14c2da5bc6a746d28221ce410..062917c895a37fbdff4f5060745185a50bba8f6a 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.po
+++ b/src/VISUGUI/VISU_msg_en.po
@@ -60,6 +60,9 @@ msgstr "Visualization"
 msgid "VisuGUI::TOOL_VISUALISATION"
 msgstr "Visualization Toolbar"
 
+msgid "VisuGUI::TOOL_REPRESENTATION"
+msgstr "Representation Toolbar"
+
 msgid "VisuGUI::MEN_ANIMATION"
 msgstr "Animation..."
 
@@ -233,6 +236,9 @@ msgstr "Erase All"
 msgid "VisuGUI::MEN_SCALING"
 msgstr "Scaling"
 
+msgid "VisuGUI::MEN_CUBE_AXES"
+msgstr "Graduated axes"
+
 msgid "VisuGUI::MEN_GLOBAL_SELECTION"
 msgstr "Global Selection"
 
@@ -1073,8 +1079,6 @@ msgstr "Tick marks"
 msgid "VisuGUI_AxisWg::LENGTH"
 msgstr "Length"
 
-# --------------------------------------
-
 msgid "VisuGUI_FontWg::ARIAL"
 msgstr "Arial"
 

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 670339b09fbd3531da4cba9a56fe2d4d4fd7d685..d6ffb0650d7cb0bc44cc404c6fbb23ed1c0ef34b 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -2102,7 +2102,7 @@ createActions()
 
   createAction( VISU_DELETE_OBJS, tr("MEN_DELETE_OBJS"), QIconSet(),
                 tr("MEN_DELETE_OBJS"), "", 0, aParent, false,
-               this, SLOT(OnDeleteObjects()));
+                this, SLOT(OnDeleteObjects()));
 
   //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   //createAction( 4022, tr("MEN_RENAME_TABLE"), QIconSet(aPixmap), tr("MEN_RENAME_TABLE"), "", 0, aParent, false,
@@ -2158,8 +2158,8 @@ createActions()
                this, SLOT(OnDisplayOnlyPrs()));
 
   //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_DELETE_PRS, tr("MEN_DELETE_PRS"), QIconSet(), tr("MEN_DELETE_PRS"), "", 0, aParent, false,
-               this, SLOT(OnDeletePrs()));
+  //createAction( VISU_DELETE_PRS, tr("MEN_DELETE_PRS"), QIconSet(), tr("MEN_DELETE_PRS"), "", 0, aParent, false,
+  //              this, SLOT(OnDeletePrs()));
 
   //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   createAction( VISU_COPY_PRS, tr("MEN_COPY_PRS"), QIconSet(), tr("MEN_COPY_PRS"), "", 0, aParent, false,
@@ -2299,8 +2299,8 @@ createActions()
                 tr("MEN_SCALING"), "", 0, aParent, false,
                this, SLOT(OnScaling()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUBE_AXES"));
-  createAction( VISU_CUBE_AXES, tr("MEN_CUBE_AXES"), QIconSet(/*aPixmap*/),
+  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUBE_AXES"));
+  createAction( VISU_CUBE_AXES, tr("MEN_CUBE_AXES"), QIconSet(aPixmap),
                 tr("MEN_CUBE_AXES"), "", 0, aParent, false,
                this, SLOT(OnCubeAxes()));
 
@@ -2360,6 +2360,16 @@ createToolBars()
   createTool( VISU_CUT_LINES, aToolId );
   createTool( VISU_STREAM_LINES, aToolId );
   createTool( VISU_PLOT_3D, aToolId );
+
+  aToolId = createTool(tr("TOOL_REPRESENTATION"));
+  createTool( VISU_POINTS, aToolId );
+  createTool( VISU_WIREFRAME, aToolId );
+  createTool( VISU_SURFACE, aToolId );
+  createTool( VISU_ERASE_ALL, aToolId );
+  createTool( VISU_GLOBAL_SELECTION, aToolId );
+  createTool( VISU_PARTIAL_SELECTION, aToolId );
+  createTool( VISU_SCALING, aToolId );
+  createTool( VISU_CUBE_AXES, aToolId );
 }
 
 void
@@ -2402,7 +2412,7 @@ createPopupMenus()
   mgr->insert( action( VISU_COPY_PRS ), -1, -1, -1 );
 
   // delete
-  mgr->insert( action( VISU_DELETE_OBJS ), -1, -1, -1 );
+  //mgr->insert( action( VISU_DELETE_OBJS ), -1, -1, -1 );
   //mgr->insert( action( VISU_DELETE ), -1, -1, -1 ); // TODO: remove
   //mgr->insert( action( VISU_DELETE_PRS ), -1, -1, -1 ); // TODO: remove
   mgr->insert( action( VISU_CLEAR_CONTAINER ), -1, -1, -1 );
@@ -2482,9 +2492,9 @@ createPopupMenus()
   //aRule = aSel_One_ObjBr + " and $type in {'VISU::TRESULT' 'VISU::TTABLE' 'VISU::TCONTAINER'}";
   //mgr->setRule( action( VISU_DELETE ), aRule, true );
 
-  QString aDeletable ("$type in {'VISU::TTABLE' 'VISU::TCURVE' 'VISU::TCONTAINER' ");
-  aDeletable += aPrsAll + " 'VISU::TRESULT' 'VISU::TMESH'}";
-  mgr->setRule( action( VISU_DELETE_OBJS ), aSel_Some_ObjBr + " and " + aDeletable, true );
+  //QString aDeletable ("$type in {'VISU::TTABLE' 'VISU::TCURVE' 'VISU::TCONTAINER' ");
+  //aDeletable += aPrsAll + " 'VISU::TRESULT' 'VISU::TMESH'}";
+  //mgr->setRule( action( VISU_DELETE_OBJS ), aSel_Some_ObjBr + " and " + aDeletable, true );
 
   // timestamp commands
   aRule = aSel_One_ObjBr + " and type='VISU::TTIMESTAMP'";
@@ -2512,8 +2522,10 @@ createPopupMenus()
   mgr->setRule( action( VISU_DISPLAY ), aRule + "and (isVisible=false)", true );// TODO: aRule.arg(" and isVisible=0"), true );
   mgr->setRule( action( VISU_DISPLAY_ONLY ), aRule, true );
 
+  aRule = "selcount>0 and $type in {'VISU::TMESH' " + aPrsAll + "}";
   mgr->setRule( action( VISU_TRANSLATE_PRS ), aRule, true );
 
+  aRule = "selcount>1 and $type in {'VISU::TMESH' " + aPrsAll + "}";
   mgr->setRule( action( VISU_MERGE_SCALAR_BARS ), aRule, true );
   mgr->setRule( action( VISU_FREE_SCALAR_BARS ), aRule, true );