#3332 creaContours Bug New - Manual Paint UnDo ReDo with vtk update (working)

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / ManualPaintControler.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp
index b79b32df9ad3ee571e94c49dcfd9f6ec2551b122..4674d2d7d98a8abf257e16267ad5127c6506b64d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp
@@ -23,52 +23,63 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <wxMPRBaseData.h>
+
 #include "ManualPaintControler.h"
 #include "vtkInteractorManualPaint.h"
 #include "vtkImageActor.h"
 
 //---------------------------------------------------------------------------
-ManualPaintControler::ManualPaintControler() {
-       auxZ = 0;
-       _wxvtk2Dbaseview = NULL;
+ManualPaintControler::ManualPaintControler() 
+{
+       auxZ                            = 0;
+       _wxvtk2Dbaseview        = NULL;
 }
 
 //---------------------------------------------------------------------------
-ManualPaintControler::~ManualPaintControler() {
+ManualPaintControler::~ManualPaintControler() 
+{
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::SetManualPaintModel(
-               ManualPaintModel* manualPaintModel) {
-       _manualPaintModel = manualPaintModel;
+void ManualPaintControler::SetManualPaintModel( ManualPaintModel* manualPaintModel ) 
+{
+       _manualPaintModel       = manualPaintModel;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::SetManualPaintPanel(
-               ManualPaintPanel* manualPaintPanel) {
-       _manualPaintPanel = manualPaintPanel;
+ManualPaintModel* ManualPaintControler::GetManualPaintModel( ) 
+{
+       return _manualPaintModel;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::SetWxVtk2DBaseView(
-               wxVtk2DBaseView *wxvtk2Dbaseview) {
-       _wxvtk2Dbaseview = wxvtk2Dbaseview;
+//void ManualPaintControler::SetManualPaintPanel( ManualPaintPanel* manualPaintPanel ) 
+//{
+//     _manualPaintPanel       = manualPaintPanel;
+//}
+
+//---------------------------------------------------------------------------
+void ManualPaintControler::SetWxVtk2DBaseView( wxVtk2DBaseView *wxvtk2Dbaseview )
+{
+       _wxvtk2Dbaseview        = wxvtk2Dbaseview;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::Config() {
-       if (_wxvtk2Dbaseview != NULL) {
-               vtkInteractorStyleBaseView *isbv =
-                               (vtkInteractorStyleBaseView*) (_wxvtk2Dbaseview->GetInteractorStyleBaseView());
+void ManualPaintControler::Config() 
+{
+       if (_wxvtk2Dbaseview != NULL) 
+       {
+               vtkInteractorStyleBaseView *isbv = (vtkInteractorStyleBaseView*) (_wxvtk2Dbaseview->GetInteractorStyleBaseView());
                isbv->AddInteractorStyleMaracas(new vtkInteractorManualPaint(this));
-       }
+       } // if _wxvtk2Dbaseview
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::PaintImage(int px, int py, int pz) {
+void ManualPaintControler::PaintImage(int px, int py, int pz) 
+{
        _manualPaintModel->SetDirection(_wxvtk2Dbaseview->GetDirection());
        _manualPaintModel->PaintImage(px, py, pz);
-
        // The refresh mechanisme is made in the vtkInteractorManualPaint
        //    RefreshView();
 }
@@ -78,3 +89,42 @@ void ManualPaintControler::SetImageUndo()
 {
        _manualPaintModel->SetUndoImage();
 }
+
+
+
+//---------------------------------------------------------------------------
+void ManualPaintControler::Undo()
+{
+       _manualPaintModel->Undo();
+       Refresh();
+}
+
+void ManualPaintControler::Redo()
+{
+       _manualPaintModel->Redo();
+       Refresh();
+}
+
+
+void ManualPaintControler::Refresh()
+{
+       if (_wxvtk2Dbaseview!=NULL)
+       {
+               vtkMPRBaseData* vtkmprbasedata = (vtkMPRBaseData*) (_wxvtk2Dbaseview->GetVtkBaseData());
+//             if (bbGetInputPoint().size()==3)
+//             {
+//                     vtkmprbasedata->SetX( bbGetInputPoint()[0] );
+//                     vtkmprbasedata->SetY( bbGetInputPoint()[1] );
+//                     vtkmprbasedata->SetZ( bbGetInputPoint()[2] );
+                       wxCommandEvent newevent(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+                       _wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor ()->GetParent()->ProcessEvent( newevent );
+#else
+                       _wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor ()->GetParent()->ProcessWindowEvent( newevent );
+#endif                         
+//             } // if Position
+       } // _wxvtk2Dbaseview
+}
+
+