]> Creatis software - bbtk.git/commitdiff
#3472 merge vtk8itk5wx3-mingw64
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Fri, 10 Sep 2021 09:28:09 +0000 (11:28 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Fri, 10 Sep 2021 09:28:09 +0000 (11:28 +0200)
1  2 
kernel/src/bbtkWt.h
packages/vtk/src/bbvtkPolyDataToActor.cxx

index 5fd982a66761e6808d395864c41aa5b4a2ef9367,360260f85e0c96cedff0f004a12d3218e3f7e224..011f5980a8f1d4a014c56afb81c67e0a009f5441
@@@ -150,9 -150,9 +150,10 @@@ namespace bbt
      // The keyword 'signals' is also a macro in qt
      //    typedef boost::signals::trackable SignalObserver;
  
 +//EED 2020-04-21
  //    typedef boost::signals::trackable SignalObserver;
  //    typedef boost::signal<void ()>  Signal_type;
 -
++      
      typedef boost::signals2::trackable SignalObserver;
      typedef boost::signals2::signal<void ()>  Signal_type;
  
index c0fa2088e1ec3cb1243028150c806150b23a31e0,0002d6c097da8fa273ae7dbd89099e41b5fa8359..1ec9ff2cd7c62fa3cb42c76e7607a2ad88479175
@@@ -79,9 -85,10 +85,10 @@@ namespace bbvt
     {   
       polydatamapper = vtkPolyDataMapper::New();
       vtkactor       = vtkActor::New();
 -
  //     polydatamapper->SetInput(marchingcubes->GetOutput());
       vtkactor->SetMapper(polydatamapper);
 +//EED 2020-04-21 vtk8 deprecated
  //     polydatamapper->ImmediateModeRenderingOn();
     }