VISU 2008 - Unification of the VISU selection functionality (debug)

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 58c8409196dcf1616a7c053ac046229312f6fce9..79a3a7ae10c9a81f5e2e93d011fbb093c37f40b9 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -541,7 +541,7 @@ ChangeZoom(vtkFloatingPointType theZoomFactor,
       aCamera->SetParallelScale( aScale / theZoomFactor );
     }
     else {
-      //printf( " - +%f", theZoomFactor );
+      //printf( " : -%f", theZoomFactor );
       aCamera->SetParallelScale( aScale * theZoomFactor );
     }
   }
@@ -555,10 +555,9 @@ void
 VISU_Actor
 ::highlight(bool theIsHighlight)
 {
-  //printf( "VISU_Actor::highlight( %d )\n", (int)theIsHighlight );
   VISU_PickingSettings* aPickingSettings = VISU_PickingSettings::Get();
 
-  bool aShowTextActor = /*aPickingSettings->GetIsActive() && */aPickingSettings->GetInfoWindowEnabled();
+  bool aShowTextActor = aPickingSettings->GetInfoWindowEnabled();
   if( theIsHighlight && mySelectionMode != myLastSelectionMode )
   {
     if( mySelectionMode == ActorSelection )
@@ -729,10 +728,17 @@ VISU_Actor
            SVTK_SelectionEvent* theSelectionEvent,
            bool theIsHighlight)
 {
-  //printf( "VISU_Actor::Highlight( %d )\n", (int)theIsHighlight );
-  bool aRet = Superclass::Highlight(theInteractorStyle,
-                                   theSelectionEvent,
-                                   theIsHighlight);
+  return Superclass::Highlight(theInteractorStyle,
+                              theSelectionEvent,
+                              theIsHighlight);
+}
+
+//-------------------------------------------------------------------------
+void
+VISU_Actor
+::Highlight(bool theIsHighlight)
+{
+  Superclass::Highlight(theIsHighlight);
 
   VISU_PickingSettings* aPickingSettings = VISU_PickingSettings::Get();
 
@@ -742,44 +748,41 @@ VISU_Actor
   mySelector->GetIndex( getIO(), aMapIndex );
   bool aCurrentHasIndex = aMapIndex.Extent() == 1;
 
-  myIsSubElementsHighlighted = theIsHighlight ? aCurrentHasIndex : false;
+  myIsSubElementsHighlighted = aCurrentHasIndex;
 
+  bool aFlyTo = false;
   vtkFloatingPointType aFlyToCoord[3] = { 0.0, 0.0, 0.0 };
-  vtkRenderer* aRenderer = theInteractorStyle->GetCurrentRenderer();
+  vtkRenderer *aRenderer = GetRenderer();
 
-  if(theIsHighlight){
+  if( theIsHighlight )
+  {
     vtkDataSet* aDataSet = GetMapper()->GetInput();
-    switch(mySelectionMode){
-    case ActorSelection:{ 
-      vtkFloatingPointType aCoord[6];
-      GetBounds(aCoord);
+    switch(mySelectionMode)
+    {
+      case ActorSelection:
+      {
+       vtkFloatingPointType aCoord[6];
+       GetBounds(aCoord);
 
-      aFlyToCoord[0] = ( aCoord[0] + aCoord[1] ) / 2;
-      aFlyToCoord[1] = ( aCoord[2] + aCoord[3] ) / 2;
-      aFlyToCoord[2] = ( aCoord[4] + aCoord[5] ) / 2;
+       aFlyTo = true;
+       aFlyToCoord[0] = ( aCoord[0] + aCoord[1] ) / 2;
+       aFlyToCoord[1] = ( aCoord[2] + aCoord[3] ) / 2;
+       aFlyToCoord[2] = ( aCoord[4] + aCoord[5] ) / 2;
 
-      ResetTextActor();
+       ResetTextActor();
 
-      aRet = true;
-      break;
-    }
-    case CellSelection:{ 
-      myCellPicker->Pick(theSelectionEvent->myX, 
-                        theSelectionEvent->myY, 
-                        0.0, 
-                        aRenderer);
-
-      if(myCellPicker->GetActor() != this)
-      {
-       aRet = false;
        break;
       }
+      case CellSelection:
+      {
+       if( !aCurrentHasIndex )
+       {
+         myTextActor->SetVisibility(false);
+         break;
+       }
 
-      vtkCellData* aCellData = aDataSet->GetCellData();
-      
-      vtkIdType aVTKId = myCellPicker->GetCellId();
-      if(aVTKId >= 0  && mySelector->IsValid(this,aVTKId,true) && hasIO()){
-       vtkIdType anObjId = GetElemObjId(aVTKId);
+       int anObjId = aMapIndex(1);
+       vtkCellData* aCellData = aDataSet->GetCellData();
        if(vtkCell* aCell = GetElemCell(anObjId)){
          vtkPoints* aPts = aCell->GetPoints();
          if(int aNbPts = aCell->GetNumberOfPoints()){
@@ -791,6 +794,7 @@ VISU_Actor
              aCoord[2] += aPntCoord[2];
            }
 
+           aFlyTo = true;
            aFlyToCoord[0] = aCoord[0] / aNbPts;
            aFlyToCoord[1] = aCoord[1] / aNbPts;
            aFlyToCoord[2] = aCoord[2] / aNbPts;
@@ -810,41 +814,32 @@ VISU_Actor
 
            vtkCell* aCell = GetElemCell(anObjId);
            int aVTKID = GetElemVTKID(anObjId);
-            if (aCell) {
-              int aNbOfPoints = aCell->GetNumberOfPoints();
-              if ( aNbOfPoints > 0 ) {
-                aStr << getScalar(aCellData, aVTKID);
-                aStr << getVector(aCellData, aVTKID);
+           if (aCell) {
+             int aNbOfPoints = aCell->GetNumberOfPoints();
+             if ( aNbOfPoints > 0 ) {
+               aStr << getScalar(aCellData, aVTKID);
+               aStr << getVector(aCellData, aVTKID);
              }
            }
 
            std::string aString = aStr.str();
            myTextActor->SetText(aString.c_str());
-           
-           aRet = true;
          }
        }
-      }
-      break;
-    }
-    case NodeSelection:{ 
-      myPointPicker->Pick(theSelectionEvent->myX, 
-                         theSelectionEvent->myY, 
-                         0.0, 
-                         aRenderer);
-
-      if(myPointPicker->GetActor() != this)
-      {
-       aRet = false;
        break;
       }
+      case NodeSelection:
+      { 
+       if( !aCurrentHasIndex )
+       {
+         myTextActor->SetVisibility(false);
+         break;
+       }
 
-      vtkPointData* aPntData = aDataSet->GetPointData();
-
-      vtkIdType aVtkId = myPointPicker->GetPointId();
-      if(aVtkId >= 0  && mySelector->IsValid(this,aVtkId,true) && hasIO()){
-       vtkIdType anObjId = GetNodeObjId( aVtkId );
+       int anObjId = aMapIndex(1);
+       vtkPointData* aPntData = aDataSet->GetPointData();
        if(vtkFloatingPointType* aCoord = GetNodeCoord(anObjId)){
+         aFlyTo = true;
          aFlyToCoord[0] = aCoord[0];
          aFlyToCoord[1] = aCoord[1];
          aFlyToCoord[2] = aCoord[2];
@@ -889,16 +884,13 @@ VISU_Actor
 
          std::string aString = aStr.str();
          myTextActor->SetText(aString.c_str());
-         
-         aRet = true;
        }
+       break;
       }
-      break;
-    }
-    case EdgeOfCellSelection:
-      break;
-    default:
-      break;
+      case EdgeOfCellSelection:
+       break;
+      default:
+       break;
     }
   }
 
@@ -913,7 +905,7 @@ VISU_Actor
   }
 
   // FlyTo
-  if( GetVisibility() && aPickingSettings->GetCameraMovementEnabled() )
+  if( GetVisibility() && aPickingSettings->GetCameraMovementEnabled() && aFlyTo )
   {
     vtkRenderWindowInteractor* anInteractor = myInteractor;
     vtkFloatingPointType aDollyWas = anInteractor->GetDolly();
@@ -927,16 +919,6 @@ VISU_Actor
     anInteractor->SetNumberOfFlyFrames(aNumberOfFlyFramesWas);
     anInteractor->InvokeEvent(SVTK::ChangeRotationPoint, aFlyToCoord);
   }
-
-  return aRet;
-}
-
-//-------------------------------------------------------------------------
-void
-VISU_Actor
-::Highlight(bool theIsHighlight)
-{
-  Superclass::Highlight(theIsHighlight);
 }
 
 //-------------------------------------------------------------------------
@@ -1005,7 +987,7 @@ VISU_Actor
   myTextActor->SetModePosition(aPickingSettings->GetInfoWindowPosition());
   myTextActor->SetTransparency(aPickingSettings->GetInfoWindowTransparency());
 
-  highlight(isHighlighted());
+  Highlight(isHighlighted());
 
   Update();
 }

diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index e5eadc859b286ad4e54532b727fd5789f1900408..d8e30ca3a38257a716b7fe6e84a5949ab292d774 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -796,7 +796,6 @@ VISU_GaussPtsAct
            SVTK_SelectionEvent* theSelectionEvent,
            bool theIsHighlight)
 { 
-  //printf( "VISU_GaussPtsAct::Highlight( %d )\n", (int)theIsHighlight );
   if ( !GetPickable() )
     return false;
 
@@ -940,14 +939,14 @@ VISU_GaussPtsAct
             anInitialHasIndex,
             aCurrentHasIndex);
 
-  if(!theIsHighlight)
-    return;
-
   if( aSelectionMode == ActorSelection ) {
-    Superclass::highlight(theIsHighlight);
+    Superclass::Highlight(theIsHighlight);
     return;
   }
 
+  if(!theIsHighlight)
+    return;
+
   if( aSelectionMode != GaussPointSelection )
     return;
 

diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts
index 46313199a46bff5d211bc5536a135e6ddbf89a39..23684e8d7593e5c47557515bb0b62d6ea46b5294 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.ts
+++ b/src/VISUGUI/VISU_msg_en.ts
@@ -1136,6 +1136,10 @@ Please, refer to the documentation.</translation>
             <source>MEN_SELECTION_INFO</source>
             <translation>Selection Info...</translation>
         </message>
+        <message>
+            <source>MEN_SELECTION_PANEL</source>
+            <translation>Selection Panel</translation>
+        </message>
         <message>
             <source>MEN_SHADING</source>
             <translation>Shading On</translation>
@@ -1918,17 +1922,9 @@ Please, provide non-empty resulting presentation.</translation>
     </context>
     <context>
         <name>VisuGUI_GaussPointsSelectionPane</name>
-        <message>
-            <source>BELOW_POINT</source>
-            <translation>Centered</translation>
-        </message>
-        <message>
-            <source>CAMERA_TITLE</source>
-            <translation>Movement of the camera</translation>
-        </message>
         <message>
             <source>CURSOR_SIZE</source>
-            <translation>Size of the cursor :</translation>
+            <translation>Size of the cursor:</translation>
         </message>
         <message>
             <source>CURSOR_TITLE</source>
@@ -1938,10 +1934,6 @@ Please, provide non-empty resulting presentation.</translation>
             <source>DISPLAY_PARENT_MESH</source>
             <translation>Display parent mesh element</translation>
         </message>
-        <message>
-            <source>INFO_WINDOW_TITLE</source>
-            <translation>Information window</translation>
-        </message>
         <message>
             <source>PARENT_MESH_TITLE</source>
             <translation>Parent mesh element</translation>
@@ -1952,59 +1944,39 @@ Please, provide non-empty resulting presentation.</translation>
         </message>
         <message>
             <source>POINT_TOLERANCE</source>
-            <translation>Point tolerance :</translation>
-        </message>
-        <message>
-            <source>POSITION</source>
-            <translation>Position :</translation>
+            <translation>Point tolerance:</translation>
         </message>
         <message>
             <source>PYRAMID_HEIGHT</source>
-            <translation>Height of the pyramids :</translation>
+            <translation>Height of the pyramids:</translation>
         </message>
         <message>
             <source>SELECTION_COLOR</source>
-            <translation>Selection cursor color :</translation>
-        </message>
-        <message>
-            <source>STEP_NUMBER_DSC</source>
-            <translation>Number of steps :</translation>
-        </message>
-        <message>
-            <source>STEP_NUMBER_TIP</source>
-            <translation>Number of steps between two positions</translation>
+            <translation>Selection cursor color:</translation>
         </message>
         <message>
             <source>TOLERANCE_TITLE</source>
             <translation>Tolerance</translation>
         </message>
-        <message>
-            <source>TOP_LEFT_CORNER</source>
-            <translation>Top-left corner</translation>
-        </message>
-        <message>
-            <source>TRANSPARENCY</source>
-            <translation>Transparency :</translation>
-        </message>
-        <message>
-            <source>ZOOM_FACTOR_DSC</source>
-            <translation>Zoom factor :</translation>
-        </message>
-        <message>
-            <source>ZOOM_FACTOR_TIP</source>
-            <translation>Zoom at first selected point (ratio)</translation>
-        </message>
         <message>
             <source>DATA_POSITION</source>
             <translation>Position</translation>
         </message>
         <message>
             <source>PARENT_ELEMENT</source>
-            <translation>Parent mesh element ID:</translation>
+            <translation>Parent ID:</translation>
+        </message>
+        <message>
+            <source>PARENT_ELEMENT_TIP</source>
+            <translation>Parent mesh element ID</translation>
         </message>
         <message>
             <source>LOCAL_POINT</source>
-            <translation>Local Gauss Point ID:</translation>
+            <translation>Local ID:</translation>
+        </message>
+        <message>
+            <source>LOCAL_POINT_TIP</source>
+            <translation>Local Gauss Point ID</translation>
         </message>
     </context>
     <context>
@@ -2400,6 +2372,10 @@ Please, provide non-empty resulting presentation.</translation>
             <source>VISU_PICKING_PREF_CAMERA_GROUP_TTL</source>
             <translation>Movement of the camera</translation>
         </message>
+        <message>
+            <source>VISU_PICKING_PREF_CAMERA_MOVEMENT</source>
+            <translation>Enable movement of the camera</translation>
+        </message>
         <message>
             <source>VISU_PICKING_PREF_CURSOR_GROUP_TTL</source>
             <translation>Cursor</translation>
@@ -2412,6 +2388,10 @@ Please, provide non-empty resulting presentation.</translation>
             <source>VISU_PICKING_PREF_DISPLAY_PARENT_MESH</source>
             <translation>Display parent mesh element</translation>
         </message>
+        <message>
+            <source>VISU_PICKING_PREF_INFO_WINDOW</source>
+            <translation>Enable information window</translation>
+        </message>
         <message>
             <source>VISU_PICKING_PREF_INFO_WINDOW_GROUP_TTL</source>
             <translation>Information window</translation>
@@ -3274,11 +3254,11 @@ Please, refer to the documentation.</translation>
         </message>
         <message>
             <source>POSITION</source>
-            <translation>Position :</translation>
+            <translation>Position:</translation>
         </message>
         <message>
-            <source>STEP_NUMBER_DSC</source>
-            <translation>Number of steps :</translation>
+            <source>STEP_NUMBER</source>
+            <translation>Number of steps:</translation>
         </message>
         <message>
             <source>STEP_NUMBER_TIP</source>
@@ -3290,15 +3270,11 @@ Please, refer to the documentation.</translation>
         </message>
         <message>
             <source>TRANSPARENCY</source>
-            <translation>Transparency :</translation>
+            <translation>Transparency:</translation>
         </message>
         <message>
-            <source>ZOOM_FACTOR_DSC</source>
-            <translation>Zoom factor :</translation>
-        </message>
-        <message>
-            <source>ZOOM_FACTOR_TIP</source>
-            <translation>Zoom at first selected point (ratio)</translation>
+            <source>ZOOM_FACTOR</source>
+            <translation>Zoom factor:</translation>
         </message>
     </context>
     <context>

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 242de2787f5130fe547e7d0ff248738a3a071ffc..f0ab08f5a13d6404c47ed81c4496becf5bdeab12 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -2296,7 +2296,7 @@ VisuGUI
   createAction( VISU_ERASE_ALL, tr("MEN_ERASE_ALL"), QIcon(aPixmap),
                 tr("MEN_ERASE_ALL"), "", 0, aParent, false,
                 this, SLOT(OnEraseAll()));
-
+  /*
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_GLOBAL_SELECTION"));
   createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIcon(aPixmap),
                 tr("MEN_GLOBAL_SELECTION"), "", 0, aParent, false,
@@ -2306,7 +2306,7 @@ VisuGUI
   createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIcon(aPixmap),
                 tr("MEN_PARTIAL_SELECTION"), "", 0, aParent, false,
                 this);
-
+  */
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SELECTION_PANEL"));
   createAction( VISU_SELECTION_PANEL, tr("MEN_SELECTION_PANEL"), QIcon(aPixmap),
                 tr("MEN_SELECTION_PANEL"), "", 0, aParent, false,
@@ -2400,8 +2400,8 @@ VisuGUI
   createMenu( VISU_WIREFRAME, parentId, 10 ); //   wireframe
   createMenu( VISU_SURFACE, parentId, 10 ); //   surface
   createMenu( VISU_ERASE_ALL, aMenuId, 10 ); // erase all
-  createMenu( VISU_GLOBAL_SELECTION, aMenuId, 10 ); // global selection
-  createMenu( VISU_PARTIAL_SELECTION, aMenuId, 10 ); // partial selection
+  //createMenu( VISU_GLOBAL_SELECTION, aMenuId, 10 ); // global selection
+  //createMenu( VISU_PARTIAL_SELECTION, aMenuId, 10 ); // partial selection
 }
 
 void
@@ -2427,8 +2427,8 @@ VisuGUI
   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_GLOBAL_SELECTION, aToolId );
+  //createTool( VISU_PARTIAL_SELECTION, aToolId );
 
   aToolId = createTool(tr("TOOL_SELECTION"));
   createTool( VISU_SELECTION_PANEL, aToolId );
@@ -2962,8 +2962,6 @@ VisuGUI
   setMenuShown( true );
   setToolShown( true );
 
-  myInputPanel->show();
-
   // Reset actions accelerator keys
   QList<QKeySequence> shortcuts;
   shortcuts.append( QKeySequence(Qt::CTRL + Qt::Key_I) );

diff --git a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
index 98ed64ed103d550e37ff01e06dba6b274f974815..af0042e6592ef87c9069d88600917c8e7ac9ccba 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
@@ -330,6 +330,7 @@ VisuGUI_GaussPointsSelectionPane::VisuGUI_GaussPointsSelectionPane( const Salome
   PositionGroupLayout->setMargin(11);
 
   QLabel* ParentElementLabel = new QLabel( tr( "PARENT_ELEMENT" ), PositionGroup );
+  ParentElementLabel->setToolTip( tr( "PARENT_ELEMENT_TIP" ) );
   myParentElementLineEdit = new VisuGUI_ValidatedLineEdit( PositionGroup );
   connect( myParentElementLineEdit, SIGNAL( textChanged( const QString& ) ), this, SLOT( onSelectionValidate() ) );
   connect( myParentElementLineEdit, SIGNAL( returnPressed() ), this, SLOT( onSelectionApply() ) );
@@ -339,6 +340,7 @@ VisuGUI_GaussPointsSelectionPane::VisuGUI_GaussPointsSelectionPane( const Salome
   connect(ParentElementBtn, SIGNAL(clicked()), this, SLOT(onSelectionApply()));
 
   QLabel* LocalPointLabel = new QLabel( tr( "LOCAL_POINT" ), PositionGroup );
+  LocalPointLabel->setToolTip( tr( "LOCAL_POINT_TIP" ) );
   myLocalPointLineEdit = new VisuGUI_ValidatedLineEdit( PositionGroup );
   connect( myLocalPointLineEdit,    SIGNAL( textChanged( const QString& ) ), this, SLOT( onSelectionValidate() ) );
   connect( myLocalPointLineEdit,    SIGNAL( returnPressed() ), this, SLOT( onSelectionApply() ) );

diff --git a/src/VISUGUI/VisuGUI_InputPanel.cxx b/src/VISUGUI/VisuGUI_InputPanel.cxx
index e634ac8fb9e3f89da174eae19a41d3c78486aff9..ec223e63d13094f336d176a47ce6cca3ac54a027 100755 (executable)
--- a/src/VISUGUI/VisuGUI_InputPanel.cxx
+++ b/src/VISUGUI/VisuGUI_InputPanel.cxx
@@ -64,6 +64,9 @@ void VisuGUI_InputPanel::showPanel( VisuGUI_BasePanel* thePanel )
   if ( myCurrentPanel )
     myCurrentPanel->hide();
 
+  if( isEmpty() )
+    show();
+
   if ( !myPanels.contains( thePanel ) )
   {
     myPanels.insert( thePanel, true );
@@ -72,9 +75,6 @@ void VisuGUI_InputPanel::showPanel( VisuGUI_BasePanel* thePanel )
     connect( thePanel, SIGNAL( bpClose() ), this, SLOT( onClosePanel() ) );
   }
 
-  if( isEmpty() )
-    show();
-
   thePanel->show();
   myCurrentPanel = thePanel;
   myPanels[ thePanel ] = true;

diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 5a7a269e13617d76840e5a804e7b65304cf17b92..13431ff99a5a79bcb829e358c4087c1edd579502 100644 (file)
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -768,6 +768,10 @@ createPickingPreferences()
   int infoWindowGr = addPreference( tr( "VISU_PICKING_PREF_INFO_WINDOW_GROUP_TTL" ), pickingTab );
   setPreferenceProperty( infoWindowGr, "columns", 2 );
 
+  int infoWindowPref = addPreference( tr( "VISU_PICKING_PREF_INFO_WINDOW" ), infoWindowGr,
+                                     LightApp_Preferences::Bool, "VISU", "picking_info_window" );
+  setPreferenceProperty( infoWindowPref, "columns", 2 );
+
   int transparencyPref = addPreference( tr( "VISU_PICKING_PREF_TRANSPARENCY" ), infoWindowGr,
                                        LightApp_Preferences::IntSpin, "VISU", "picking_transparency" );
   setPreferenceProperty( transparencyPref, "min", 0 );
@@ -789,6 +793,10 @@ createPickingPreferences()
   int cameraGr = addPreference( tr( "VISU_PICKING_PREF_CAMERA_GROUP_TTL" ), pickingTab );
   setPreferenceProperty( cameraGr, "columns", 2 );
 
+  int cameraPref = addPreference( tr( "VISU_PICKING_PREF_CAMERA_MOVEMENT" ), cameraGr,
+                                 LightApp_Preferences::Bool, "VISU", "picking_camera_movement" );
+  setPreferenceProperty( cameraPref, "columns", 2 );
+
   int zoomFactorPref = addPreference( tr( "VISU_PICKING_PREF_ZOOM_FACTOR" ), cameraGr,
                                      LightApp_Preferences::DblSpin, "VISU", "picking_zoom_factor" );
   setPreferenceProperty( zoomFactorPref, "min", 0.1 );

diff --git a/src/VISUGUI/VisuGUI_SelectionPanel.cxx b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
index 9a7b6711cdc225f897ad83369cd12ff8b9faaec0..4f1a2ce1921c770af2fdd861af63bf15b6051934 100644 (file)
--- a/src/VISUGUI/VisuGUI_SelectionPanel.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
@@ -356,12 +356,11 @@ VisuGUI_SelectionPanel::VisuGUI_SelectionPanel( const SalomeApp_Module* theModul
   CameraGroupLayout->setSpacing(6);
   CameraGroupLayout->setMargin(11);
 
-  QLabel* ZoomFactorLabel = new QLabel( tr( "ZOOM_FACTOR_DSC" ), myCameraGroup );
-  ZoomFactorLabel->setToolTip( tr( "ZOOM_FACTOR_TIP" ) );
+  QLabel* ZoomFactorLabel = new QLabel( tr( "ZOOM_FACTOR" ), myCameraGroup );
   myZoomFactorSpinBox = new QtxDoubleSpinBox( 0.1, 10.0, 0.1, myCameraGroup );
   myZoomFactorSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
 
-  QLabel* StepNumberLabel = new QLabel( tr( "STEP_NUMBER_DSC" ), myCameraGroup );
+  QLabel* StepNumberLabel = new QLabel( tr( "STEP_NUMBER" ), myCameraGroup );
   StepNumberLabel->setToolTip( tr( "STEP_NUMBER_TIP" ) );
   myStepNumberSpinBox = new QtxIntSpinBox( 1, 100, 1, myCameraGroup );
   myStepNumberSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
@@ -749,7 +748,7 @@ bool onIdEdit (const QString& theText,
       SVTK_RenderWindowInteractor* anInteractor = aMainWindow->GetInteractor();
       VISU_Actor* anActor = SVTK::Find<VISU_Actor>(anInteractor->getRenderer()->GetActors(),
                                                   SVTK::TIsSameIObject<VISU_Actor>( anIO ));
-      //anActor->Highlight( anIO );
+      anActor->Highlight( anIO );
     }
 
     return true;