Program: wxMaracas
Module: $RCSfile: wxMaracasIRMView.cxx,v $
Language: C++
- Date: $Date: 2009/04/14 12:47:30 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2009/05/14 13:54:35 $
+ Version: $Revision: 1.8 $
Copyright: (c) 2002, 2003
License:
// EOF - wxMaracasMPR.cxx
#include "wxMaracasIRMView.h"
+//#include "wxMaracasIRMViewPanel.h"
+#include "wxMaracasIRMViewProp3DMHD.h"
+#include "wxMaracasIRMViewProp3D.h"
#include <wx/colordlg.h>
#include <wx/bmpbuttn.h>
+#include <OpenImage.xpm>
+#include <Color.xpm>
+
wxMaracasIRMView* wxMaracasIRMView::instance=NULL;
wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path)
_path = path;
std::string iconsdir = path;
- iconsdir+="/Data/Icons";
+ iconsdir+="/data/Icons";
wxToolBar* toolbar = new ToolBar(this,iconsdir);
wxAuiPaneInfo paneinfo;
wxauimanager->AddPane(toolbar,paneinfo.ToolbarPane().Top());
irmmanager->changeOpacity(_propid,value);
}
-void wxMaracasIRMView::changeIsoValue(int propid, int value){
+void wxMaracasIRMView::changeIsoValue(int propid, double value){
irmmanager->changeIsoValue(propid, value);
}
wxAuiPaneInfo paneinfo;
wxauimanager->AddPane(irmview, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s));
wxauimanager->Update();
-
-}
-
-/**
-** Implementation of viewProp3D
-**/
-
-wxMaracasIRMViewProp3D::wxMaracasIRMViewProp3D(wxWindow* parent,int propid)
-:wxMaracasIRMViewPanel(parent, propid){
- createControls();
-}
-
-wxMaracasIRMViewProp3D::~wxMaracasIRMViewProp3D(){
- wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
-}
-
-void wxMaracasIRMViewProp3D::createControls(){
-
- wxString choices[2];
- choices[0] = wxString(_T("On"));
- choices[1] = wxString(_T("Off"));
- checkbox = new wxCheckBox(this,-1,wxString(_T("Show Actor")));
- this->addControl(checkbox);
- Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);
- checkbox->SetValue(true);
-
- wxBoxSizer* sizercolor = new wxBoxSizer(wxVERTICAL);
- std::string iconfile = wxMaracasIRMView::getInstance()->getPath();
- iconfile+= "/Data/Icons/Color.png";
- wxBitmap* bitmap = new wxBitmap(wxString(iconfile.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
- _colorchoose = new wxBitmapButton(this, -1, *bitmap);
- sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
- Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onColorChange);
-
- this->addControl(sizercolor);
-
- wxBoxSizer* sizeropacity = new wxBoxSizer(wxVERTICAL);
- wxStaticText* label = new wxStaticText(this, -1, wxString(_T("Opacity")));
- sizeropacity->Add(label,wxFIXED_MINSIZE);
- opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);
- sizeropacity->Add(opacity,wxFIXED_MINSIZE);
- Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onOpacityRelease);
-
- this->addControl(sizeropacity);
-
-
- /*isovalue = new wxSlider(this, -1,0,0,100);
- this->addControl(isovalue);
- Connect(isovalue->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onIsoValueRelease); */
-}
-void wxMaracasIRMViewProp3D::onCheckBoxChange(wxCommandEvent& event){
- wxMaracasIRMView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());
}
-void wxMaracasIRMViewProp3D::onColorChange(wxCommandEvent& event){
- wxColourDialog* colourdiag = new wxColourDialog(this);
- if(colourdiag->ShowModal()==wxID_OK){
- wxColour colour = colourdiag->GetColourData().GetColour();
- _colorchoose->SetBackgroundColour(colour);
-
- float r = colour.Red()/255;
- float g = colour.Green()/255;
- float b = colour.Blue()/255;
+
+void wxMaracasIRMView::deleteActor(int propid){
+ try{
+ irmmanager->deleteActor(propid);
+ }catch(char* e){
- wxMaracasIRMView::getInstance()->changeColor(this->getPropId(),r,g,b);
}
- delete colourdiag;
-}
-/*void wxMaracasIRMViewProp3D::onActionButtonPressedEliminate( wxCommandEvent& event ){
-
-}*/
-
-void wxMaracasIRMViewProp3D::onOpacityRelease(wxScrollEvent& event ){
-
- wxMaracasIRMView::getInstance()->changeOpacity(this->getPropId(),opacity->GetValue());
-
-}
-
-
-/**
-** IRM viewProp3DMHD implementation
-**/
-wxMaracasIRMViewProp3DMHD::wxMaracasIRMViewProp3DMHD(wxWindow* parent, int propid)
-: wxMaracasIRMViewProp3D(parent, propid)
-{
-
}
-wxMaracasIRMViewProp3DMHD::~wxMaracasIRMViewProp3DMHD(){
-}
-void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
- wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
- wxStaticText* label = new wxStaticText(this, -1, wxString(_T("IsoValue")));
- sizer->Add(label, wxGROW);
- //this->addControl(label);
- isovalue = new wxSlider(this, -1,maxisovalue,0,maxisovalue,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);
- sizer->Add(isovalue, wxGROW);
- //this->addControl(isovalue);
- this->addControl(sizer);
- Connect(isovalue->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3DMHD::onIsoValueRelease);
-}
-
-void wxMaracasIRMViewProp3DMHD::onIsoValueRelease(wxScrollEvent& event ){
- wxMaracasIRMView::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue());
-
-}
/**
**
**/
std::string iconfil = iconsdir;
- iconfil+= "/OpenImage.png";
- wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
- this->AddTool(0, wxString(_T("test")),*bitmap0);
+ //iconfil+= "/OpenImage.png";
+ //wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
+ wxBitmap bitmap0(OpenImage_xpm);
+ this->AddTool(0, wxString(_T("test")),bitmap0);
/*iconfil+= "/Open.png";
wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);