Bug PAL8221 - POST-PRO: Pal/Salome crashes if edit presentation in opened study

diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index f219d4a3ce9373255265ae874b469c24c7fc47bd..9d3cf427ac626e02b037f82515e909c8c7ea0c6c 100644 (file)
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -37,7 +37,7 @@
 #include <vtkStreamLine.h>
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = 0;
 #else
 static int MYDEBUG = 0;
 #endif

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 6e4b1d19734b8a90f3ac7a86b8aa3e82be241ed3..a039ad746114f5920828dfefe1585f08b35f8b9b 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -2616,7 +2616,7 @@ void VisuGUI::CopyPresentation(){
    case VISU::TSCALARMAP:
     {
       VISU::ScalarMap_i* aScalarPrs = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
-      VISU::ScalarMap_i* aSameScalar = new VISU::ScalarMap_i(aScalarPrs->GetResult());
+      VISU::ScalarMap_i* aSameScalar = new VISU::ScalarMap_i(aScalarPrs->GetResult(),true);
       aSameScalar->SameAs(aScalarPrs);
       UpdateViewer(aSameScalar);
     }    
@@ -2624,7 +2624,7 @@ void VisuGUI::CopyPresentation(){
    case VISU::TDEFORMEDSHAPE:
     {
       VISU::DeformedShape_i* aDefPrs = dynamic_cast<VISU::DeformedShape_i*>(aPrsObject);
-      VISU::DeformedShape_i* aSameDeformed = new VISU::DeformedShape_i(aDefPrs->GetResult());
+      VISU::DeformedShape_i* aSameDeformed = new VISU::DeformedShape_i(aDefPrs->GetResult(),true);
       aSameDeformed->SameAs(aDefPrs);
       UpdateViewer(aSameDeformed);
     }    
@@ -2632,7 +2632,7 @@ void VisuGUI::CopyPresentation(){
    case VISU::TCUTPLANES:
     {
       VISU::CutPlanes_i* aCutPrs = dynamic_cast<VISU::CutPlanes_i*>(aPrsObject);
-      VISU::CutPlanes_i* aSameCut = new VISU::CutPlanes_i(aCutPrs->GetResult());
+      VISU::CutPlanes_i* aSameCut = new VISU::CutPlanes_i(aCutPrs->GetResult(),true);
       aSameCut->SameAs(aCutPrs);
       UpdateViewer(aSameCut);
     }    
@@ -2640,7 +2640,7 @@ void VisuGUI::CopyPresentation(){
     case VISU::TCUTLINES:
     {
       VISU::CutLines_i* aCutPrs = dynamic_cast<VISU::CutLines_i*>(aPrsObject);
-      VISU::CutLines_i* aSameCut = new VISU::CutLines_i(aCutPrs->GetResult());
+      VISU::CutLines_i* aSameCut = new VISU::CutLines_i(aCutPrs->GetResult(),true);
       aSameCut->SameAs(aCutPrs);
       UpdateViewer(aSameCut);
     }    
@@ -2648,7 +2648,7 @@ void VisuGUI::CopyPresentation(){
   case VISU::TISOSURFACE:
     {
       VISU::IsoSurfaces_i* aIsoPrs = dynamic_cast<VISU::IsoSurfaces_i*>(aPrsObject);
-      VISU::IsoSurfaces_i* aSameIso = new VISU::IsoSurfaces_i(aIsoPrs->GetResult());
+      VISU::IsoSurfaces_i* aSameIso = new VISU::IsoSurfaces_i(aIsoPrs->GetResult(),true);
       aSameIso->SameAs(aIsoPrs);
       UpdateViewer(aSameIso);
     }    
@@ -2656,7 +2656,7 @@ void VisuGUI::CopyPresentation(){
    case VISU::TSTREAMLINES:
     {
       VISU::StreamLines_i* aLinesPrs = dynamic_cast<VISU::StreamLines_i*>(aPrsObject);
-      VISU::StreamLines_i* aSameLines = new VISU::StreamLines_i(aLinesPrs->GetResult());
+      VISU::StreamLines_i* aSameLines = new VISU::StreamLines_i(aLinesPrs->GetResult(),true);
       aSameLines->SameAs(aLinesPrs);
       UpdateViewer(aSameLines);
     }    
@@ -2664,7 +2664,7 @@ void VisuGUI::CopyPresentation(){
    case VISU::TVECTORS:
     {
       VISU::Vectors_i* aVectorsPrs = dynamic_cast<VISU::Vectors_i*>(aPrsObject);
-      VISU::Vectors_i* aSameVectors = new VISU::Vectors_i(aVectorsPrs->GetResult());
+      VISU::Vectors_i* aSameVectors = new VISU::Vectors_i(aVectorsPrs->GetResult(),true);
       aSameVectors->SameAs(aVectorsPrs);
       UpdateViewer(aSameVectors);
     }    

diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc
index f5185524ee0eb80bda37d68ef328f3feca38830c..f2ee138e5dfb80343b319470b4d868ad123077c7 100644 (file)
--- a/src/VISU_I/VISU_CutLines_i.cc
+++ b/src/VISU_I/VISU_CutLines_i.cc
@@ -55,15 +55,27 @@ const string VISU::CutLines_i::myComment = "CUTLINES";
 const char* VISU::CutLines_i::GetComment() const { return myComment.c_str();}
 
 
-VISU::CutLines_i::CutLines_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) :
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject),
-       ScalarMap_i(theResult,theAddToStudy,theSObject)
+VISU::CutLines_i::
+CutLines_i(Result_i* theResult, 
+          bool theAddToStudy) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  ScalarMap_i(theResult,theAddToStudy),
+  myCutLinesPL(NULL)
 {
-  myCutLinesPL = NULL;
 }
 
 
+VISU::CutLines_i::
+CutLines_i(Result_i* theResult, 
+          SALOMEDS::SObject_ptr theSObject) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  ScalarMap_i(theResult,theSObject),
+  myCutLinesPL(NULL)
+{
+}
+
 
 void VISU::CutLines_i::SameAs(const CutLines_i* theOrigin){
   VISU::ScalarMap_i::SameAs(theOrigin);

diff --git a/src/VISU_I/VISU_CutLines_i.hh b/src/VISU_I/VISU_CutLines_i.hh
index e0ee18208411963fff78f9c1836e3422efb291d9..5d697a7fc015dc145ab6af034c6155bf85dc53d5 100644 (file)
--- a/src/VISU_I/VISU_CutLines_i.hh
+++ b/src/VISU_I/VISU_CutLines_i.hh
@@ -39,8 +39,12 @@ namespace VISU{
     CutLines_i();
     CutLines_i(const CutLines_i&);
   public:
-    CutLines_i(Result_i* theResult, bool theAddToStudy = true,
-              SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    CutLines_i(Result_i* theResult,
+              bool theAddToStudy);
+    explicit
+    CutLines_i(Result_i* theResult,
+              SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const CutLines_i* theOrigin);
     virtual ~CutLines_i();
 

diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc
index a18f32f3cf0402fd4b1f9fa48a98d4e10bbf0145..b0dca7d0340edd9ddbc094c9e280f965eb439483 100644 (file)
--- a/src/VISU_I/VISU_CutPlanes_i.cc
+++ b/src/VISU_I/VISU_CutPlanes_i.cc
@@ -53,12 +53,25 @@ const string VISU::CutPlanes_i::myComment = "CUTPLANES";
 const char* VISU::CutPlanes_i::GetComment() const { return myComment.c_str();}
 
 
-VISU::CutPlanes_i::CutPlanes_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) :
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject),
-       ScalarMap_i(theResult,theAddToStudy,theSObject)
+VISU::CutPlanes_i::
+CutPlanes_i(Result_i* theResult, 
+           bool theAddToStudy) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  ScalarMap_i(theResult,theAddToStudy),
+  myCutPlanesPL(NULL)
+{
+}
+
+
+VISU::CutPlanes_i::
+CutPlanes_i(Result_i* theResult, 
+           SALOMEDS::SObject_ptr theSObject) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  ScalarMap_i(theResult,theSObject),
+  myCutPlanesPL(NULL)
 {
-  myCutPlanesPL = NULL;
 }
 
 

diff --git a/src/VISU_I/VISU_CutPlanes_i.hh b/src/VISU_I/VISU_CutPlanes_i.hh
index 867fe5d3e84bcc5a1d75c19c5d634213fe7ae844..e980c31564e70ee683b425ff931c41e558d6151a 100644 (file)
--- a/src/VISU_I/VISU_CutPlanes_i.hh
+++ b/src/VISU_I/VISU_CutPlanes_i.hh
@@ -39,8 +39,12 @@ namespace VISU{
     CutPlanes_i();
     CutPlanes_i(const CutPlanes_i&);
   public:
-    CutPlanes_i(Result_i* theResult, bool theAddToStudy = true,
-               SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    CutPlanes_i(Result_i* theResult,
+               bool theAddToStudy);
+    explicit
+    CutPlanes_i(Result_i* theResult,
+               SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const CutPlanes_i* theOrigin);
     virtual ~CutPlanes_i();
 

diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc
index ed15758d22266c738bed05df7f8e9905858fad9e..1198ad2d3d31b797a08d9d0136589fdc4eedb4db 100644 (file)
--- a/src/VISU_I/VISU_DeformedShape_i.cc
+++ b/src/VISU_I/VISU_DeformedShape_i.cc
@@ -62,16 +62,29 @@ const string VISU::DeformedShape_i::myComment = "DEFORMEDSHAPE";
 const char* VISU::DeformedShape_i::GetComment() const { return myComment.c_str();}
 
 
-VISU::DeformedShape_i::DeformedShape_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) : 
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject),
-       ScalarMap_i(theResult,theAddToStudy,theSObject)
+VISU::DeformedShape_i::
+DeformedShape_i(Result_i* theResult, 
+               bool theAddToStudy) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  ScalarMap_i(theResult,theAddToStudy),
+  myDeformedShapePL(NULL)
 {
   if(MYDEBUG) MESSAGE("DeformedShape_i::DeformedShape_i");
-  myDeformedShapePL = NULL;
 }
 
 
+VISU::DeformedShape_i::
+DeformedShape_i(Result_i* theResult, 
+               SALOMEDS::SObject_ptr theSObject) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  ScalarMap_i(theResult,theSObject),
+  myDeformedShapePL(NULL)
+{
+  if(MYDEBUG) MESSAGE("DeformedShape_i::DeformedShape_i");
+}
+
 
 void VISU::DeformedShape_i::SameAs(const DeformedShape_i* theOrigin)
 {

diff --git a/src/VISU_I/VISU_DeformedShape_i.hh b/src/VISU_I/VISU_DeformedShape_i.hh
index 96fc4d2297affb2dfbdb4d1d1cb2e35777e7b435..d8298457c4fe7424f6c58bb6075f4c71a24f4962 100644 (file)
--- a/src/VISU_I/VISU_DeformedShape_i.hh
+++ b/src/VISU_I/VISU_DeformedShape_i.hh
@@ -39,8 +39,12 @@ namespace VISU{
     DeformedShape_i();
     DeformedShape_i(const DeformedShape_i&);
   public:
-    DeformedShape_i(Result_i* theResult, bool theAddToStudy = true,
-                   SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    DeformedShape_i(Result_i* theResult,
+                   bool theAddToStudy);
+    explicit
+    DeformedShape_i(Result_i* theResult,
+                   SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const DeformedShape_i* theOrigin);
     virtual ~DeformedShape_i();
 

diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc
index 4a1527033848397ffeb1e0460e09902f7679acb1..79b2a877fd328bda3c1605e5d1aa3fcb1298cdba 100644 (file)
--- a/src/VISU_I/VISU_IsoSurfaces_i.cc
+++ b/src/VISU_I/VISU_IsoSurfaces_i.cc
@@ -51,15 +51,27 @@ const string VISU::IsoSurfaces_i::myComment = "ISOSURFACES";
 const char* VISU::IsoSurfaces_i::GetComment() const { return myComment.c_str();}
 
 
-VISU::IsoSurfaces_i::IsoSurfaces_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) :
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject),
-       ScalarMap_i(theResult,theAddToStudy,theSObject)
+VISU::IsoSurfaces_i::
+IsoSurfaces_i(Result_i* theResult, 
+             bool theAddToStudy) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  ScalarMap_i(theResult,theAddToStudy),
+  myIsoSurfacesPL(NULL)
 {
-  myIsoSurfacesPL = NULL;
 }
 
 
+VISU::IsoSurfaces_i::
+IsoSurfaces_i(Result_i* theResult, 
+             SALOMEDS::SObject_ptr theSObject) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  ScalarMap_i(theResult,theSObject),
+  myIsoSurfacesPL(NULL)
+{
+}
+
 
 void VISU::IsoSurfaces_i::SameAs(const IsoSurfaces_i* theOrigin) {
   VISU::ScalarMap_i::SameAs(theOrigin);

diff --git a/src/VISU_I/VISU_IsoSurfaces_i.hh b/src/VISU_I/VISU_IsoSurfaces_i.hh
index d3e70ff17840b411963564513973d97bcc4f2343..74e83587d48746e98e60cad6442cbf89be3c970d 100644 (file)
--- a/src/VISU_I/VISU_IsoSurfaces_i.hh
+++ b/src/VISU_I/VISU_IsoSurfaces_i.hh
@@ -39,8 +39,12 @@ namespace VISU{
     IsoSurfaces_i();
     IsoSurfaces_i(const IsoSurfaces_i&);
   public:
-    IsoSurfaces_i(Result_i* theResult, bool theAddToStudy = true,
-                 SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    IsoSurfaces_i(Result_i* theResult,
+                 bool theAddToStudy);
+    explicit
+    IsoSurfaces_i(Result_i* theResult,
+                 SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const IsoSurfaces_i* theOrigin);
     virtual ~IsoSurfaces_i();
 

diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index 8459b5bc0faf9e15b1948e1606b73ac9da015803..27b69a654d6ad5ccac9a8c60d5a413c0214aa422 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -48,11 +48,24 @@ const string VISU::Mesh_i::myComment = "MESH";
 
 const char* VISU::Mesh_i::GetComment() const { return myComment.c_str();}
 
-VISU::Mesh_i::Mesh_i(Result_i* theResult, SALOMEDS::SObject_ptr theSObject) : 
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject)
+VISU::Mesh_i::
+Mesh_i(Result_i* theResult) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,false),
+  myMeshPL(VISU_MeshPL::New())
 {
-  myPipeLine = myMeshPL = VISU_MeshPL::New();;
+  myPipeLine = myMeshPL;
+}
+
+
+VISU::Mesh_i::
+Mesh_i(Result_i* theResult, 
+       SALOMEDS::SObject_ptr theSObject) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  myMeshPL(VISU_MeshPL::New())
+{
+  myPipeLine = myMeshPL;
 }
 
 

diff --git a/src/VISU_I/VISU_Mesh_i.hh b/src/VISU_I/VISU_Mesh_i.hh
index 5ae8a364d1d07966112cac4ce5e1cec2f92c6b8b..ebed10ace9222dd38d02bb1e4bab4a4661b6aee9 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.hh
+++ b/src/VISU_I/VISU_Mesh_i.hh
@@ -39,7 +39,11 @@ namespace VISU{
     Mesh_i();
     Mesh_i(const Mesh_i&);
   public:
-    Mesh_i(Result_i* theResult, SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    Mesh_i(Result_i* theResult);
+    explicit
+    Mesh_i(Result_i* theResult, 
+          SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const Mesh_i* theOrigin);
     virtual ~Mesh_i();
     virtual void RemoveFromStudy();

diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index bd65533800724a8c3e14adfaa0a7a7ffa2cbfd31..5ae2f8ab245ca287d26c2c3837aa139b6b28eda1 100644 (file)
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -41,16 +41,28 @@ static int MYDEBUG = 0;
 static int MYDEBUG = 0;
 #endif
 
-VISU::Prs3d_i::Prs3d_i(Result_i* theResult, SALOMEDS::SObject_ptr theSObject) : 
+VISU::Prs3d_i::
+Prs3d_i(Result_i* theResult, 
+       SALOMEDS::SObject_ptr theSObject) : 
   PrsObject_i(theResult->GetStudyDocument()), 
-  myResult(theResult) 
+  myResult(theResult),
+  mySObject(SALOMEDS::SObject::_duplicate(theSObject)),
+  myAddToStudy(true),
+  myPipeLine(NULL)
+{
+  myResult->Register();
+}
+
+VISU::Prs3d_i::
+Prs3d_i(Result_i* theResult, 
+       bool theAddToStudy) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  myResult(theResult),
+  mySObject(SALOMEDS::SObject::_nil()),
+  myAddToStudy(theAddToStudy),
+  myPipeLine(NULL)
 {
   myResult->Register();
-  mySObject = SALOMEDS::SObject::_duplicate(theSObject);
-  myAddToStudy = true;
-  myPipeLine = NULL;
-  CORBA::String_var aName = myStudy->Name();
-  if(MYDEBUG) MESSAGE("Prs3d_i - this = "<<this<<"; StudyId = "<<myStudy->StudyId()<<"; Name = '"<<aName.in()<<"'");
 }
 
 void VISU::Prs3d_i::SameAs(const Prs3d_i* theOrigin)

diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh
index cd7115aad98e0e1579c77b96004f9220cac77f61..d6da505d3d7d4e13f3b321ef4b1644a700b81c7c 100644 (file)
--- a/src/VISU_I/VISU_Prs3d_i.hh
+++ b/src/VISU_I/VISU_Prs3d_i.hh
@@ -47,7 +47,12 @@ namespace VISU{
     Prs3d_i(const Prs3d_i&);
 
   public:
-    Prs3d_i(Result_i* theResult, SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    Prs3d_i(Result_i* theResult, 
+           bool theAddToStudy);
+    explicit
+    Prs3d_i(Result_i* theResult, 
+           SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const Prs3d_i* theOrigin);
     virtual ~Prs3d_i();
     virtual void RemoveFromStudy() = 0;

diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index 2fbf7b591da9fcca3b1e34ec07096530b58af40c..12a7b428e5ccbb60ccbceda3702aca6d710062b9 100644 (file)
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -70,12 +70,23 @@ QString VISU::ScalarMap_i::GenerateName() { return VISU::GenerateName("ScalarMap
 const string VISU::ScalarMap_i::myComment = "SCALARMAP";
 const char* VISU::ScalarMap_i::GetComment() const { return myComment.c_str();}
 
-VISU::ScalarMap_i::ScalarMap_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) : 
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject)
+VISU::ScalarMap_i::
+ScalarMap_i(Result_i* theResult, 
+           bool theAddToStudy) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  myScalarMapPL(NULL)
+{
+}
+
+
+VISU::ScalarMap_i::
+ScalarMap_i(Result_i* theResult, 
+           SALOMEDS::SObject_ptr theSObject) : 
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  myScalarMapPL(NULL)
 {
-  myAddToStudy = theAddToStudy;
-  myScalarMapPL = NULL;
 }
 
 

diff --git a/src/VISU_I/VISU_ScalarMap_i.hh b/src/VISU_I/VISU_ScalarMap_i.hh
index 510ff794b827a8df12a9099959fb00f42b6393e1..4bee2d4ff4180ea084ad7575c9d87ab4048ac405 100644 (file)
--- a/src/VISU_I/VISU_ScalarMap_i.hh
+++ b/src/VISU_I/VISU_ScalarMap_i.hh
@@ -40,8 +40,12 @@ namespace VISU{
     ScalarMap_i(const ScalarMap_i&);
 
   public:
-    ScalarMap_i(Result_i* theResult, bool theAddToStudy = true,
-               SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    ScalarMap_i(Result_i* theResult,
+               bool theAddToStudy);
+    explicit
+    ScalarMap_i(Result_i* theResult,
+               SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const ScalarMap_i* theOrigin);
     virtual ~ScalarMap_i();
     virtual void RemoveFromStudy();

diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc
index 30794fd1ebf2a9343ae7ee701ada8af54e7a726c..ecfe43c5942117fc36e2752bdcd2ba668c8ab5d1 100644 (file)
--- a/src/VISU_I/VISU_StreamLines_i.cc
+++ b/src/VISU_I/VISU_StreamLines_i.cc
@@ -69,16 +69,32 @@ const string VISU::StreamLines_i::myComment = "STREAMLINES";
 const char* VISU::StreamLines_i::GetComment() const { return myComment.c_str();}
 
 
-VISU::StreamLines_i::StreamLines_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) :
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject),
-       ScalarMap_i(theResult,theAddToStudy,theSObject),
-       DeformedShape_i(theResult,theAddToStudy,theSObject)
+VISU::StreamLines_i::
+StreamLines_i(Result_i* theResult, 
+             bool theAddToStudy) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  ScalarMap_i(theResult,theAddToStudy),
+  DeformedShape_i(theResult,theAddToStudy),
+  myStreamLinesPL(NULL),
+  myAppendFilter(vtkAppendFilter::New())
 {
-  myStreamLinesPL = NULL;
-  myAppendFilter = vtkAppendFilter::New();
 }
 
+
+VISU::StreamLines_i::
+StreamLines_i(Result_i* theResult, 
+             SALOMEDS::SObject_ptr theSObject) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  ScalarMap_i(theResult,theSObject),
+  DeformedShape_i(theResult,theSObject),
+  myStreamLinesPL(NULL),
+  myAppendFilter(vtkAppendFilter::New())
+{
+}
+
+
 void VISU::StreamLines_i::SameAs(const StreamLines_i* theOrigin) {
   StreamLines_i* aStreamLines = const_cast<StreamLines_i*>(theOrigin);
   VISU::DeformedShape_i::SameAs(theOrigin);

diff --git a/src/VISU_I/VISU_StreamLines_i.hh b/src/VISU_I/VISU_StreamLines_i.hh
index 05d6cb46ed26fc7ee1cfd34fb163ce227a113fc2..46ccfde8556551d9f681c604943e303abf4bb2f5 100644 (file)
--- a/src/VISU_I/VISU_StreamLines_i.hh
+++ b/src/VISU_I/VISU_StreamLines_i.hh
@@ -40,8 +40,12 @@ namespace VISU{
     StreamLines_i();
     StreamLines_i(const StreamLines_i&);
   public:
-    StreamLines_i(Result_i* theResult, bool theAddToStudy = true,
-                 SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    StreamLines_i(Result_i* theResult,
+                 bool theAddToStudy);
+    explicit
+    StreamLines_i(Result_i* theResult,
+                 SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const StreamLines_i* theOriginal);
     virtual ~StreamLines_i();
 

diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc
index ff44a6c17973a13dd1fb7a0f882e2fecbb122376..bd086a600491d10d3f657e513fb2c365d6603259 100644 (file)
--- a/src/VISU_I/VISU_Vectors_i.cc
+++ b/src/VISU_I/VISU_Vectors_i.cc
@@ -69,13 +69,27 @@ const string VISU::Vectors_i::myComment = "VECTORS";
 const char* VISU::Vectors_i::GetComment() const { return myComment.c_str();}
 
 
-VISU::Vectors_i::Vectors_i(Result_i* theResult, bool theAddToStudy, SALOMEDS::SObject_ptr theSObject) :
-       PrsObject_i(theResult->GetStudyDocument()), 
-       Prs3d_i(theResult,theSObject),
-       ScalarMap_i(theResult,theAddToStudy,theSObject),
-       DeformedShape_i(theResult,theAddToStudy,theSObject)
+VISU::Vectors_i::
+Vectors_i(Result_i* theResult, 
+         bool theAddToStudy) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theAddToStudy),
+  ScalarMap_i(theResult,theAddToStudy),
+  DeformedShape_i(theResult,theAddToStudy),
+  myVectorsPL(NULL)
+{
+}
+
+
+VISU::Vectors_i::
+Vectors_i(Result_i* theResult, 
+         SALOMEDS::SObject_ptr theSObject) :
+  PrsObject_i(theResult->GetStudyDocument()), 
+  Prs3d_i(theResult,theSObject),
+  ScalarMap_i(theResult,theSObject),
+  DeformedShape_i(theResult,theSObject),
+  myVectorsPL(NULL)
 {
-  myVectorsPL = NULL;
 }
 
 

diff --git a/src/VISU_I/VISU_Vectors_i.hh b/src/VISU_I/VISU_Vectors_i.hh
index 40b45a43fadae718bbb78ef4444831e626697228..4acbb04ab6c626907af918e0bab66df94bf2fc5a 100644 (file)
--- a/src/VISU_I/VISU_Vectors_i.hh
+++ b/src/VISU_I/VISU_Vectors_i.hh
@@ -39,8 +39,12 @@ namespace VISU{
     Vectors_i();
     Vectors_i(const Vectors_i&);
   public:
-    Vectors_i(Result_i* theResult, bool theAddToStudy = true,
-             SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
+    explicit
+    Vectors_i(Result_i* theResult,
+             bool theAddToStudy);
+    explicit
+    Vectors_i(Result_i* theResult,
+             SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const Vectors_i* theOrigin);
     virtual ~Vectors_i();