#3393 ResetCamera MainFrame_tool box

diff --git a/bbtk/src/bbcreaContoursSetColorLayerImage.cxx b/bbtk/src/bbcreaContoursSetColorLayerImage.cxx
index 430ac4ffd577a3e34e541e26debf8d7af7a6b751..6929135cfe19b91cd63758ae98cc882c1df700af 100644 (file)
--- a/bbtk/src/bbcreaContoursSetColorLayerImage.cxx
+++ b/bbtk/src/bbcreaContoursSetColorLayerImage.cxx
@@ -33,11 +33,11 @@ void SetColorLayerImage::Process()
  
        if (wxContourMainFrame::getInstance()!=NULL)
        { 
-               if (bbGetInputIn()!=NULL) 
-               {
+//             if (bbGetInputIn()!=NULL)
+//             {
                        wxContourMainFrame *wxcontourmainframe=wxContourMainFrame::getInstance();
                        wxcontourmainframe->SetColorLayerImage( bbGetInputIn() );
-               } // InputIn
+//             } // InputIn
        } // if Instance
 }
 

diff --git a/bbtk/src/bbcreaContourswxContourMainFrame_tool.cxx b/bbtk/src/bbcreaContourswxContourMainFrame_tool.cxx
index 5fe2ff8aa4f68bf676951d6f668500ac49350bee..3dfe221f80e378ea9ff2739b362bf1d7f22cbbf9 100644 (file)
--- a/bbtk/src/bbcreaContourswxContourMainFrame_tool.cxx
+++ b/bbtk/src/bbcreaContourswxContourMainFrame_tool.cxx
@@ -85,8 +85,13 @@ void wxContourMainFrame_tool::Process()
                     printf("BBTK warnning!!  wxContourMainFrame_tool box. In Type=1 the Param1 es not complite \n");
                 }// size
             }  // if Image
-        } // Type==1
-    }
+        } // Type==2
+        
+        if (bbGetInputType()==3)
+        {
+            wxContourMainFrame::getInstance()->ResetCamera();
+        } // Type 3
+    } // if wxContourMainFrame::getInstance()!=NULL
     
 }
 //===== 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index f96388051794429e416dae9a68e83de7d96a0cf0..34b3d151211ee2cf5ad65949fb9e7a0c4578811b 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -3426,5 +3426,9 @@ wxVtkBaseView* wxContourMainFrame::GetWxVtkBaseView()
        }
 }
 
+void wxContourMainFrame::ResetCamera()
+{
+    GetWxVtkBaseView()->GetRenderer()->ResetCamera();
+}
 
 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 8ae15725ca5794ad86377b26e343062a75f6b32f..7d6bc02239c86aaff95eb781777a456e97d84c07 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -330,6 +330,10 @@ class wxContourMainFrame : public wxPanel {
 
 //------------------------------------------------------------------------------------------------------------
        void SetXY(int x,int y);
+    
+    //------------------------------------------------------------------------------------------------------------
+    void                        ResetCamera();
+
 
 private:
        //------------------------------------------------------------------------------------------------------------
@@ -415,7 +419,7 @@ private:
 //------------------------------------------------------------------------------------------------------------
 
        wxFrame                                         *_frameShowResultImages;
-
+    
 };
 
 #endif