From: apo Date: Tue, 15 May 2007 06:56:10 +0000 (+0000) Subject: To customize "shrink" functionality for the presentations X-Git-Tag: mergeto_BR_Dev_For_4_0_21May07~26 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=242b905c00bbe8a2e62405cb0e1b9df5fcae7ccc;p=modules%2Fvisu.git To customize "shrink" functionality for the presentations --- diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx index 7e9c4936..0d3487ee 100644 --- a/src/PIPELINE/VISU_CutLinesPL.cxx +++ b/src/PIPELINE/VISU_CutLinesPL.cxx @@ -39,6 +39,8 @@ vtkStandardNewMacro(VISU_CutLinesPL); VISU_CutLinesPL ::VISU_CutLinesPL() { + SetIsShrinkable(false); + myCondition = 1; myPosition = 0; } diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx index 2c21bf18..6d45630a 100644 --- a/src/PIPELINE/VISU_DeformedShapePL.cxx +++ b/src/PIPELINE/VISU_DeformedShapePL.cxx @@ -41,6 +41,8 @@ VISU_DeformedShapePL ::VISU_DeformedShapePL(): myScaleFactor(0.0) { + SetIsShrinkable(true); + myWarpVector = vtkWarpVector::New(); myCellDataToPointData = vtkCellDataToPointData::New(); } diff --git a/src/PIPELINE/VISU_GaussPointsPL.cxx b/src/PIPELINE/VISU_GaussPointsPL.cxx index 7fd8dd6b..982ee719 100644 --- a/src/PIPELINE/VISU_GaussPointsPL.cxx +++ b/src/PIPELINE/VISU_GaussPointsPL.cxx @@ -54,6 +54,8 @@ VISU_GaussPointsPL myScaleFactor(0.0), myMagnificationIncrement(2) { + SetIsShrinkable(false); + myWarpVector = vtkWarpVector::New(); myGlyph = vtkGlyph3D::New(); diff --git a/src/PIPELINE/VISU_PipeLine.cxx b/src/PIPELINE/VISU_PipeLine.cxx index cf976dce..0b8b845a 100644 --- a/src/PIPELINE/VISU_PipeLine.cxx +++ b/src/PIPELINE/VISU_PipeLine.cxx @@ -47,7 +47,7 @@ static int MYDEBUG = 0; //---------------------------------------------------------------------------- VISU_PipeLine ::VISU_PipeLine(): - myIsShrinkable(false) + myIsShrinkable(true) { if(MYDEBUG) MESSAGE("VISU_PipeLine::VISU_PipeLine - "<Delete(); myExtractPolyDataGeometry->SetStoreMapping(true); diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx index a1693f31..db6a3cb3 100644 --- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx +++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx @@ -55,6 +55,8 @@ vtkStandardNewMacro(VISU_ScalarMapOnDeformedShapePL) VISU_ScalarMapOnDeformedShapePL ::VISU_ScalarMapOnDeformedShapePL() { + SetIsShrinkable(true); + myDeformVectors = vtkWarpVector::New(); myMergeFilter = VISU_MergeFilter::New(); myExtractorScalars = VISU_Extractor::New(); diff --git a/src/PIPELINE/VISU_ScalarMapPL.cxx b/src/PIPELINE/VISU_ScalarMapPL.cxx index 085eb2f8..8f5d3754 100644 --- a/src/PIPELINE/VISU_ScalarMapPL.cxx +++ b/src/PIPELINE/VISU_ScalarMapPL.cxx @@ -53,6 +53,8 @@ VISU_ScalarMapPL myAppendFilter(VISU_AppendFilter::New()), myMergeFilter(VISU_MergeFilter::New()) { + SetIsShrinkable(true); + myAppendFilter->SetMergingInputs(true); myAppendFilter->Delete(); diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx index 8e77ad06..bdcbbf09 100644 --- a/src/PIPELINE/VISU_StreamLinesPL.cxx +++ b/src/PIPELINE/VISU_StreamLinesPL.cxx @@ -58,6 +58,8 @@ vtkStandardNewMacro(VISU_StreamLinesPL); VISU_StreamLinesPL ::VISU_StreamLinesPL() { + SetIsShrinkable(false); + myStream = vtkStreamLine::New(); myCenters = vtkCellCenters::New(); myGeomFilter = VTKViewer_GeometryFilter::New(); diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 181412c7..caa01983 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -2569,8 +2569,7 @@ VisuGUI QString aSurfFrameType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP''VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; QString aSurfType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " " 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; - QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' " - "'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; + QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; QString aLineType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' " "'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE' }";