X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FVTKViewer%2FVTKViewer_Actor.cxx;h=76f5d153bde1b9a64534a216f774c4ab2b6b0c82;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=e19a2506d4587d8edcdf0a72d89c786e7cac5e2d;hpb=2267370df32671b0f7781e3adaba3c3e23794967;p=modules%2Fgui.git diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx index e19a2506d..76f5d153b 100755 --- a/src/VTKViewer/VTKViewer_Actor.cxx +++ b/src/VTKViewer/VTKViewer_Actor.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -61,18 +61,18 @@ vtkStandardNewMacro(VTKViewer_Actor); */ VTKViewer_Actor ::VTKViewer_Actor(): + myIsResolveCoincidentTopology(true), myOpacity(1.0), - myIsHighlighted(false), - myIsPreselected(false), - myRepresentation(VTKViewer::Representation::Surface), myDisplayMode(1), - myProperty(vtkProperty::New()), - PreviewProperty(NULL), myIsInfinite(false), - myIsResolveCoincidentTopology(true), myStoreMapping(false), myGeomFilter(VTKViewer_GeometryFilter::New()), - myTransformFilter(VTKViewer_TransformFilter::New()) + myTransformFilter(VTKViewer_TransformFilter::New()), + myRepresentation(VTKViewer::Representation::Surface), + myProperty(vtkProperty::New()), + PreviewProperty(NULL), + myIsPreselected(false), + myIsHighlighted(false) { vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor, myPolygonOffsetUnits); @@ -332,12 +332,12 @@ VTKViewer_Actor /*! To calculatate last modified time */ -unsigned long int +vtkMTimeType VTKViewer_Actor ::GetMTime() { - unsigned long mTime = this->Superclass::GetMTime(); - unsigned long time = myTransformFilter->GetMTime(); + vtkMTimeType mTime = this->Superclass::GetMTime(); + vtkMTimeType time = myTransformFilter->GetMTime(); mTime = ( time > mTime ? time : mTime ); if(vtkDataSet *aDataSet = dynamic_cast(myPassFilter[0]->GetInput())){ // bad usage of GetInput time = aDataSet->GetMTime();