From 7e4ca3a876799a01dc57ab74781653a00600ac39 Mon Sep 17 00:00:00 2001 From: apo Date: Mon, 15 Jan 2007 09:55:46 +0000 Subject: [PATCH] We need not call the Superclass::DoShallowCopy(thePipeLine, theIsCopyInput) in the overriding DoShallowCopy to initialize the pipeline intput first --- src/PIPELINE/VISU_ColoredPL.cxx | 4 ++-- src/PIPELINE/VISU_CutLinesPL.cxx | 3 ++- src/PIPELINE/VISU_CutPlanesPL.cxx | 3 ++- src/PIPELINE/VISU_DeformedShapePL.cxx | 4 ++-- src/PIPELINE/VISU_IsoSurfacesPL.cxx | 4 ++-- src/PIPELINE/VISU_Plot3DPL.cxx | 4 ++-- src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx | 4 ++-- src/PIPELINE/VISU_StreamLinesPL.cxx | 4 ++-- src/PIPELINE/VISU_VectorsPL.cxx | 4 ++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/PIPELINE/VISU_ColoredPL.cxx b/src/PIPELINE/VISU_ColoredPL.cxx index 0e6ec807..e96225c5 100644 --- a/src/PIPELINE/VISU_ColoredPL.cxx +++ b/src/PIPELINE/VISU_ColoredPL.cxx @@ -67,6 +67,8 @@ VISU_ColoredPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_ColoredPL *aPipeLine = dynamic_cast(thePipeLine)){ if(theIsCopyInput) SetScalarRange(aPipeLine->GetScalarRange()); @@ -75,8 +77,6 @@ VISU_ColoredPL SetScaling(aPipeLine->GetScaling()); SetMapScale(aPipeLine->GetMapScale()); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx index d5be0a73..0c81eee1 100644 --- a/src/PIPELINE/VISU_CutLinesPL.cxx +++ b/src/PIPELINE/VISU_CutLinesPL.cxx @@ -50,6 +50,8 @@ VISU_CutLinesPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_CutLinesPL *aPipeLine = dynamic_cast(thePipeLine)){ SetOrientation(aPipeLine->GetPlaneOrientation(1), aPipeLine->GetRotateX(1),aPipeLine->GetRotateY(1),1); @@ -59,7 +61,6 @@ VISU_CutLinesPL else SetPosition(aPipeLine->GetPosition()); } - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx index 8403583d..80e3a329 100644 --- a/src/PIPELINE/VISU_CutPlanesPL.cxx +++ b/src/PIPELINE/VISU_CutPlanesPL.cxx @@ -75,6 +75,8 @@ VISU_CutPlanesPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_CutPlanesPL *aPipeLine = dynamic_cast(thePipeLine)){ SetOrientation(aPipeLine->GetPlaneOrientation(), @@ -88,7 +90,6 @@ VISU_CutPlanesPL if(!aPipeLine->IsPartDefault(i)) SetPartPosition(i, aPipeLine->GetPartPosition(i)); } - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx index 5c1a629e..4c9fbe95 100644 --- a/src/PIPELINE/VISU_DeformedShapePL.cxx +++ b/src/PIPELINE/VISU_DeformedShapePL.cxx @@ -62,11 +62,11 @@ VISU_DeformedShapePL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_DeformedShapePL *aPipeLine = dynamic_cast(thePipeLine)){ SetScale(aPipeLine->GetScale()); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx index 99cdc081..d812182c 100644 --- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx +++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx @@ -68,13 +68,13 @@ VISU_IsoSurfacesPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_IsoSurfacesPL *aPipeLine = dynamic_cast(thePipeLine)){ SetNbParts(aPipeLine->GetNbParts()); vtkFloatingPointType aRange[2] = {aPipeLine->GetMin(), aPipeLine->GetMax()}; SetRange(aRange); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_Plot3DPL.cxx b/src/PIPELINE/VISU_Plot3DPL.cxx index 0b7758a4..42724887 100644 --- a/src/PIPELINE/VISU_Plot3DPL.cxx +++ b/src/PIPELINE/VISU_Plot3DPL.cxx @@ -85,6 +85,8 @@ VISU_Plot3DPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_Plot3DPL *aPipeLine = dynamic_cast(thePipeLine)){ SetOrientation (aPipeLine->GetPlaneOrientation(), aPipeLine->GetRotateX(), aPipeLine->GetRotateY()); @@ -94,8 +96,6 @@ VISU_Plot3DPL SetContourPrs( aPipeLine->GetIsContourPrs() ); SetNumberOfContours( aPipeLine->GetNumberOfContours() ); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx index 2612324a..583642a3 100644 --- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx +++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx @@ -203,6 +203,8 @@ VISU_ScalarMapOnDeformedShapePL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_ScalarMapOnDeformedShapePL *aPipeLine = dynamic_cast(thePipeLine)){ SetScale(aPipeLine->GetScale()); SetScalars(aPipeLine->GetScalars()); @@ -210,8 +212,6 @@ VISU_ScalarMapOnDeformedShapePL aPipeLine->GetSourceRange(aRange); SetScalarRange(aRange); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } //---------------------------------------------------------------------------- diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx index 93706555..e47a0f38 100644 --- a/src/PIPELINE/VISU_StreamLinesPL.cxx +++ b/src/PIPELINE/VISU_StreamLinesPL.cxx @@ -91,6 +91,8 @@ VISU_StreamLinesPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_StreamLinesPL *aPipeLine = dynamic_cast(thePipeLine)){ SetParams(aPipeLine->GetIntegrationStep(), aPipeLine->GetPropagationTime(), @@ -99,8 +101,6 @@ VISU_StreamLinesPL aPipeLine->GetUsedPoints(), aPipeLine->GetDirection()); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx index 9c685a06..43afae0a 100644 --- a/src/PIPELINE/VISU_VectorsPL.cxx +++ b/src/PIPELINE/VISU_VectorsPL.cxx @@ -84,12 +84,12 @@ VISU_VectorsPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { + Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); + if(VISU_VectorsPL *aPipeLine = dynamic_cast(thePipeLine)){ SetGlyphType(aPipeLine->GetGlyphType()); SetGlyphPos(aPipeLine->GetGlyphPos()); } - - Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); } -- 2.39.2