Modifications according to remarks.

diff --git a/doc/salome/gui/input/occ_3d_viewer.rst b/doc/salome/gui/input/occ_3d_viewer.rst
index 002dbffc2725b908d1dd78d7a93e38780dabe360..d5a2f2997938438c79129f7102d041c1f6273821 100644 (file)
--- a/doc/salome/gui/input/occ_3d_viewer.rst
+++ b/doc/salome/gui/input/occ_3d_viewer.rst
@@ -67,6 +67,20 @@ ____
 
 ____
 
+.. image:: ../../../../src/OCCViewer/resources/occ_view_rect_style.png
+       :align: center
+
+**Advanced selection by polygon** - enables advanced selection by polygon.
+
+____
+
+.. image:: ../../../../src/OCCViewer/resources/occ_view_circle_style.png
+       :align: center
+
+**Advanced selection by polygon** - enables advanced selection by circle.
+
+____
+
 .. image:: ../../../../src/OCCViewer/resources/occ_view_fitall.png
        :align: center
 

diff --git a/doc/salome/gui/input/setting_preferences.rst b/doc/salome/gui/input/setting_preferences.rst
index 53cd002ac66b3a1ea4f4b026f19a12a1339eb04a..306b7a1725d7b51ec6e21bb57dd16d2c9636e2d4 100644 (file)
--- a/doc/salome/gui/input/setting_preferences.rst
+++ b/doc/salome/gui/input/setting_preferences.rst
@@ -152,6 +152,7 @@ OCC 3D Viewer Preferences
 
   - **Enable preselection** - switches preselection on/off.
   - **Enable selection** - switches selection on/off.
+  - **Advanced selection** - switches default advanced selection style by Polygon or by Circle.
 
 - **Clipping parameters** - specifies the default clipping plane parameters.
 

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 83909627cef83370745c4700248c3b183d58a2f0..fb14f540ce122d0f956afb6c59c8c490b83f35f2 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -1633,6 +1633,7 @@ SUIT_ViewManager* LightApp_Application::createViewManager( const QString& vmType
                                resMgr->doubleValue( "OCCViewer", "focus_value", vm->stereographicFocusValue() ));
     vm->setInterocularDistance( resMgr->integerValue( "OCCViewer", "iod_type", vm->interocularDistanceType() ),
                                 resMgr->doubleValue( "OCCViewer", "iod_value", vm->interocularDistanceValue() ));
+    vm->setSelectionStyle( resMgr->integerValue( "OCCViewer", "adv_selection_mode", vm->selectionStyle() ) );
 
     vm->setReverseStereo( resMgr->booleanValue( "OCCViewer", "reverse_stereo", vm->isReverseStereo() ) );
     vm->setVSync( resMgr->booleanValue( "OCCViewer", "enable_vsync", vm->isVSync() ) );
@@ -2596,13 +2597,22 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref )
 
   // ... "Selection" group <<start>>
   int occSelectionGroup = pref->addPreference( tr( "PREF_GROUP_SELECTION" ), occGroup );
-  pref->setItemProperty( "columns", 2, occSelectionGroup );
+  pref->setItemProperty( "columns", 3, occSelectionGroup );
   // .... -> enable preselection
   pref->addPreference( tr( "PREF_ENABLE_PRESELECTION" ), occSelectionGroup,
                        LightApp_Preferences::Bool, "OCCViewer", "enable_preselection" );
   // .... -> enable selection
   pref->addPreference( tr( "PREF_ENABLE_SELECTION" ), occSelectionGroup,
                        LightApp_Preferences::Bool, "OCCViewer", "enable_selection" );
+  // .... -> selection style
+  int aSeleStyle = pref->addPreference( tr( "PREF_SELECTION_STYLE" ), occSelectionGroup,
+                       LightApp_Preferences::Selector, "OCCViewer", "adv_selection_mode" );
+  aValuesList.clear();
+  anIndicesList.clear();
+  aValuesList   << tr("PREF_POLYGON_SELECTION") << tr("PREF_CIRCLE_SELECTION");
+  anIndicesList << 0 << 1;
+  pref->setItemProperty( "strings", aValuesList, aSeleStyle);
+  pref->setItemProperty( "indexes", anIndicesList, aSeleStyle);
   // ... "Selection" group <<end>>
 
   // ... "Clipping" group <<start>>
@@ -3313,6 +3323,27 @@ void LightApp_Application::preferencesChanged( const QString& sec, const QString
   }
 #endif
 
+
+#ifndef DISABLE_OCCVIEWER
+  if (sec == QString("OCCViewer") && param == QString("adv_selection_mode"))
+  {
+    int mode = resMgr->integerValue("OCCViewer", "adv_selection_mode", 0);
+    QList<SUIT_ViewManager*> lst;
+    viewManagers(OCCViewer_Viewer::Type(), lst);
+    QListIterator<SUIT_ViewManager*> it(lst);
+    while (it.hasNext())
+    {
+      SUIT_ViewModel* vm = it.next()->getViewModel();
+      if (!vm || !vm->inherits("OCCViewer_Viewer"))
+        continue;
+
+      OCCViewer_Viewer* occVM = (OCCViewer_Viewer*)vm;
+      occVM->setSelectionStyle(mode);
+    }
+  }
+#endif
+
+
 #ifndef DISABLE_OCCVIEWER
   if ( sec == QString( "OCCViewer" ) && param == QString( "stereo_type" ) )
   {

diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml
index fd64450eec99cacb9d32a033e895db3acdec50a2..ae448ffb22f1a1f4b15ed0324cdd26e7699ee9cc 100644 (file)
--- a/src/LightApp/resources/LightApp.xml
+++ b/src/LightApp/resources/LightApp.xml
@@ -125,6 +125,7 @@
     <!-- OCC viewer preferences -->
     <parameter name="projection_mode"     value="0"/>
     <parameter name="stereo_type"         value="0"/>
+    <parameter name="adv_selection_mode"  value="0"/>
     <parameter name="anaglyph_filter"     value="0"/>
     <parameter name="focus_type"          value="1"/>
     <parameter name="focus_value"         value="1.0"/>

diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index dc4a13b331aee8a59c07e5b840758dde1c42580d..fe57830fedc1a6f2a72aa0388b20c26ea94e0393 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -212,6 +212,18 @@ The changes will be applied on the next application session.</translation>
         <source>PREF_PERSPECTIVE</source>
         <translation>Perspective</translation>
     </message>
+    <message>
+        <source>PREF_POLYGON_SELECTION</source>
+        <translation>Polygon</translation>
+    </message>
+    <message>
+        <source>PREF_CIRCLE_SELECTION</source>
+        <translation>Circle</translation>
+    </message>
+    <message>
+        <source>PREF_SELECTION_STYLE</source>
+        <translation>Advanced selection</translation>
+    </message>
     <message>
         <source>PREF_NAVIGATION</source>
         <translation>Navigation style</translation>

diff --git a/src/LightApp/resources/LightApp_msg_fr.ts b/src/LightApp/resources/LightApp_msg_fr.ts
index ca7a04786d9aa551ab1c173e1b14fb3adedcba44..266cc6cb15271b07108adf46c853d55720f65f39 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_fr.ts
+++ b/src/LightApp/resources/LightApp_msg_fr.ts
@@ -212,6 +212,18 @@ Les modifications seront appliquées à la prochaine session.</translation>
         <source>PREF_PERSPECTIVE</source>
         <translation>Perspective</translation>
     </message>
+    <message>
+        <source>PREF_POLYGON_SELECTION</source>
+        <translation>Polygon</translation>
+    </message>
+    <message>
+        <source>PREF_CIRCLE_SELECTION</source>
+        <translation>Circle</translation>
+    </message>
+    <message>
+        <source>PREF_SELECTION_STYLE</source>
+        <translation>Advanced selection</translation>
+    </message>
     <message>
         <source>PREF_NAVIGATION</source>
         <translation>Navigation:</translation>

diff --git a/src/LightApp/resources/LightApp_msg_ja.ts b/src/LightApp/resources/LightApp_msg_ja.ts
index 8ba2a56fa8466b604646b7cd0268c09893652f17..513e5d2702786aaa5d4f4fb7dc54e147315a6aa4 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_ja.ts
+++ b/src/LightApp/resources/LightApp_msg_ja.ts
@@ -211,6 +211,18 @@ Pythonファイルは、文字、数字、アンダースコアが含まれて
       <source>PREF_PERSPECTIVE</source>
       <translation>遠近法</translation>
     </message>
+    <message>
+        <source>PREF_POLYGON_SELECTION</source>
+        <translation>Polygon</translation>
+    </message>
+    <message>
+        <source>PREF_CIRCLE_SELECTION</source>
+        <translation>Circle</translation>
+    </message>
+    <message>
+        <source>PREF_SELECTION_STYLE</source>
+        <translation>Advanced selection</translation>
+    </message>
     <message>
       <source>PREF_NAVIGATION</source>
       <translation>ナビゲーション スタイル</translation>

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index c74e5375610e85152623f68a89592f9076d5717f..91e39769e8a6951ca1b8a54e32e24a3dbaa01b41 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -354,6 +354,20 @@ void OCCViewer_ViewFrame::setProjectionType( int t)
   }
 }
 
+//**************************************************************************************
+int OCCViewer_ViewFrame::selectionStyle() const
+{
+  return getView(MAIN_VIEW)->selectionStyle();
+}
+
+//**************************************************************************************
+void OCCViewer_ViewFrame::setSelectionStyle(int t)
+{
+  foreach(OCCViewer_ViewWindow* aView, myViews) {
+    aView->setSelectionStyle(t);
+  }
+}
+
 //**************************************************************************************
 int OCCViewer_ViewFrame::stereoType() const
 {

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.h b/src/OCCViewer/OCCViewer_ViewFrame.h
index 1df7d964a23241e4885e6e8de84628ab88ac4a8c..755afb5ea83b5057b05e20fa9e9d1ce656163738 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewFrame.h
+++ b/src/OCCViewer/OCCViewer_ViewFrame.h
@@ -75,6 +75,9 @@ public:
   virtual int projectionType() const;
   virtual void setProjectionType( int );
 
+  virtual int selectionStyle() const;
+  virtual void setSelectionStyle(int);
+
   virtual int stereoType() const;
   virtual void setStereoType( const int );
 

diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index 0e3e37f7368d5139a9cf690bb5c30db2bf05ffbc..87370f17d8c1f6f6a2d2beb36fbf331adbd1e216 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -170,6 +170,7 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron)
 
   // set projection type to orthographic
   myProjectionType = 0;
+  mySelectionStyle = 0;
   // set stereo parameters
   myStereoType = 0;
   myAnaglyphFilter = 0;
@@ -244,6 +245,7 @@ void OCCViewer_Viewer::initView( OCCViewer_ViewWindow* view )
     view->initSketchers();
     view->setInteractionStyle( interactionStyle() );
     view->setProjectionType( projectionType() );
+    view->setSelectionStyle( selectionStyle() );
     view->setStereoType( stereoType() );
     view->setAnaglyphFilter( anaglyphFilter() );
     view->setStereographicFocus( stereographicFocusType(), stereographicFocusValue() );
@@ -545,6 +547,31 @@ void OCCViewer_Viewer::setProjectionType( const int theType )
   }
 }
 
+
+int OCCViewer_Viewer::selectionStyle() const
+{
+  return mySelectionStyle;
+}
+
+void OCCViewer_Viewer::setSelectionStyle(const int theMode)
+{
+  if (mySelectionStyle != theMode) {
+    mySelectionStyle = theMode;
+    if (!myViewManager)
+      return;
+
+    QVector<SUIT_ViewWindow*> wins = myViewManager->getViews();
+    for (int i = 0; i < (int)wins.count(); i++)
+    {
+      OCCViewer_ViewWindow* win = ::qobject_cast<OCCViewer_ViewWindow*>(wins.at(i));
+      if (win)
+        win->setSelectionStyle(theMode);
+    }
+  }
+}
+
+
+
 /*!
   \return stereo type
 */

diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index 22b8059ed1bf03641de21ef64c76abb215a07a2b..8d91518e92fcfd2c525fa8e34751978b02fdfe81 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.h
@@ -159,6 +159,9 @@ public:
   int                             stereoType() const;
   void                            setStereoType( const int );
 
+  int                             selectionStyle() const;
+  void                            setSelectionStyle(const int);
+
   int                             anaglyphFilter() const;
   void                            setAnaglyphFilter( const int );
 
@@ -260,6 +263,7 @@ protected:
   int                             myAnaglyphFilter;
   int                             myStereographicFocusType;
   int                             myInterocularDistanceType;
+  int                             mySelectionStyle;
 
   double                          myStereographicFocusValue;
   double                          myInterocularDistanceValue;

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index a1ec747cccaced39d9b3459ef62fe35f9d6607c0..48d79cac990f3f4c930f6f2a240961be89b626a0 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.h
@@ -71,6 +71,7 @@ public:
   virtual bool                 eventFilter( QObject*, QEvent* );
 
   virtual void                 setSketcherMode(int theMode) {}
+  virtual int                  sketcherMode() const { return 0; }
 
 private slots:
   void                         onDrawViewPort();
@@ -128,6 +129,9 @@ public:
   virtual ~OCCViewer_PolygonSketcher();
 
   virtual void                 setSketcherMode(int theMode);
+  virtual int                  sketcherMode() const {
+    return myMode;
+  }
 
 protected:
   virtual bool                 onKey( QKeyEvent* );

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 2d8b48f5012bdf72ad9e0e86dff3ba7047c38ede..f866ca29c2ed381227eb1ef87c3123c598783449 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -1477,12 +1477,23 @@ void OCCViewer_ViewWindow::createActions()
   toolMgr()->registerAction( aAction, SwitchZoomingStyleId );
 
   // Switch advanced selection style (poligone/circle)
-  aAction = new QtxAction(tr("MNU_SELECTION_STYLE_SWITCH"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_RECT_STYLE" ) ),
-                          tr( "MNU_SELECTION_STYLE_SWITCH" ), 0, this);
-  aAction->setStatusTip(tr("DSC_SELECTION_STYLE_SWITCH"));
+  aAction = new QtxAction(tr("MNU_RECTANGLE_SELECTION_STYLE"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_RECT_STYLE" ) ),
+                          tr( "MNU_RECTANGLE_SELECTION_STYLE" ), 0, this);
+  aAction->setStatusTip(tr("DSC_RECTANGLE_SELECTION_STYLE"));
   aAction->setCheckable(true);
-  connect(aAction, SIGNAL(toggled(bool)), this, SLOT(onSwitchSelectionStyle(bool)));
-  toolMgr()->registerAction( aAction, SwitchSelectionStyleId);
+  toolMgr()->registerAction( aAction, RectangleSelectionStyleId);
+
+  aAction = new QtxAction(tr("MNU_CIRCLE_SELECTION_STYLE"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_CIRCLE_STYLE" ) ),
+                          tr( "MNU_CIRCLE_SELECTION_STYLE" ), 0, this);
+  aAction->setStatusTip(tr("DSC_CIRCLE_SELECTION_STYLE"));
+  aAction->setCheckable(true);
+  toolMgr()->registerAction( aAction, CircleSelectionStyleId);
+
+  // - add exclusive action group
+  QActionGroup* aSelectionGroup = new QActionGroup(this);
+  aSelectionGroup->addAction(toolMgr()->action(RectangleSelectionStyleId));
+  aSelectionGroup->addAction(toolMgr()->action(CircleSelectionStyleId));
+  connect(aSelectionGroup, SIGNAL(triggered(QAction*)), this, SLOT(onSwitchSelectionStyle(QAction*)));
 
   // Maximized view
   aAction = new QtxAction(tr("MNU_MINIMIZE_VIEW"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_MINIMIZE" ) ),
@@ -1555,7 +1566,8 @@ void OCCViewer_ViewWindow::createToolBar()
   toolMgr()->append( SwitchZoomingStyleId, tid );
   toolMgr()->append( SwitchPreselectionId, tid );
   toolMgr()->append( SwitchSelectionId, tid );
-  toolMgr()->append(SwitchSelectionStyleId, tid );
+  toolMgr()->append(RectangleSelectionStyleId, tid );
+  toolMgr()->append(CircleSelectionStyleId, tid );
   if( myModel->trihedronActivated() )
     toolMgr()->append( TrihedronShowId, tid );
 
@@ -2202,23 +2214,45 @@ void OCCViewer_ViewWindow::onSwitchSelection( bool on )
   }
 }
 
-void OCCViewer_ViewWindow::onSwitchSelectionStyle(bool on)
+/*!
+  \brief Switches style of advanced multiple selection by Poligon/Circle
+*/
+void OCCViewer_ViewWindow::onSwitchSelectionStyle(QAction* theAction)
 {
   // selection
-  QtxAction* a = dynamic_cast<QtxAction*>( toolMgr()->action(SwitchSelectionStyleId) );
-  if (a) {
-    if (a->isChecked() != on) {
-      a->setChecked(on);
+  OCCViewer_ViewSketcher* aSkecher = getSketcher(Polygon);
+  if (aSkecher) {
+    if (theAction == toolMgr()->action(RectangleSelectionStyleId)) {
+      aSkecher->setSketcherMode(OCCViewer_PolygonSketcher::Poligone);
+    }
+    else if (theAction == toolMgr()->action(CircleSelectionStyleId)) {
+      aSkecher->setSketcherMode(OCCViewer_PolygonSketcher::Circle);
     }
-    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-    QPixmap aIcon = on ? aResMgr->loadPixmap("OCCViewer", tr("ICON_OCCVIEWER_CIRCLE_STYLE")) :
-      aResMgr->loadPixmap("OCCViewer", tr("ICON_OCCVIEWER_RECT_STYLE"));
-    a->setIcon(aIcon);
   }
+}
+
+int OCCViewer_ViewWindow::selectionStyle() const
+{
+  OCCViewer_ViewSketcher* aSkecher = getSketcher(Polygon);
+  if (aSkecher) {
+    return aSkecher->sketcherMode();
+  }
+  return 0;
+}
+
+void OCCViewer_ViewWindow::setSelectionStyle(int theMode)
+{
   OCCViewer_ViewSketcher* aSkecher = getSketcher(Polygon);
   if (aSkecher) {
-    aSkecher->setSketcherMode(on ? OCCViewer_PolygonSketcher::Circle :
-      OCCViewer_PolygonSketcher::Poligone);
+    aSkecher->setSketcherMode(theMode);
+    if (theMode == 0) {
+      toolMgr()->action(RectangleSelectionStyleId)->setChecked(true);
+      toolMgr()->action(CircleSelectionStyleId)->setChecked(false);
+    }
+    else {
+      toolMgr()->action(RectangleSelectionStyleId)->setChecked(false);
+      toolMgr()->action(CircleSelectionStyleId)->setChecked(true);
+    }
   }
 }
 
@@ -3034,11 +3068,11 @@ void OCCViewer_ViewWindow::initSketchers()
   }
 }
 
-OCCViewer_ViewSketcher* OCCViewer_ViewWindow::getSketcher( const int typ )
+OCCViewer_ViewSketcher* OCCViewer_ViewWindow::getSketcher( const int typ ) const
 {
   OCCViewer_ViewSketcher* sketcher = 0;
-  QList<OCCViewer_ViewSketcher*>::Iterator it;
-  for ( it = mySketchers.begin(); it != mySketchers.end() && !sketcher; ++it )
+  QList<OCCViewer_ViewSketcher*>::ConstIterator it;
+  for ( it = mySketchers.cbegin(); it != mySketchers.cend() && !sketcher; ++it )
   {
     OCCViewer_ViewSketcher* sk = (*it);
     if ( sk->type() == typ )

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.h b/src/OCCViewer/OCCViewer_ViewWindow.h
index 056d4c5a1f07a3d7b0ab90d41e70f43d22cb6e08..ac3967995d4df28481492ac188fae6cef84e49ff 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.h
@@ -152,7 +152,7 @@ public:
         SwitchPreselectionId, SwitchSelectionId,
         MaximizedId, SynchronizeId, ReturnTo3dViewId,
         OrthographicId, PerspectiveId, StereoId, RayTracingId, EnvTextureId, LightSourceId,
-   SwitchSelectionStyleId,
+   RectangleSelectionStyleId, CircleSelectionStyleId,
         UserId };
 
   enum OperationType{ NOTHING, PANVIEW, ZOOMVIEW, ROTATE, 
@@ -202,7 +202,7 @@ public:
   virtual void      setVisualParameters( const QString& parameters );
 
   virtual void                    initSketchers();
-  virtual OCCViewer_ViewSketcher* getSketcher( const int );
+  virtual OCCViewer_ViewSketcher* getSketcher( const int ) const;
 
   virtual void                    activateSketching( int );
 
@@ -220,6 +220,9 @@ public:
   virtual int                     projectionType() const;
   virtual void                    setProjectionType( int );
 
+  virtual int                     selectionStyle() const;
+  virtual void                    setSelectionStyle(int);
+
   virtual int                     stereoType() const;
   virtual void                    setStereoType( const int );
 
@@ -314,7 +317,7 @@ public slots:
   virtual void onSwitchZoomingStyle( bool on );
   virtual void onSwitchPreselection( bool on );
   virtual void onSwitchSelection( bool on );
-  virtual void onSwitchSelectionStyle( bool on );
+  virtual void onSwitchSelectionStyle(QAction* theAction);
   virtual void onRayTracing();
   virtual void onEnvTexture();
   virtual void onLightSource();

diff --git a/src/OCCViewer/resources/OCCViewer_msg_en.ts b/src/OCCViewer/resources/OCCViewer_msg_en.ts
index 6d3ad7bf8529eb72813b081295af0f8805d8d38f..2f7fd70fec5fc8d611f921d83b442b8ba69c860f 100644 (file)
--- a/src/OCCViewer/resources/OCCViewer_msg_en.ts
+++ b/src/OCCViewer/resources/OCCViewer_msg_en.ts
@@ -232,17 +232,25 @@
         <source>MNU_ZOOMING_STYLE_SWITCH</source>
         <translation>Zooming style switch</translation>
     </message>
-    <message>
-        <source>MNU_SELECTION_STYLE_SWITCH</source>
-        <translation>Advanced selection style switch</translation>
-    </message>
     <message>
         <source>DSC_ZOOMING_STYLE_SWITCH</source>
         <translation>Zooming style switch</translation>
     </message>
     <message>
-        <source>DSC_SELECTION_STYLE_SWITCH</source>
-        <translation>Advanced selection style switch</translation>
+        <source>MNU_RECTANGLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by polygon</translation>
+    </message>
+    <message>
+        <source>DSC_RECTANGLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by polygon</translation>
+    </message>
+    <message>
+        <source>MNU_CIRCLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by circle</translation>
+    </message>
+    <message>
+        <source>DSC_CIRCLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by circle</translation>
     </message>
     <message>
         <source>MNU_ENABLE_PRESELECTION</source>

diff --git a/src/OCCViewer/resources/OCCViewer_msg_fr.ts b/src/OCCViewer/resources/OCCViewer_msg_fr.ts
index 7e08574046b35998c1dcdaa46c65c5857fe908e1..76c7e57b7eeb0459ba66b288f2f1ef0a0fdbedd9 100644 (file)
--- a/src/OCCViewer/resources/OCCViewer_msg_fr.ts
+++ b/src/OCCViewer/resources/OCCViewer_msg_fr.ts
@@ -231,17 +231,25 @@
         <source>MNU_ZOOMING_STYLE_SWITCH</source>
         <translation>Changer le style de zoom</translation>
     </message>
-    <message>
-        <source>MNU_SELECTION_STYLE_SWITCH</source>
-        <translation>Advanced selection style switch</translation>
-    </message>
     <message>
         <source>DSC_ZOOMING_STYLE_SWITCH</source>
         <translation>Changer le style de zoom</translation>
     </message>
     <message>
-        <source>DSC_SELECTION_STYLE_SWITCH</source>
-        <translation>Advanced selection style switch</translation>
+        <source>MNU_RECTANGLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by polygon</translation>
+    </message>
+    <message>
+        <source>DSC_RECTANGLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by polygon</translation>
+    </message>
+    <message>
+        <source>MNU_CIRCLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by circle</translation>
+    </message>
+    <message>
+        <source>DSC_CIRCLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by circle</translation>
     </message>
     <message>
         <source>MNU_ENABLE_PRESELECTION</source>

diff --git a/src/OCCViewer/resources/OCCViewer_msg_ja.ts b/src/OCCViewer/resources/OCCViewer_msg_ja.ts
index 0820836f4a94a12b176f8ee417d2a2c26fc7c76b..0ac1e9e2120e8f3bd2ae0c5c3290127fc7266d63 100644 (file)
--- a/src/OCCViewer/resources/OCCViewer_msg_ja.ts
+++ b/src/OCCViewer/resources/OCCViewer_msg_ja.ts
@@ -232,17 +232,25 @@
       <source>MNU_ZOOMING_STYLE_SWITCH</source>
       <translation>ズームのスタイルを変更します。</translation>
     </message>
-    <message>
-        <source>MNU_SELECTION_STYLE_SWITCH</source>
-        <translation>Advanced selection style switch</translation>
-    </message>
     <message>
       <source>DSC_ZOOMING_STYLE_SWITCH</source>
       <translation>ズームのスタイルを変更します。</translation>
     </message>
     <message>
-        <source>DSC_SELECTION_STYLE_SWITCH</source>
-        <translation>Advanced selection style switch</translation>
+        <source>MNU_RECTANGLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by polygon</translation>
+    </message>
+    <message>
+        <source>DSC_RECTANGLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by polygon</translation>
+    </message>
+    <message>
+        <source>MNU_CIRCLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by circle</translation>
+    </message>
+    <message>
+        <source>DSC_CIRCLE_SELECTION_STYLE</source>
+        <translation>Advanced selection by circle</translation>
     </message>
     <message>
       <source>MNU_ENABLE_PRESELECTION</source>

diff --git a/src/OCCViewer/resources/occ_view_circle_style.png b/src/OCCViewer/resources/occ_view_circle_style.png
index ee8bb505591e687515bb5017fc6ade1e321430f1..f63b6f9d944d20cafe6d53487da9a6fa44f2e235 100644 (file)
Binary files a/src/OCCViewer/resources/occ_view_circle_style.png and b/src/OCCViewer/resources/occ_view_circle_style.png differ

diff --git a/src/OCCViewer/resources/occ_view_rect_style.png b/src/OCCViewer/resources/occ_view_rect_style.png
index 18b4f098749c582537628e04600b4b61a64f91ac..acc3bc048f4ab4620a53fea177dd53b6193637c9 100644 (file)
Binary files a/src/OCCViewer/resources/occ_view_rect_style.png and b/src/OCCViewer/resources/occ_view_rect_style.png differ