Improving "Filtering by Scalars" functionality

  - introduction special marks on scalar bar

diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts
index d14f77650e4c37302c5c9466b8511f8fbb37e1b8..4ff110024e47467f493a58bef8590178a597530e 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.ts
+++ b/src/VISUGUI/VISU_msg_en.ts
@@ -300,7 +300,7 @@ number of time stamps or number of components is not the same!</translation>
         </message>
         <message>
             <source>VISU_SCALAR_RANGE</source>
-            <translation>Scalar range</translation>
+            <translation>Scalar range:</translation>
         </message>
         <message>
             <source>VISU_SHOW_BOUNDARY_EDGES</source>
@@ -1999,7 +1999,7 @@ Please, provide non-empty resulting presentation.</translation>
         </message>
         <message>
             <source>LOGARITHMIC_SCALING</source>
-            <translation>Logarithmic scaling</translation>
+            <translation>Logarithmic</translation>
         </message>
         <message>
             <source>ORIENTATION_GRP</source>
@@ -2019,7 +2019,7 @@ Please, provide non-empty resulting presentation.</translation>
         </message>
         <message>
             <source>SCALAR_RANGE_GRP</source>
-            <translation>Scalar range</translation>
+            <translation>Scalar range:</translation>
         </message>
         <message>
             <source>VERTICAL_BTN</source>
@@ -2830,7 +2830,7 @@ Please, provide non-empty resulting presentation.</translation>
         </message>
         <message>
             <source>LOGARITHMIC_SCALING</source>
-            <translation>Logarithmic scaling</translation>
+            <translation>Logarithmic</translation>
         </message>
         <message>
             <source>MSG_MINMAX_VALUES</source>
@@ -2850,7 +2850,7 @@ Please, provide non-empty resulting presentation.</translation>
         </message>
         <message>
             <source>SCALAR_RANGE_GRP</source>
-            <translation>Scalar range</translation>
+            <translation>Scalar range:</translation>
         </message>
         <message>
             <source>VERTICAL_BTN</source>

diff --git a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
index b606a41e17fcd4d34a7d2ab66d87ea2433073266..ccca18b9675cb4250156f25e26401ed8b8901fcb 100644 (file)
--- a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
@@ -128,6 +128,7 @@ void VisuGUI_FilterScalarsDlg::accept()
 {
   myColoredPrs3d->SetScalarFilterRange( myMinEdit->text().toDouble(), myMaxEdit->text().toDouble() );
   myColoredPrs3d->UseScalarFiltering( myRangeBox->isChecked() );
+  myColoredPrs3d->UpdateActors();
   QDialog::accept();
 }
 

diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index 850d6de079f1292fbc4cd5bd1866bf6be8af85d7..ebcba2f52a9c9fcf29b94f22a1ca09f1543ae2ff 100644 (file)
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -435,10 +435,10 @@ VISU::ScalarMap_i
     VISU_LookupTable * aLookupTable = GetSpecificPL()->GetBarTable();
 
     if ( IsScalarFilterUsed() ) {
-      unsigned char MARK_COLOR[] = { 1, 1, 1 };
+      aLookupTable->ForceBuild();
+      static unsigned char MARK_COLOR[] = { 1, 1, 1 };
       aLookupTable->MarkValueByColor( GetScalarFilterMin(), MARK_COLOR );
       aLookupTable->MarkValueByColor( GetScalarFilterMax(), MARK_COLOR );
-      aLookupTable->Modified();
     }
 
     VISU_ScalarBarActor *aScalarBar = anActor->GetScalarBar();