+++ /dev/null
-/*=========================================================================
-
- Program: wxMaracas
- Module: $RCSfile: CutModel2Manager.cxx,v $
- Language: C++
- Date: $Date: 2009/12/08 13:42:39 $
- Version: $Revision: 1.4 $
-
- Copyright: (c) 2002, 2003
- License:
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-#include "CutModel2Manager.h"
-
-/**
-** Start of the manager class
-**/
-CutModel2Manager::CutModel2Manager(std::string path){
- _path = path;
- _img = NULL;
- _img2 = NULL;
- _interactor = NULL;
- _render = NULL;
- _currentaction=0;
-}
-CutModel2Manager::~CutModel2Manager(){
- std::string files = _path;
- files+="/infounrd_0_fig_0.info";
- remove(files.c_str());
- _vectordata.clear();
- _img = NULL;
- _img2 = NULL;
- _interactor = NULL;
- _render = NULL;
-}
-
-
-void CutModel2Manager::setImageData(vtkImageData* img){
- _img = img;
- if(_img2!=NULL){
- _img2->Delete();
- }
- _img2 = vtkImageData::New();
- _img2->SetExtent(_img->GetExtent());
- _img2->SetSpacing(_img->GetSpacing());
- _img2->AllocateScalars();
-
- _img2->DeepCopy(_img);
-
-}
-
-void CutModel2Manager::setInteractor(vtkRenderWindowInteractor* interactor){
- _interactor = interactor;
-}
-
-void CutModel2Manager::setRenderer(vtkRenderer* renderer){
- _render = renderer;
-}
-
-void CutModel2Manager::onAddCutModel2(int id, vtkCommand* observer) throw( CutModelException){
- checkInvariant();
-
- CutModelData* data = new CutModelData(id,_interactor, observer, _img2);
- _vectordata.push_back(data);
-
- _render->AddActor(data->getActor());
-
- //_render->UpdateCamera();
- _render->Render();
-}
-
-void CutModel2Manager::checkInvariant() throw( CutModelException){
- if(_img==NULL){
- throw CutModelException("The image is not set");
- }
- if(_img2==NULL){
- throw CutModelException("The copyimage is not set");
- }
- if(_interactor==NULL){
- throw CutModelException("Interactor not set");
- }
- if(_render==NULL){
- throw CutModelException("Render not set");
- }
-}
-
-double* CutModel2Manager::getImageRange()throw( CutModelException){
- checkInvariant();
- return _img2->GetScalarRange();
-}
-
-void CutModel2Manager::changeOpacity(int id,int opacity)throw( CutModelException){
- checkInvariant();
- CutModelData* current = getCutModelData(id);
- current->changeOpacity(opacity);
-}
-
-void CutModel2Manager::ShowViewBox(int id,bool check)throw( CutModelException){
- checkInvariant();
- CutModelData* current = getCutModelData(id);
- current->ShowViewBox(check);
-}
-
-void CutModel2Manager::ChangeShape(int id,int selection)throw( CutModelException){
- checkInvariant();
- CutModelData* current = getCutModelData(id);
- current->ChangeShape(selection);
- _render->Render();
-}
-
-CutModelData* CutModel2Manager::getCutModelData(int id)throw( CutModelException){
-
- CutModelData* current = NULL;
- for(int i= 0; i < _vectordata.size();i++){
- std::cout<<"id in CutModel2Manager:: "<<id<<std::endl;
- std::cout<<"vectordataid in CutModel2Manager:: "<<_vectordata[i]->getId()<<std::endl;
-
- if(_vectordata[i]->getId()==id){
- current = _vectordata[i];
- }
- }
- if(current ==NULL){
-
- throw CutModelException("Data not found");
- }
- return current;
-}
-
-void CutModel2Manager::updateActorDirection(int id)throw( CutModelException){
- checkInvariant();
- CutModelData* current = getCutModelData(id);
- current->udapteActorDirection();
-
-}
-
-void CutModel2Manager::changeColor(int id,double r,double g,double b)throw( CutModelException){
-
- checkInvariant();
- CutModelData* current = getCutModelData(id);
- current->changeColor(r,g,b);
- _render->Render();
-}
-void CutModel2Manager::RemoveActor(int id)throw( CutModelException){
-
- checkInvariant();
-
- CutModelData* current = getCutModelData(id);
- for(int i = 0; i < _vectordata.size()-1;i++){
- if(_vectordata[i]->getId()==id){
- for(int j = i; j < _vectordata.size()-1;j++){
- _vectordata[j]=_vectordata[j+1];
- }
- i = _vectordata.size();
- }
- }
- _render->RemoveActor(current->getActor());
- delete current;
- _vectordata.pop_back();
- _render->Render();
-
-}
-
-void CutModel2Manager::ExecuteCut(int id, double* range, bool isinside)throw( CutModelException){
- checkInvariant();
-
- CutModelData* current = getCutModelData(id);
- current->ExecuteCut(range, isinside, _img);
-
-
- /*
- Setting extra information for the undo
- */
- CutModelSaveBinInfo* undoaction = this->AddActionUndo(id, CUTMODEL_CUT);
- undoaction->setRange(range);
- undoaction->setIsInside(isinside);
-
-}
-
-vtkImageData* CutModel2Manager::GetResultImage(){
- checkInvariant();
- return _img2;
-}
-
-void CutModel2Manager::RefreshActor(int id){
- checkInvariant();
- CutModelData* current = getCutModelData(id);
- _render->RemoveActor(current->getActor());
- _render->AddActor(current->getActor());
- current->RefreshViewBox();
- _render->Render();
-}
-
-void CutModel2Manager::SaveCutModelData(std::string filename)throw( CutModelException){
-
-
- throw CutModelException("not implemented");
-
-
-
-
-}
-
-
-
-void CutModel2Manager::LoadCutModelData(std::string filename)throw( CutModelException){
-
- throw CutModelException("not implemented");
-
-}
-
-CutModelSaveBinInfo* CutModel2Manager::AddActionUndo(int idc, UNDOTYPE type)throw( CutModelException){
-
- for(int i = _undoredo.size()-1; i > _currentaction;i--){
- delete _undoredo[i];
- _undoredo.pop_back();
- }
-
- CutModelSaveBinInfo* cutmodel = new CutModelSaveBinInfo(idc, _currentaction, type, _path);
- if(type == CUTMODEL_CUT){
- cutmodel->saveMatrix4x4(this->getCutModelData(idc)->getCurrentMatrix()->GetMatrix());
- cutmodel->setCurrentShape(this->getCutModelData(idc)->getCurrentShape());
- }
-
- _undoredo.push_back(cutmodel);
-
- _currentaction++;// = _undoredo.size();
- //std::cout<<"current index "<<_currentaction;
-
- return cutmodel;
-}
-
-int CutModel2Manager::Undo() throw( CutModelException){
- //&& _currentaction < _undoredo.size()
- if(_currentaction > 0){
- int tempaction = _currentaction-1;
- CutModelSaveBinInfo* currentundo = _undoredo[tempaction];
- CutModelData* currentmodel;
-
- if(currentundo->getActionType()==CUTMODEL_CUT){
- //Undo the cut
- vtkTransform* transform = currentundo->getTransformFromMatrixFile();
-
- currentmodel = getCutModelData(currentundo->getId());
-
- currentmodel->setTransform(transform, _img);
-
- currentmodel->setCurrentShape(currentundo->getCurrentShape());
-
- currentmodel->ExecuteUnCut(currentundo->getIsInside(), _img2, _img);
-
- }
- //Every thing ok
- _currentaction--;
- return 0;
- }
- return -1;
-}
-
-int CutModel2Manager::Redo() throw( CutModelException){
-
- if(_currentaction >= 0 && _currentaction < _undoredo.size()){
-
-
- CutModelSaveBinInfo* currentundo = _undoredo[_currentaction];
- CutModelData* currentmodel;
-
- if(currentundo->getActionType()==CUTMODEL_CUT){
- //Redo the cut
- vtkTransform* transform = currentundo->getTransformFromMatrixFile();
- currentmodel = getCutModelData(currentundo->getId());
- currentmodel->setTransform(transform, _img2);
- currentmodel->setCurrentShape(currentundo->getCurrentShape());
- currentmodel->ExecuteCut(currentundo->getRange(), currentundo->getIsInside(), _img2);
- }
-
- _currentaction++;
-
- return 0;
- }
- return -1;
-}
\ No newline at end of file
+++ /dev/null
-/*=========================================================================
-
- Program: wxMaracas
- Module: $RCSfile: CutModel2Manager.h,v $
- Language: C++
- Date: $Date: 2009/12/08 13:42:39 $
- Version: $Revision: 1.4 $
-
- Copyright: (c) 2002, 2003
- License:
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-
-
-
-
-#ifndef __CutModel2ManagerH__
-#define __CutModel2ManagerH__
-
-#include <iostream>
-#include <stdio.h>
-#include <vector>
-
-#include "vtkImageData.h"
-#include "vtkRenderWindowInteractor.h"
-#include "vtkRenderer.h"
-#include <vtkPolyDataWriter.h>
-
-#include "CutModelException.h"
-#include "CutModelData.h"
-#include "CutModelSaveBinInfo.h"
-
-
-
-class CutModel2Manager {
-
-public:
- CutModel2Manager(std::string path);
- ~CutModel2Manager();
-
- void setImageData(vtkImageData* img);
-
- void setInteractor(vtkRenderWindowInteractor* interactor);
-
- void setRenderer(vtkRenderer* renderer);
-
- void onAddCutModel2(int id, vtkCommand* observer) throw( CutModelException);
-
- double* getImageRange()throw( CutModelException);
-
- void changeOpacity(int id,int opacity)throw( CutModelException);
-
- void ShowViewBox(int id,bool check)throw( CutModelException);
-
- void ChangeShape(int id,int selection)throw( CutModelException);
-
- void changeColor(int id,double r,double g,double b)throw( CutModelException);
-
- void updateActorDirection(int id)throw( CutModelException);
-
- void RemoveActor(int id)throw( CutModelException);
-
- void ExecuteCut(int id, double* range, bool isinside)throw( CutModelException);
-
- vtkImageData* GetResultImage();
-
- void RefreshActor(int id);
-
- void SaveCutModelData(std::string filename)throw( CutModelException);
-
- void LoadCutModelData(std::string filename)throw( CutModelException);
-
- CutModelSaveBinInfo* AddActionUndo(int id, UNDOTYPE type)throw( CutModelException);
-
- int Undo()throw( CutModelException);
-
- int Redo()throw( CutModelException);
-private:
-
- int _currentaction;
-
- void checkInvariant() throw( CutModelException);
- std::string _path;
- vtkImageData* _img;
- vtkImageData* _img2;
- vtkRenderer* _render;
- vtkRenderWindowInteractor* _interactor;
-
- std::vector<CutModelData*> _vectordata;
- std::vector<CutModelSaveBinInfo*> _undoredo;
- CutModelData* getCutModelData(int id)throw( CutModelException);
-
-};
-
-#endif
{
_parent_refresh_waiting = false;
wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//CPR 13/01/2010
this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
- }
- }
+ int i;
+ int size = _lstParentToReport.size();
+ for(i = 0; i<size; i++)
+ {
+ _lstParentToReport[i]->ProcessEvent(newevent1);
+ }//for
+ }//if
+ }//if _blockRefresh
}
//---------------------------------------------------------------------------
void vtkInteractorStyleBaseView::BlockRefresh()
_blockRefresh=false;
}
+wxEvtHandler* vtkInteractorStyleBaseView::GetParentToReport(int i)
+{
+ wxEvtHandler* parentToReport = NULL;
+ if(i>=0 && i<_lstParentToReport.size())
+ {
+ parentToReport = _lstParentToReport[i];
+ }
+ return parentToReport;
+
+}
+
+void vtkInteractorStyleBaseView::AddParentToReport(wxEvtHandler* parentToReport)
+{
+ _lstParentToReport.push_back(parentToReport);
+}
#include "wxVtkBaseView.h"
+#include <vector>
//class InteractorStyleMaracas;
void SetRefresh_waiting();
void SetParent_refresh_waiting();
+ void AddParentToReport(wxEvtHandler* parentToReport);
bool GetRefresh_waiting();
bool GetParent_refresh_waiting();
-
+ wxEvtHandler* GetParentToReport(int i);
void EvaluateToRefresh();
void BlockRefresh();
std::vector< InteractorStyleMaracas* > _lstInteractorStyleMaracas;
private:
- bool _blockRefresh;
- bool _refresh_waiting;
- bool _parent_refresh_waiting;
- wxVtkBaseView *_wxvtkbaseview;
+ bool _blockRefresh;
+ bool _refresh_waiting;
+ bool _parent_refresh_waiting;
+ wxVtkBaseView *_wxvtkbaseview;
+ std::vector<wxEvtHandler*> _lstParentToReport;
};
#endif /*VTKINTERACTORSTYLEBASEVIEW_H_*/
#include "wxMaracasDialog_NViewers.h"
//#include <wx/frame.h>
#include <wx/sizer.h>
-
+#include <wx/splitter.h>
+#include "creaSystem.h"
BEGIN_EVENT_TABLE( wxMaracasDialog_NViewers, wxFrame )
EVT_MENU( 12121, wxMaracasDialog_NViewers::OnRefreshView )
** Class constructor
**/
wxMaracasDialog_NViewers::wxMaracasDialog_NViewers(wxWindow* parent, vtkImageData* img, std::vector<int>* type, wxString title)
-: wxFrame(parent, -1, title)
+//: wxFrame(parent, -1, title)
+: wxFrame(NULL, -1, title, wxDefaultPosition,wxSize(700,700))
{
- panelcut = new wxPanel(this, -1);
- panelcut->SetSize(800, 700);
- viewer = new wxMaracas_N_ViewersWidget(panelcut, img, type);
- sizer = new wxFlexGridSizer(2, 1);
- sizer->Add(viewer, wxGROW, 1);
- panelcut->SetSizer( sizer, true );
- panelcut->SetAutoLayout( true );
- //viewer->SetSize(wxSizer(wxALL|wxEXPAND));
+ wxSplitterWindow *splitpanel = new wxSplitterWindow(this, -1);
+ splitpanel->SetMinimumPaneSize(5);
+
+ viewer = new wxMaracas_N_ViewersWidget(splitpanel, img, type);
+
+ std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
+ cutter = CutModelMainPanel::getInstance(splitpanel, path);
+ cutter->setRenderer( viewer->GetwxVtkBaseView(1)->GetRenderer() );
+ cutter->setInteractor( viewer->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
+ cutter->setImageData(img);
+
+ splitpanel->SplitVertically( cutter, viewer, 50);
+
}
/**
wxMaracasDialog_NViewers::~wxMaracasDialog_NViewers(){
}
-/**
-** Adds a new panel to the frame
-**/
-void wxMaracasDialog_NViewers::AddPanel(wxWindow* panel)
-{
- //wxFlexGridSizer* sizer = new wxFlexGridSizer(1);
-
- panel->SetSize(400, 200);
-
- sizer->Add(panel, wxGROW);
- panelcut->SetSizer( sizer, true );
- panelcut->SetAutoLayout( true );
-}
/**
**
wxMaracas_N_ViewersWidget* wxMaracasDialog_NViewers::getViewer()
{
return viewer;
-}
-
-/**
-**
-**/
-wxPanel* wxMaracasDialog_NViewers::getinternalPanel()
-{
- return panelcut;
}
\ No newline at end of file
#include "vtkImageData.h"
#include "wxMaracas_N_ViewersWidget.h"
+#include "CutModelMainPanel.h"
#include <wx/wx.h>
#include <vector>
~wxMaracasDialog_NViewers();
void OnRefreshView(wxCommandEvent & event);
void OnDClickLeft(wxCommandEvent & event);
- void AddPanel(wxWindow* panel);
wxMaracas_N_ViewersWidget* getViewer();
- wxPanel* getinternalPanel();
private:
- wxMaracas_N_ViewersWidget* viewer;
- std::vector<int> point;
+ wxMaracas_N_ViewersWidget* viewer;
+ CutModelMainPanel* cutter;
- wxFlexGridSizer* sizer;
- wxPanel* panelcut;
+ std::vector<int> point;
DECLARE_EVENT_TABLE( );
#include "wxMaracasMultipleVolumeRendererPanel.h"
#include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracas_N_ViewersWidget.h"
#include "wxMaracasDialog_NViewers.h"
#include "wxMaracasRendererView.h"
#include <OpenImage.xpm>
#include <Add.xpm>
#include "Color.xpm"
+#include <vector>
//#include <vtkImageCast.h>
/**
** Implementation of viewProp3D
void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
{
vtkImageData* img;
- if(this->isComplexBox){
- img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();
- std::vector<int> type;
- type.push_back(6);
+ std::vector<int> type;
+ type.push_back(6);
+
+ wxFrame* frame = new wxFrame(this, -1, wxString(_T("Volume Visualization")));
+ frame->SetSize(wxDefaultSize);
- wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Volume Visualization") ));
- dialog1->SetSize(wxDefaultSize);
- dialog1->Show();
+ if(this->isComplexBox)
+ {
+ img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();
}
- else{
- //vtkImageData* img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolImage();
+ else
+ {
+ img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolumeRenderManager()->getImageData();
}
+
+ wxMaracas_N_ViewersWidget* viewer = new wxMaracas_N_ViewersWidget(frame, img, &type);
+ frame->Show();
}
/**
Program: wxMaracas
Module: $RCSfile: wxMaracasMultipleVolumeRendererView.cxx,v $
Language: C++
- Date: $Date: 2009/11/30 20:52:50 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2010/01/13 13:31:10 $
+ Version: $Revision: 1.11 $
Copyright: (c) 2002, 2003
License:
}
}
-void wxMaracasMultipleVolumeRendererView::SetValuesColorPointsFunction(int volid, std::vector<double> greylevelcolors,std::vector<double> red,std::vector<double> green,std::vector<double> blue){
+void wxMaracasMultipleVolumeRendererView::SetValuesColorPointsFunction(int volid, std::vector<double> greylevelcolors,std::vector<double> red,std::vector<double> green,std::vector<double> blue)
+{
volmanager->setVolumeColor(volid, greylevelcolors, red, green, blue);
}
-void wxMaracasMultipleVolumeRendererView::SetValuesPointsFunction(int volid, std::vector<double> greylevel, std::vector<double> values){
+void wxMaracasMultipleVolumeRendererView::SetValuesPointsFunction(int volid, std::vector<double> greylevel, std::vector<double> values)
+{
volmanager->setVolumeOpacity(volid, greylevel, values);
}
-vtkPiecewiseFunction* wxMaracasMultipleVolumeRendererView::GetTransferFunction(int volumeid){
+vtkPiecewiseFunction* wxMaracasMultipleVolumeRendererView::GetTransferFunction(int volumeid)
+{
return volmanager->GetTransferFunction(volumeid);
}
-vtkColorTransferFunction* wxMaracasMultipleVolumeRendererView::GetColorFunction(int volumeid){
+vtkColorTransferFunction* wxMaracasMultipleVolumeRendererView::GetColorFunction(int volumeid)
+{
return volmanager->GetColorFunction(volumeid);
}
return imgVect;
}
+wxMaracasMultipleVolumeRendererManager* wxMaracasMultipleVolumeRendererView::getVolumeRenderManager()
+{
+ return volmanager;
+}
+
/**
**
**/
Program: wxMaracas
Module: $RCSfile: wxMaracasMultipleVolumeRendererView.h,v $
Language: C++
- Date: $Date: 2009/11/20 17:09:05 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2010/01/13 13:31:10 $
+ Version: $Revision: 1.6 $
Copyright: (c) 2002, 2003
License:
void changeCompositeMIPFunction(int id, int function);
+ wxMaracasMultipleVolumeRendererManager* getVolumeRenderManager();
+
private:
static wxMaracasMultipleVolumeRendererView* instance;
#include <OpenImage.xpm>
#include "Color.xpm"
-#include "creaSystem.h"
-
+//#include "creaSystem.h"
+ BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
+ EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
+ //EVT_MENU( 12122, wxMaracasRenderTabbedPanel::OnDClickLeft )
+ END_EVENT_TABLE( );
/**
** Class constructor
mwxvtkmpr3Dview ->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
mwxvtkmpr3Dview ->Configure();
mwxvtkmpr3Dview ->ResetCamera(ext,org,spc);
+ vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
+ vtkInteractorBV->AddParentToReport(this);
}
int id = 4;
mwxvtkmpr3Dview->Refresh();
- wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
- mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
}
else
}
}
+void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event)
+{
+ printf("CPR wxMaracasRenderTabbedPanel::OnRefreshView \n");
+ mwxvtkmpr3Dview->RefreshView();
+
+ wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+ mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
/**
**
**/
type.push_back(0);
wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Cut Module") ));
- dialog1->SetSize(800, 700);
+ //dialog1->SetSize(800, 700);
- std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
+ /**std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path);
cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() );
cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
cutter->setImageData(getVolImage());
-
- dialog1->AddPanel(cutter);
+ **/
+ //dialog1->AddPanel(cutter);
dialog1->Show();
}
#include <wx/notebook.h>
#include "wxMaracasRenderImageManagementPanel.h"
-#include "CutModelMainPanel.h"
#include "wxMaracasMultipleVolumeRendererManager.h"
#include "wxMaracasSurfaceRenderingManager.h"
#include "wxVtkBaseView.h"
void onOpenParameters(wxCommandEvent& event);
void onColorChange(wxCommandEvent& event);
void onOpenCutter(wxCommandEvent& event);
+ void OnRefreshView(wxCommandEvent& event);
vtkImageData* getVolImage();
vtkImageData* getSurfAImage();
bool first;
int _id;
- CutModelMainPanel* cutter;
wxMaracasRenderImageManagementPanel* dialog;
wxMaracasMultipleVolumeRendererManager* volmanager;
wxMaracasSurfaceRenderingManager* surrendmanager1;
wxMaracasSurfaceRenderingManager* surrendmanager2;
wxMaracasSurfaceRenderingManager* surrendmanager3;
+
+ DECLARE_EVENT_TABLE( );
};
#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/
\ No newline at end of file
Program: wxMaracas
Module: $RCSfile: wxMaracasSurfaceRendering.cxx,v $
Language: C++
- Date: $Date: 2009/11/17 10:24:23 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2010/01/13 13:31:10 $
+ Version: $Revision: 1.8 $
Copyright: (c) 2002, 2003
License:
=========================================================================*/
-
-
// EOF - wxMaracasMPR.cxx
#include "wxMaracasSurfaceRendering.h"
iconsdir+="/data/Icons";
this->_toolb = new ToolBar(this,iconsdir);
- /*Carolina: "Surface Rendering" label recently added*/
- wxStaticText* txt = new wxStaticText(this, -1, wxString(_T(" Surface Rendering ")));
+ //Carolina: "Surface Rendering" label recently added
+ //wxStaticText* txt = new wxStaticText(this, -1, wxString(_T(" Surface Rendering ")));
wxAuiPaneInfo paneinfo;
- wxauimanager->AddPane(txt,paneinfo.ToolbarPane().Top());
+ //wxauimanager->AddPane(txt,paneinfo.ToolbarPane().Top());
wxauimanager->AddPane(_toolb,paneinfo.ToolbarPane().Top());
wxauimanager->Update();
createFileChooser();
}
wxMaracasSurfaceRendering::~wxMaracasSurfaceRendering( ){
-
delete _toolb;
}
return _path;
}
-
-
void wxMaracasSurfaceRendering::createFileChooser(){
}
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);
-
+ */
sizersurfprop->Add(checkboxsizer,wxFIXED_MINSIZE);
}
Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onColorChange);
sizerbut->Add(_colorchoose,wxFIXED_MINSIZE);
+ /*
wxBitmap bitmap1(Add_xpm);
_viewimage = new wxBitmapButton(this, -1, bitmap1, wxDefaultPosition, wxSize(30,30));
Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onViewImage);
sizerbut->Add(_viewimage,wxFIXED_MINSIZE);
-
+ */
sizersurfprop->Add(sizerbut,wxFIXED_MINSIZE);
//sizercolor->Add(checkbox,wxFIXED_MINSIZE);
//sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / commitdiff