From: vsr <vsr@opencascade.com>
Date: Mon, 17 Dec 2012 12:20:10 +0000 (+0000)
Subject: Imp: move U/V iso-lines number preferences to the GEOM module plus make them working... 
X-Git-Tag: V6_main_FINAL~69
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97120d87664f7944a22ab9e742b68c2b6a4bb6bb;p=modules%2Fgui.git

Imp: move U/V iso-lines number preferences to the GEOM module plus make them working with VTK viewer also.
---

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index cf0163b5a..83ff7cbe1 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -1445,11 +1445,6 @@ SUIT_ViewManager* LightApp_Application::createViewManager( const QString& vmType
 
     vm->setTrihedronSize(  resMgr->doubleValue( "OCCViewer", "trihedron_size", vm->trihedronSize() ),
                            resMgr->booleanValue( "OCCViewer", "relative_size", vm->trihedronRelative() ));
-    int u( 1 ), v( 1 );
-    vm->isos( u, v );
-    u = resMgr->integerValue( "OCCViewer", "iso_number_u", u );
-    v = resMgr->integerValue( "OCCViewer", "iso_number_v", v );
-    vm->setIsos( u, v );
     vm->setInteractionStyle( resMgr->integerValue( "OCCViewer", "navigation_mode", vm->interactionStyle() ) );
     vm->setZoomingStyle( resMgr->integerValue( "OCCViewer", "zooming_mode", vm->zoomingStyle() ) );
     viewMgr->setViewModel( vm );// custom view model, which extends SALOME_View interface
@@ -2115,22 +2110,6 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref )
   // .... -> show static trihedron
   pref->addPreference( tr( "PREF_SHOW_STATIC_TRIHEDRON" ), occTriGroup, LightApp_Preferences::Bool, "OCCViewer", "show_static_trihedron" );
   // ... "Trihedron" group <<end>>
-
-  // ... "Iso-lines" group <<start>>
-  int isoGroup = pref->addPreference( tr( "PREF_ISOS" ), occGroup );
-  pref->setItemProperty( "columns", 2, isoGroup );
-  // .... -> nb isos U
-  int isoU = pref->addPreference( tr( "PREF_ISOS_U" ), isoGroup,
-                                  LightApp_Preferences::IntSpin, "OCCViewer", "iso_number_u" );
-  pref->setItemProperty( "min", 0, isoU );
-  pref->setItemProperty( "max", 100000, isoU );
-  // .... -> nb isos V
-  int isoV = pref->addPreference( tr( "PREF_ISOS_V" ), isoGroup,
-                                  LightApp_Preferences::IntSpin, "OCCViewer", "iso_number_v" );
-  pref->setItemProperty( "min", 0, isoV );
-  pref->setItemProperty( "max", 100000, isoV );
-  // ... "Iso-lines" group <<end>>
-
   // ... "Background" group <<start>>
   int bgGroup = pref->addPreference( tr( "PREF_VIEWER_BACKGROUND" ), occGroup );
   //  pref->setItemProperty( "columns", 2, bgGroup );
@@ -2776,24 +2755,6 @@ void LightApp_Application::preferencesChanged( const QString& sec, const QString
 #endif
   }
 #endif
-
-#ifndef DISABLE_OCCVIEWER
-  if ( sec == QString( "OCCViewer" ) && ( param == QString( "iso_number_u" ) || param == QString( "iso_number_v" ) ) )
-  {
-    QList<SUIT_ViewManager*> lst;
-    viewManagers( OCCViewer_Viewer::Type(), lst );
-    int u = resMgr->integerValue( sec, "iso_number_u" );
-    int v = resMgr->integerValue( sec, "iso_number_v" );
-    QListIterator<SUIT_ViewManager*> it( lst );
-    while ( it.hasNext() )
-    {
-      OCCViewer_ViewManager* mgr = dynamic_cast<OCCViewer_ViewManager*>( it.next() );
-      if( mgr && mgr->getOCCViewer() )
-        mgr->getOCCViewer()->setIsos( u, v );
-    }
-  }
-#endif
-
   if( sec=="ObjectBrowser" )
   {
     SUIT_DataBrowser* ob = objectBrowser();
diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index 7d6b70a84..3ccf31e7b 100644
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -346,18 +346,6 @@ The changes will be applied on the next application session.</translation>
         <source>PREF_CURVE_TYPE</source>
         <translation>Curve type:</translation>
     </message>
-    <message>
-        <source>PREF_ISOS</source>
-        <translation>Number of isolines</translation>
-    </message>
-    <message>
-        <source>PREF_ISOS_U</source>
-        <translation>Along U</translation>
-    </message>
-    <message>
-        <source>PREF_ISOS_V</source>
-        <translation>Along V</translation>
-    </message>
     <message>
         <source>PREF_POINTS</source>
         <translation>Points</translation>
diff --git a/src/LightApp/resources/LightApp_msg_fr.ts b/src/LightApp/resources/LightApp_msg_fr.ts
index 5fb47c07f..057cec5d0 100755
--- a/src/LightApp/resources/LightApp_msg_fr.ts
+++ b/src/LightApp/resources/LightApp_msg_fr.ts
@@ -346,18 +346,6 @@ Les modifications seront appliquées à la prochaine session.</translation>
         <source>PREF_CURVE_TYPE</source>
         <translation>Type de courbe:</translation>
     </message>
-    <message>
-        <source>PREF_ISOS</source>
-        <translation>Nombre d&apos;isolignes</translation>
-    </message>
-    <message>
-        <source>PREF_ISOS_U</source>
-        <translation>Selon U</translation>
-    </message>
-    <message>
-        <source>PREF_ISOS_V</source>
-        <translation>Selon V</translation>
-    </message>
     <message>
         <source>PREF_POINTS</source>
         <translation>Points</translation>