Erase the scalar bar preview after the dialog closing.

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index 14563d8ac94192b1064552d2bfd034f93e0e97e3..a9983bf396bc30b2772be4eae45a0fa39e263874 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -801,6 +801,7 @@ void VisuGUI_CutLinesDlg::accept()
       }
     }
     VisuGUI::application()->objectBrowser()->updateTree();*/
+    myScalarPane->deletePreview();
     deletePlanes();
     QDialog::accept();
     //  }
@@ -812,6 +813,7 @@ void VisuGUI_CutLinesDlg::reject()
     myPrs->RemoveFromStudy();
     VisuGUI::application()->objectBrowser()->updateTree();
   }*/
+  myScalarPane->deletePreview();
   deletePlanes();
   QDialog::reject();
 }

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 8b92177108b4a47ba17a965c7d18ce5262c6f604..c4072907cd942daefde932fd03132643960e4129 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -530,10 +530,14 @@ void VisuGUI_CutPlanesDlg::accept()
   //  return;
   //}
   if (myScalarPane->check())
-    QDialog::accept();
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
 }
 
 void VisuGUI_CutPlanesDlg::reject() {
+  myScalarPane->deletePreview();
   QDialog::reject();
 }
 

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index 1dcf9e6327eebeb8b972836453b273646b09f6a7..da99973c16718890daaa60e28ef7efa0a7a0bcd9 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -137,5 +137,15 @@ int VisuGUI_DeformedShapeDlg::storeToPrsObject(VISU::DeformedShape_i* thePrs) {
 }
 
 void VisuGUI_DeformedShapeDlg::accept() {
-  if (myScalarPane->check())  QDialog::accept();
+  if (myScalarPane->check()) 
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
+}
+
+void VisuGUI_DeformedShapeDlg::reject()
+{
+  myScalarPane->deletePreview();
+  QDialog::reject();
 }

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
index bd735a5ac24558df7ecbe9450f563914660851ad..573c439a9fa76f36a41872d4e135913f78256a0d 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
@@ -66,6 +66,7 @@ public:
 
 protected slots:
   void accept();
+  void reject();
 
  private:
     QtxDblSpinBox* ScalFact;

diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 344e30a26d15924640c999113a832e68bb4c6665..34d170b91a3ed5ac73e19d431a23fc2e11158397 100644 (file)
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -212,5 +212,14 @@ VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (SalomeApp_Module* theModule)
 void VisuGUI_IsoSurfacesDlg::accept()
 {
   if (myIsoPane->check() && myScalarPane->check())
-    QDialog::accept();
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
+}
+
+void VisuGUI_IsoSurfacesDlg::reject()
+{
+  myScalarPane->deletePreview();
+  QDialog::reject();
 }

diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
index f3ad7c0bee28f9955a310a3fc3f5b8327f02d1f6..dc0547f1d6a78e24e856b22e7a2ddd18b66aa20d 100644 (file)
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
@@ -85,6 +85,7 @@ class VisuGUI_IsoSurfacesDlg : public QDialog
 
  protected slots:
   void accept();
+  void reject();
 
  private:
   VisuGUI_IsoSurfPane*   myIsoPane;

diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
index 78cbcec2aa5c7dc520dcb2237d571878d869bf47..62ca73062480c08c3c20989840cb793e492e9017 100644 (file)
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
@@ -551,7 +551,10 @@ VisuGUI_Plot3DDlg::VisuGUI_Plot3DDlg (SalomeApp_Module* theModule)
 void VisuGUI_Plot3DDlg::accept()
 {
   if (myIsoPane->check() && myScalarPane->check())
-    QDialog::accept();
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
 }
 
 //=======================================================================
@@ -561,6 +564,7 @@ void VisuGUI_Plot3DDlg::accept()
 void VisuGUI_Plot3DDlg::reject()
 {
   myIsoPane->check(); // hide preview
-
+  myScalarPane->deletePreview();
+  
   QDialog::reject();
 }

diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
index e5bf1e2c78ca28738ef4bfe8847ca39a9b3fd5c2..aba09d667d20c0cb77489cba94b000fbfb2171f3 100644 (file)
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
@@ -541,5 +541,14 @@ VISU::Mesh_ptr VisuGUI_StreamLinesDlg::createMesh (VISU::VISUType theType, QStri
 
 void VisuGUI_StreamLinesDlg::accept() {
   if (myScalarPane->check())
-    QDialog::accept();
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
+}
+
+void VisuGUI_StreamLinesDlg::reject()
+{
+  myScalarPane->deletePreview();
+  QDialog::reject();
 }

diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.h b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
index 0e949ebd678aa5fa44f212d16a397e86f32780c8..c5f45e205a729106fb4a33133786fe13a86552ff 100644 (file)
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
@@ -39,6 +39,7 @@ public:
 
 protected slots:
   void accept();
+  void reject();
 
 private slots:
   void onSelectionActive(bool theActive);

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index 86a10e9c7fc38ea1e605e76b52bb0d6305ab2d4d..a5e2f2c590ea8845052d11f462a26f65b4c0c067 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -408,6 +408,15 @@ void VisuGUI_VectorsDlg::enableMagnColor( bool enable )
 
 
 void VisuGUI_VectorsDlg::accept() {
-  if (myScalarPane->check())  QDialog::accept();
+  if (myScalarPane->check()) 
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
 }
 
+void VisuGUI_VectorsDlg::reject()
+{
+  myScalarPane->deletePreview();
+  QDialog::reject();
+}

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.h b/src/VISUGUI/VisuGUI_VectorsDlg.h
index 70d99b7c5379c902c7c8353b09066defed321ca1..2abdf591ce65c109d998ba92b315a03f710298bc 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.h
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.h
@@ -81,6 +81,7 @@ public:
 
 protected slots:
   void accept();
+  void reject();
 
 private:
     QGroupBox*      TopGroup;