IPAL9620: SIGSEGV on attempt to set properties of Cut Planes during animation setup

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index 8bb166b64b0cfc33261c4613644355d3465bbe13..6e3d7246605a09a44a30a9a29f7306c6d4abe73e 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -43,18 +43,13 @@ using namespace std;
 bool VisuGUI_CutLinesDlg::MYGenerateTable = true;
 bool VisuGUI_CutLinesDlg::MYGenerateCurve = true;
 
-VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule,
-                                          bool theIsCreation, bool theIsModal)
-     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_CutLinesDlg", theIsModal,
+VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule)
+     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_CutLinesDlg", true,
                WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
        myPreviewActor(0)
 {
-  if (!theIsModal) {
-    setWFlags(getWFlags() | WDestructiveClose);
-  }
   setCaption("Cut Lines Definition");
   setSizeGripEnabled(true);
-  myIsCreation = theIsCreation;
 
   QVBoxLayout* aMainLayout = new QVBoxLayout (this, 7, 6);
   aMainLayout->setSpacing(5);

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.h b/src/VISUGUI/VisuGUI_CutLinesDlg.h
index 5d9d103ad78cbc38981e17f678f8042d041ad97c..0f225acb37e6a610d35dd1fead8bd7b5b7c1b55c 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.h
@@ -28,7 +28,7 @@ class VisuGUI_CutLinesDlg: public QDialog
     Q_OBJECT
 
 public:
-    VisuGUI_CutLinesDlg (SalomeApp_Module* theModule, bool theIsCreation = true, bool theIsModal = true);
+    VisuGUI_CutLinesDlg (SalomeApp_Module* theModule);
     ~VisuGUI_CutLinesDlg();
 
     void initFromPrsObject (VISU::CutLines_i* thePrs);
@@ -95,9 +95,8 @@ private:
   //jfa tmp:SUIT_ViewManager *myMgr;
   //jfa tmp:SUIT_ViewWindow *myStudyWnd;
 
-  bool myIsCreation;
-
   static bool MYGenerateTable;
   static bool MYGenerateCurve;
 };
+
 #endif // VISUGUI_CUTLINESDLG_H

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 845a9a869dd53a8769f24174c131da4f1f9e6748..f55b4b5414604bd4e19678c6d3f25988f6c964c7 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -458,17 +458,12 @@ void VisuGUI_CutPlanesPane::onPreviewCheck (bool thePreview)
 /*!
   Constructor
 */
-VisuGUI_CutPlanesDlg::VisuGUI_CutPlanesDlg (SalomeApp_Module* theModule,
-                                            bool theIsCreation, bool theIsModal)
-     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_CutPlanesDlg", theIsModal, WStyle_Customize |
-               WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+VisuGUI_CutPlanesDlg::VisuGUI_CutPlanesDlg (SalomeApp_Module* theModule)
+     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_CutPlanesDlg", true,
+               WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
-  if (!theIsModal) {
-    setWFlags(getWFlags() | WDestructiveClose);
-  }
   setCaption("Cut Planes Definition");
   setSizeGripEnabled(true);
-  myIsCreation = theIsCreation;
 
   QVBoxLayout* TopLayout = new QVBoxLayout (this);
   TopLayout->setSpacing(6);

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.h b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
index 227830fa28c3456141fba234a51e463c797a3510..e5ccea9ff9236f6552a37ce07eb502ec0b976382 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
@@ -105,8 +105,7 @@ class VisuGUI_CutPlanesDlg : public QDialog
     Q_OBJECT
 
 public:
-    VisuGUI_CutPlanesDlg (SalomeApp_Module* theModule,
-                         bool theIsCreation = true, bool theIsModal = true);
+    VisuGUI_CutPlanesDlg (SalomeApp_Module* theModule);
     ~VisuGUI_CutPlanesDlg() {};
 
     void initFromPrsObject (VISU::CutPlanes_i* thePrs);
@@ -121,8 +120,6 @@ private:
     VisuGUI_CutPlanesPane* myCutPane;
     VisuGUI_ScalarBarPane* myScalarPane;
     VISU::CutPlanes_i*     myPrs;
-
-    bool myIsCreation;
 };
 
 

diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
index d905c731ee294b9c6aa39000b9c87a4b8f60d182..7d7c02322308a6ca049f47fbf757661ec9de0f74 100644 (file)
--- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
@@ -650,7 +650,6 @@ void SetupDlg::onTypeChanged (int theIndex)
 //************************************************************************
 void SetupDlg::onPreferencesDlg()
 {
-  MESSAGE("SetupDlg::onPreferencesDlg() is not implemented");
   SUIT_OverrideCursor c;
   FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem());
   if (aData.myPrs.empty())
@@ -689,10 +688,10 @@ void SetupDlg::onPreferencesDlg()
     EDITPRS(VISU::IsoSurfaces_i, VisuGUI_IsoSurfacesDlg);
     break;
   case TCUTPLANES_ITEM: //Cut Planes
-    //    EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg);
-    {
-      c.suspend();
-      VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, true);
+    c.suspend();
+    EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg);
+    /*{
+      VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg (myModule);
       //_CS_PhB :operator [] .at      aDlg->initFromPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs.at(0)));
       aDlg->initFromPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs[0]));
 
@@ -702,7 +701,7 @@ void SetupDlg::onPreferencesDlg()
          aDlg->storeToPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs[i]));
       }
       delete aDlg;
-    }
+    }*/
     break;
   case TPLOT3D_ITEM: //Plot 3D
     c.suspend();