Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_BathymetryOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_BathymetryOp.cxx b/src/HYDROGUI/HYDROGUI_BathymetryOp.cxx
index cee53f3ec05fb13de152fd1f77972905a7e36869..0c45c2d72ba45b79a7a23f224a26f69d75245389 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_BathymetryOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_BathymetryOp.cxx
@@ -22,6 +22,7 @@
 #include <HYDROGUI_BathymetryPrs.h>
 #include <HYDROGUI_ShapeBathymetry.h>
 #include <HYDROGUI_Module.h>
+#include <HYDROGUI_OCCDisplayer.h>
 #include <LightApp_Application.h>
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewWindow.h>
@@ -36,11 +37,13 @@ HYDROGUI_BathymetryLimitsDlg::HYDROGUI_BathymetryLimitsDlg( QWidget* theParent )
   QGridLayout* layout = new QGridLayout();
   setLayout( layout );
 
-  layout->addWidget( new QLabel( tr( "MIN_VALUE" ) ), 0, 0 );
-  layout->addWidget( new QLabel( tr( "MAX_VALUE" ) ), 1, 0 );
+  layout->addWidget( new QLabel( tr( "Min value" ) ), 0, 0 );
+  layout->addWidget( new QLabel( tr( "Max value" ) ), 1, 0 );
 
   myMin = new QtxDoubleSpinBox( this );
+  myMin->setRange( -1000, 1000 );
   myMax = new QtxDoubleSpinBox( this );
+  myMax->setRange( -1000, 1000 );
 
   layout->addWidget( myMin, 0, 1 );
   layout->addWidget( myMax, 1, 1 );
@@ -50,12 +53,12 @@ HYDROGUI_BathymetryLimitsDlg::HYDROGUI_BathymetryLimitsDlg( QWidget* theParent )
   layout->addWidget( aBtnFrame, 2, 0, 1, 2 );
 
   QPushButton* ok = new QPushButton( tr( "OK" ), this );
-  QPushButton* cancel = new QPushButton( tr( "CANCEL" ), this );
+  QPushButton* cancel = new QPushButton( tr( "Cancel" ), this );
   aBtnLayout->addWidget( ok );
   aBtnLayout->addWidget( cancel );
 
   connect( ok, SIGNAL( clicked() ), this, SLOT( accept() ) );
-  connect( ok, SIGNAL( clicked() ), this, SLOT( reject() ) );
+  connect( cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
 }
 
 HYDROGUI_BathymetryLimitsDlg::~HYDROGUI_BathymetryLimitsDlg()
@@ -83,7 +86,7 @@ void HYDROGUI_BathymetryLimitsDlg::SetMinMax( double theMin, double theMax )
 
 
 HYDROGUI_BathymetryOp::HYDROGUI_BathymetryOp( HYDROGUI_Module* theModule, int theMode )
-: HYDROGUI_Operation( theModule ), myMode( theMode )
+: HYDROGUI_Operation( theModule ), myMode( theMode ), myIsActivate( false )
 {
 }
 
@@ -91,6 +94,7 @@ HYDROGUI_BathymetryOp::~HYDROGUI_BathymetryOp()
 {
 }
 
+OCCViewer_Viewer* getViewer( HYDROGUI_Module* theModule );
 Handle(AIS_InteractiveContext) getContext( HYDROGUI_Module* theModule );
 QList<Handle(HYDROGUI_BathymetryPrs)> getShownBathymetries( HYDROGUI_Module* theModule );
 
@@ -119,7 +123,12 @@ OCCViewer_ViewWindow* HYDROGUI_BathymetryOp::activeViewWindow() const
 
 void HYDROGUI_BathymetryOp::activate( bool isActivate )
 {
-QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
+  if( myIsActivate==isActivate )
+    return;
+
+  myIsActivate = isActivate;
+  QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
+  bool isUpdateCS = false;
 
   switch( myMode )
   {
@@ -133,8 +142,11 @@ QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
   case BathymetryRescaleSelectionId:
     {
       if( isActivate )
+      {
         foreach( Handle(HYDROGUI_BathymetryPrs) bath, baths )
           bath->GetShape()->RescaleBySelection();
+        isUpdateCS = true;
+      }
       commit();
       break;
     }
@@ -142,8 +154,11 @@ QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
   case BathymetryRescaleVisibleId:
     {
       if( isActivate )
+      {
         foreach( Handle(HYDROGUI_BathymetryPrs) bath, baths )
           bath->GetShape()->RescaleByVisible( activeViewWindow() );
+        isUpdateCS = true;
+      }
       commit();
       break;
     }
@@ -172,6 +187,8 @@ QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
           max = dlg.GetMax();
           foreach( Handle(HYDROGUI_BathymetryPrs) bath, baths )
             bath->GetShape()->Rescale( min, max );
+
+          isUpdateCS = true;
           commit();
         }
         else
@@ -183,9 +200,16 @@ QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
   case BathymetryRescaleDefaultId:
     {
       if( isActivate )
+      {
         foreach( Handle(HYDROGUI_BathymetryPrs) bath, baths )
           bath->GetShape()->RescaleDefault();
+        isUpdateCS = true;
+      }
+      commit();
       break;
     }
   }
+
+  if( isUpdateCS )
+    module()->getOCCDisplayer()->UpdateColorScale( getViewer( module() ) );
 }