From b530b145191397b8c87811a3f4c7c414b4058742 Mon Sep 17 00:00:00 2001
From: ouv <ouv@opencascade.com>
Date: Thu, 24 Dec 2009 13:16:01 +0000
Subject: [PATCH] Fix of issue 0020593: EDF 885 VISU: Unchecking Filter by
 Scalar does not remove white marks on the scalar bar

---
 .../VISU/input/viewing_3d_presentations.doc   |  3 ---
 src/PIPELINE/VISU_ColoredPL.cxx               |  2 +-
 src/VISUGUI/VISU_msg_en.ts                    |  4 ----
 src/VISU_I/VISU_Prs3d_i.cc                    | 20 +++++++++++--------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc
index e8bffd5d..fb116a68 100644
--- a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc
+++ b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc
@@ -30,9 +30,6 @@ has been created and change its parameters.
 showing only the cells with values that fit into the defined
 <b>Scalar Range</b>.
 
-If the presentation is created on nodes, only the cells with all 
-nodes lying in the range defined by the scalar filter will be visible.
-
 \image html viewing2.png
 
 In the dialog box, check in <b>Filter by scalar range</b> box and input
diff --git a/src/PIPELINE/VISU_ColoredPL.cxx b/src/PIPELINE/VISU_ColoredPL.cxx
index c7027903..42a6c7c9 100644
--- a/src/PIPELINE/VISU_ColoredPL.cxx
+++ b/src/PIPELINE/VISU_ColoredPL.cxx
@@ -64,7 +64,7 @@ VISU_ColoredPL
 
   myFieldTransform->Delete();
 
-  myThreshold->AllScalarsOn(); 
+  myThreshold->AllScalarsOff(); 
   myThreshold->Delete();
   myPassFilter->Delete();
   myDistribution->Delete();
diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts
index d7ec1595..196b8f91 100644
--- a/src/VISUGUI/VISU_msg_en.ts
+++ b/src/VISUGUI/VISU_msg_en.ts
@@ -454,10 +454,6 @@ Do you want to enlarge the cache?</translation>
             <source>WRN_NO_AVAILABLE_DATA</source>
             <translation>No Available data in selection</translation>
         </message>
-	<message>
-            <source>WRN_NO_VISIBLE_ELEMENTS</source>
-            <translation>There are no visible elements.</translation>
-        </message>
         <message>
             <source>WRN_STUDY_LOCKED</source>
             <translation>Current Study is locked</translation>
diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index 84d72d90..08e4644c 100644
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -375,13 +375,8 @@ VISU::Prs3d_i
 
   aDataSet->Update();
   static float eps = VTK_LARGE_FLOAT * 0.1 ;
-  if (!aDataSet->GetNumberOfCells()) {
-    SUIT_MessageBox::warning( 0,
-                              QObject::tr("WRN_VISU"),
-                              QObject::tr("WRN_NO_VISIBLE_ELEMENTS"),
-                              QObject::tr("BUT_OK"));
-    return;
-  }
+  if (!aDataSet->GetNumberOfCells())
+    throw std::runtime_error("There are no visible elements");
 
   if (aDataSet->GetLength() > eps)
     throw std::runtime_error("Diagonal of the actor is too large !!!");
@@ -559,7 +554,16 @@ VISU::Prs3d_i
 {
   if(MYDEBUG) MESSAGE("Prs3d_i::UpdateActors - this = "<<this);
   Update();
-  CheckDataSet();
+  try {
+    CheckDataSet();
+  } catch( std::exception& ex ) {
+    SUIT_MessageBox::warning( 0,
+                              QObject::tr("WRN_VISU"),
+                              QString( ex.what() ),
+                              QObject::tr("BUT_OK") );
+    RemoveActors();
+    return;
+  }
   ProcessVoidEvent(new TInvokeSignalEvent(myUpdateActorsSignal));
 }
 
-- 
2.39.2