From d37b5379345cb4c29e10caf62b4d881bd84bf929 Mon Sep 17 00:00:00 2001
From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Thu, 21 Jan 2010 13:54:13 +0000
Subject: [PATCH] *** empty log message ***
---
bbtk/src/bbmaracasvisuViewerNV.cxx | 46 ++++++-
bbtk/src/bbmaracasvisuViewerNV.h | 13 +-
.../widgets/wxMaracasSurfaceRendering.cxx | 8 +-
.../widgets/wxMaracasSurfaceRendering.h | 6 +-
.../wxMaracasSurfaceRenderingManager.cxx | 7 +-
.../wxMaracasSurfaceRenderingManager.h | 6 +-
...xMaracasSurfaceRenderingManagerDataMhd.cxx | 8 +-
.../wxMaracasSurfaceRenderingProp3D.cxx | 15 ++-
.../widgets/wxMaracas_ViewerWidget.cxx | 114 +++++++-----------
.../widgets/wxMaracas_ViewerWidget.h | 8 +-
10 files changed, 133 insertions(+), 98 deletions(-)
diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 48b69e5..fa98991 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -62,7 +62,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
void ViewerNV::Process()
{
- vtkImageData* img = bbGetInputIn();
+ vtkImageData* img = bbGetInputIn();
/*
double spc[3];
img->GetSpacing(spc);
@@ -86,7 +86,7 @@ void ViewerNV::Process()
mwxwidget->SetType(&type);
mwxwidget->UpdateLayout(img);
}else if (img != currentimg){
- mwxwidget->SetImage(img);
+ mwxwidget->SetImage(img);
//mwxwidget->UpdateLayout(img);
}
@@ -121,7 +121,9 @@ void ViewerNV::Process()
if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
- if (wvbv1!=NULL) { bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() ); }
+ if (wvbv1!=NULL) { bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() );
+ updateObservers();
+ }
if(bbGetInputColorFunction()!=NULL){
mwxwidget->setColorTransferFunction(bbGetInputColorFunction());
@@ -140,6 +142,7 @@ void ViewerNV::Process()
}
}
+
}// mwxwidget != NULL
}
@@ -164,6 +167,12 @@ void ViewerNV::bbUserSetDefaultValues()
mwxwidget = NULL;
bbSetInputIn(NULL);
+ bbSetInputObs1(NULL);
+ bbSetInputObs2(NULL);
+ bbSetInputObs3(NULL);
+ bbSetInputObs4(NULL);
+ bbSetInputObs5(NULL);
+
std::vector<int> vecNTypeViwer;
vecNTypeViwer.push_back(5);
vecNTypeViwer.push_back(0);
@@ -217,6 +226,37 @@ bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype
}
+void ViewerNV::updateObservers(){
+ vtkRenderWindowInteractor* interactor;
+ interactor = bbGetOutputInteractor1();
+ if(interactor){
+ if (bbGetInputObs1()!=NULL){
+ bbGetInputObs1()->SetInteractor(interactor);
+ bbGetInputObs1()->EnabledOn();
+ }
+ if (bbGetInputObs2()!=NULL)
+ {
+ bbGetInputObs2()->SetInteractor(interactor);
+ bbGetInputObs2()->EnabledOn();
+ }
+ if (bbGetInputObs3()!=NULL)
+ {
+ bbGetInputObs3()->SetInteractor(interactor);
+ bbGetInputObs3()->EnabledOn();
+ }
+ if (bbGetInputObs4()!=NULL)
+ {
+ bbGetInputObs4()->SetInteractor(interactor);
+ bbGetInputObs4()->EnabledOn();
+ }
+ if (bbGetInputObs5()!=NULL)
+ {
+ bbGetInputObs5()->SetInteractor(interactor);
+ bbGetInputObs5()->EnabledOn();
+ }
+ }
+}
+
}
// EO namespace bbcreaMaracasVisu
diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h
index 58958b4..7217627 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.h
+++ b/bbtk/src/bbmaracasvisuViewerNV.h
@@ -48,7 +48,12 @@ class /*BBTK_EXPORT*/ ViewerNV
BBTK_DECLARE_INPUT(nTypeView, std::vector<int> );
BBTK_DECLARE_INPUT(ColorFunction, vtkColorTransferFunction* );
BBTK_DECLARE_INPUT(WindowLevel, int );
- BBTK_DECLARE_INPUT(ColorLevel, int );
+ BBTK_DECLARE_INPUT(ColorLevel, int );
+ BBTK_DECLARE_INPUT(Obs1, vtkInteractorObserver *);
+ BBTK_DECLARE_INPUT(Obs2, vtkInteractorObserver *);
+ BBTK_DECLARE_INPUT(Obs3, vtkInteractorObserver *);
+ BBTK_DECLARE_INPUT(Obs4, vtkInteractorObserver *);
+ BBTK_DECLARE_INPUT(Obs5, vtkInteractorObserver *);
BBTK_DECLARE_OUTPUT(wxVtkBaseView1,wxVtkBaseView*);
BBTK_DECLARE_OUTPUT(wxVtkBaseView2,wxVtkBaseView*);
BBTK_DECLARE_OUTPUT(wxVtkBaseView3,wxVtkBaseView*);
@@ -73,6 +78,7 @@ private:
wxMaracas_N_ViewersWidget *mwxwidget;
bool compareVectors(std::vector<int> type,std::vector<int> currenttype);
+ void updateObservers();
};
BBTK_BEGIN_DESCRIBE_BLACK_BOX(ViewerNV,bbtk::WxBlackBox);
@@ -86,6 +92,11 @@ BBTK_DESCRIPTION("Viewer : N view configuration 2D and 3D");
BBTK_INPUT(ViewerNV,ColorFunction,"Optional: set a different color for the viewers 2D",vtkColorTransferFunction*,"");
BBTK_INPUT(ViewerNV,WindowLevel,"Optional: set a different Window level by using an other widget",int,"");
BBTK_INPUT(ViewerNV,ColorLevel,"Optional: set a different Color level by using an other widget",int,"");
+ BBTK_INPUT(ViewerNV,Obs1,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
+ BBTK_INPUT(ViewerNV,Obs2,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
+ BBTK_INPUT(ViewerNV,Obs3,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
+ BBTK_INPUT(ViewerNV,Obs4,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
+ BBTK_INPUT(ViewerNV,Obs5,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
BBTK_OUTPUT(ViewerNV,wxVtkBaseView1,"wxVtkBaseView 1",wxVtkBaseView *,"");
BBTK_OUTPUT(ViewerNV,wxVtkBaseView2,"wxVtkBaseView 2",wxVtkBaseView *,"");
BBTK_OUTPUT(ViewerNV,wxVtkBaseView3,"wxVtkBaseView 3",wxVtkBaseView *,"");
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
index 4e63760..57beff0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
@@ -3,8 +3,8 @@
Program: wxMaracas
Module: $RCSfile: wxMaracasSurfaceRendering.cxx,v $
Language: C++
- Date: $Date: 2010/01/13 13:53:55 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2010/01/21 13:54:15 $
+ Version: $Revision: 1.11 $
Copyright: (c) 2002, 2003
License:
@@ -240,6 +240,10 @@ void wxMaracasSurfaceRendering::deleteActor(int propid){
}
}
+bool wxMaracasSurfaceRendering::interactorSet(){
+ return surrendmanager->interactorSet();
+}
+
/**
**
**/
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
index b4fc5b5..5a7de05 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
@@ -3,8 +3,8 @@
Program: wxMaracas
Module: $RCSfile: wxMaracasSurfaceRendering.h,v $
Language: C++
- Date: $Date: 2009/11/13 11:47:41 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2010/01/21 13:54:15 $
+ Version: $Revision: 1.4 $
Copyright: (c) 2002, 2003
License:
@@ -70,6 +70,8 @@ public:
std::string getPath();
void deleteActor(int propid);
+
+ bool interactorSet();
private:
static wxMaracasSurfaceRendering* instance;
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx
index 53b81d4..e43f19e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx
@@ -3,8 +3,8 @@
Program: wxMaracas
Module: $RCSfile: wxMaracasSurfaceRenderingManager.cxx,v $
Language: C++
- Date: $Date: 2009/11/17 10:24:35 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2010/01/21 13:54:15 $
+ Version: $Revision: 1.7 $
Copyright: (c) 2002, 2003
License:
@@ -266,3 +266,6 @@ void wxMaracasSurfaceRenderingManager::Transform(vtkMatrix4x4* tmatrix){
}
+bool wxMaracasSurfaceRenderingManager::interactorSet(){
+ return _interactor? true:false;
+}
\ No newline at end of file
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h
index fe1ac98..916b785 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h
@@ -3,8 +3,8 @@
Program: wxMaracas
Module: $RCSfile: wxMaracasSurfaceRenderingManager.h,v $
Language: C++
- Date: $Date: 2009/11/17 10:23:24 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2010/01/21 13:54:15 $
+ Version: $Revision: 1.5 $
Copyright: (c) 2002, 2003
License:
@@ -120,6 +120,8 @@ public:
void deleteActor(int propid)throw (char *);
void Transform(vtkMatrix4x4* tmatrix);
+
+ bool interactorSet();
private:
std::vector<wxMaracasSurfaceRenderingManagerData*> prop3Dvect;
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
index 2c6a6cd..58a5db3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
@@ -35,10 +35,7 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd
_boxWidgetS1->SetInput( this->_imagedata );
_boxWidgetS1->PlaceWidget();
- boxSurfaceObserver* observer = boxSurfaceObserver::New();
-
- _boxWidgetS1->HandlesOn ();
- _boxWidgetS1->On();
+ boxSurfaceObserver* observer = boxSurfaceObserver::New();
vtkStripper* striper = vtkStripper::New();
striper->SetInput( _cleanFilter->GetOutput() );
@@ -71,7 +68,8 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd
_boxWidgetS1->AddObserver( vtkCommand::InteractionEvent , observer );
-
+ _boxWidgetS1->HandlesOn ();
+ _boxWidgetS1->On();
}else{
_dataMapper->SetInput(_cleanFilter->GetOutput());
}
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
index 57dc298..fb2f9b0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
@@ -55,12 +55,15 @@ void wxMaracasSurfaceRenderingProp3D::createControls(){
Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxChange);
checkbox->SetValue(true);
checkboxsizer->Add(checkbox,wxFIXED_MINSIZE);
- /*
- checkboxsurface = new wxCheckBox(this,-1,wxString(_T("Surface Box")));
- Connect(checkboxsurface->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxSurfaceChange);
- checkboxsurface->SetValue(true);
- checkboxsizer->Add(checkboxsurface,wxFIXED_MINSIZE);
- */
+
+
+ if(wxMaracasSurfaceRendering::getInstance()->interactorSet()){
+ checkboxsurface = new wxCheckBox(this,-1,wxString(_T("Surface Box")));
+ Connect(checkboxsurface->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxSurfaceChange);
+ checkboxsurface->SetValue(true);
+ checkboxsizer->Add(checkboxsurface,wxFIXED_MINSIZE);
+ }
+
sizersurfprop->Add(checkboxsizer,wxFIXED_MINSIZE);
}
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 86642ee..6f6cbcf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
Program: wxMaracas
Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $
Language: C++
- Date: $Date: 2009/12/01 21:22:12 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2010/01/21 13:54:15 $
+ Version: $Revision: 1.22 $
Copyright: (c) 2002, 2003
License:
@@ -34,7 +34,15 @@
: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
{
wxPanel *panel = this;
- wxWindow *wxwindow = NULL;
+ wxWindow *wxwindow = NULL, *window3D = 0;
+ double xSpacing, ySpacing, zSpacing;
+ int xMin, xMax, yMin, yMax, zMin, zMax;
+ wxSplitterWindow *panelClipping3D = 0;
+ wxPanel *panelControl = 0, *controlPanelMPR3D = 0, *controlPanelClipping3D = 0;
+ wxFlexGridSizer *sizerCtrol = 0;
+ vtkCellPicker* picker = 0;
+ wxBoxSizer *sizer = 0;
+
mType = type;
@@ -69,31 +77,22 @@
mvtk2Dbaseview = new wxVtk2DBaseView(panel);
mvtk2Dbaseview->SetVtkBaseData(mvtkmprbasedata);
wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
- }
-
-
- if (type==0)
+ }else if (type==0)
{
mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2);
mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata);
wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor();
- }
- if (type==1)
+ }else if (type==1)
{
mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0);
mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata);
wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
- }
-
- if (type==2)
+ }else if (type==2)
{
mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1);
mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata);
wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor();
- }
-
-
- if (type==3)
+ }else if (type==3)
{
mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel);
mvtkplane2Dview = new vtkPlane2DView( mwidgetMesure->GetWindow2());
@@ -101,17 +100,13 @@
mvtkplane2Dview -> SetImgSize( 200 );
mvtkplane2Dview -> SetVtkBaseData(mvtkmprbasedata);
wxwindow = mwidgetMesure;
- }
- if (type==4)
+ }else if (type==4)
{
mwxsphereview = new wxSphereView( panel , mvtkmprbasedata, mvtkmprbasedata->GetImageData() );
wxwindow=mwxsphereview->GetWxVTKRenderWindowInteractor();
- }
-
-
- if (type==5)
+ }else if (type==5)
{
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
+ panelClipping3D = new wxSplitterWindow( panel , -1);
mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D);
@@ -126,15 +121,15 @@
vtkmpr3Ddataviewer->Configure();
mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+ window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- wxPanel *panelControl = new wxPanel(panelClipping3D,-1);
- wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
- wxPanel *controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl);
+ panelControl = new wxPanel(panelClipping3D,-1);
+ controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
+ controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl);
// mbtnCutImageData = new wxCheckBox(panelControl,-1,_T("Cut Module"));
// Connect(_btnCutImageData->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxMPRWidget::OnCutImagaData );
- wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1);
+ sizerCtrol = new wxFlexGridSizer(1);
sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2);
sizerCtrol->Add(controlPanelClipping3D , 1, wxALL|wxEXPAND, 2);
// sizerCtrol->Add( mbtnCutImageData , 1, wxALL, 2);
@@ -146,11 +141,9 @@
panelClipping3D -> SetMinimumPaneSize( 5 );
panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 );
wxwindow=panelClipping3D;
- }
-
- if (type==6)
+ }else if (type==6)
{
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
+ panelClipping3D = new wxSplitterWindow( panel , -1);
mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
@@ -158,6 +151,7 @@
vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
+
wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
@@ -182,48 +176,17 @@
mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
- }
-
- if (type==7)
- {
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel );
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- wxwindow=window3D;
-
-/*Borrame
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- panelClipping3D ->SetMinimumPaneSize( 5 );
- panelClipping3D ->SplitHorizontally( new wxPanel(panelClipping3D,-1) , window3D , 10 );
- wxwindow=panelClipping3D;
-*/
+ }else if (type==7)
+ {
+
+ mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel );
+ wxwindow = (wxWindow*) mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+
-/*Borrame
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
- mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
- vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- wxPanel *panelControl = new wxPanel(panelClipping3D,-1);
- wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl);
- wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1);
- sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2);
- panelControl->SetAutoLayout(true);
- panelControl->SetSizer(sizerCtrol);
- panelControl->SetSize(400,350);
- panelControl->Layout();
- panelClipping3D -> SetMinimumPaneSize( 5 );
- panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 );
- wxwindow=panelClipping3D;
- vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
- //vtkmpr3Ddataviewer->Configure();
- mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
-*/
}
- wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+ sizer = new wxBoxSizer(wxVERTICAL);
sizer->Add( wxwindow , 1, wxGROW);
panel->SetSizer(sizer);
panel->SetAutoLayout(true);
@@ -259,6 +222,7 @@
//------------------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------
+
void wxMaracas_ViewerWidget::ConfigureVTK()
{
@@ -321,7 +285,9 @@
if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetMesureScale( 1 ); }
if ( mwxsphereview !=NULL ) { mwxsphereview -> Configure(); }
- if (mwxvtk3Dbaseview_Clipping3D !=NULL) { mwxvtk3Dbaseview_Clipping3D -> Configure();
+ if (mwxvtk3Dbaseview_Clipping3D !=NULL) {
+ mwxvtk3Dbaseview_Clipping3D -> Configure();
+
}
if (vtkmpr3Ddataviewer !=NULL) {
@@ -339,6 +305,10 @@
if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview -> Configure(); }
+
+
+
+
//if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();}
@@ -492,4 +462,6 @@
mwxvtkmpr3Dview->setColorLevel(level);
}*/
}
+
+
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
index e45edd4..9a07691 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
@@ -3,8 +3,8 @@
Program: wxMaracas
Module: $RCSfile: wxMaracas_ViewerWidget.h,v $
Language: C++
- Date: $Date: 2009/09/15 11:25:07 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2010/01/21 13:54:15 $
+ Version: $Revision: 1.9 $
Copyright: (c) 2002, 2003
License:
@@ -24,6 +24,7 @@
// For compilers that support precompilation, includes <wx/wx.h>.
// -----------------------------------------------------------------------------------------------------------
#include <wx/wxprec.h>
+
#ifdef __BORLANDC__
#pragma hdrstop
#endif
@@ -100,8 +101,7 @@
wxVtkMPR3DView *mwxvtkmpr3Dview;
- vtkMPR3DDataViewer *vtkmpr3Ddataviewer;
-
+ vtkMPR3DDataViewer *vtkmpr3Ddataviewer;
};
--
2.49.0