_surfC = new wxRadioButton(panel,-1,_T("C"));
_surfD = new wxRadioButton(panel,-1,_T("D"));
- wxCheckBox *ckVolum = new wxCheckBox(panel,-1,_T("Vol"));
+
+ //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
+ //wxCheckBox *ckVolum = new wxCheckBox(panel,-1,_T("Vol"));
wxCheckBox *ckBoxSurface = new wxCheckBox(panel,-1,_T("Surface Box"));
- wxCheckBox *ckBoxVolume = new wxCheckBox(panel,-1,_T("Volume Box"));
+
+ //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
+ //wxCheckBox *ckBoxVolume = new wxCheckBox(panel,-1,_T("Volume Box"));
_color = new wxButton(panel,-1,_T(""));
_visible = new wxCheckBox(panel,-1,_T("Vis"));
wxButton *btnSTL = new wxButton(panel,-1,_T("Create STL File"));
wxButton *btnSaveRaw = new wxButton(panel,-1,_T("Save Raw Volume"));
- wxButton *btnVolumeFunctions = new wxButton(panel,-1,_T("Read Volume Functions"));
+ //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
+ //wxButton *btnVolumeFunctions = new wxButton(panel,-1,_T("Read Volume Functions"));
Connect(btnSTL->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnCreateFileSTL );
Connect(btnSaveRaw->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnSaveRawVolume );
- Connect(btnVolumeFunctions->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnVolumeFunctions );
+
+ //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
+ //Connect(btnVolumeFunctions->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnVolumeFunctions );
wxButton *btnMeshVTKLoad = new wxButton(panel,-1,_T("Load Mesh"));
// ckVolum->Enable(false);
ckBoxSurface->SetValue(false);
- ckBoxVolume->SetValue(false);
+
+
+ //ckBoxVolume->SetValue(false);
+
+
_color->SetSize(40,20);
_opacity->SetSize(370,20);
// ckBoxX->SetValue(true);
// _positionY->SetSize(400,20);
// _positionZ->SetSize(400,20);
- Connect(ckVolum->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleVolume );
- Connect(ckBoxVolume->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleBoxVolume );
+ //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
+ //Connect(ckVolum->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleVolume );
+ //Connect(ckBoxVolume->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleBoxVolume );
Connect(_surfA->GetId() , wxEVT_COMMAND_RADIOBUTTON_SELECTED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnSurface );
Connect(_surfB->GetId() , wxEVT_COMMAND_RADIOBUTTON_SELECTED , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnSurface );
//wxFlexGridSizer *sizerH5 = new wxFlexGridSizer(10); // JPRx
//wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10); // JPRx
- sizerH0->Add( ckVolum , 1, wxALL|wxEXPAND, 0);
- sizerH0->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0);
- sizerH0->Add( ckBoxVolume , 1, wxALL|wxEXPAND, 0);
- sizerH0->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0);
- sizerH0->Add( btnVolumeFunctions , 1, wxALL|wxEXPAND, 0);
- sizerH0->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0);
+ //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
+ //sizerH0->Add( ckVolum , 1, wxALL|wxEXPAND, 0);
+ //sizerH0->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0);
+ //sizerH0->Add( ckBoxVolume , 1, wxALL|wxEXPAND, 0);
+ //sizerH0->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0);
+ //sizerH0->Add( btnVolumeFunctions , 1, wxALL|wxEXPAND, 0);
+ //sizerH0->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0);
sizerH0->Add( btnMeshVTKLoad , 1, wxALL|wxEXPAND, 0);
void wxVtkClipping3DViewCntrlPanel::OnIsoValueSpin(wxScrollEvent& event)
{
int value = _isoValue->GetValue();
- int delta= (int)pow( 4 , _isoValueSpin->GetValue() );
+ int delta= (int)pow( (double)4 ,(double) _isoValueSpin->GetValue() );
int min=value - delta/2;
int max=value + delta/2;
if (min<0)
//setting variables if the user wants to do refresh
hDlg->setCTF(ctfun);
hDlg->setTF(tfun);
- hDlg->setClipping3DView(_wxvtkclipping3Dview);
+ //hDlg->setClipping3DView(_wxvtkclipping3Dview);
/*
hDlg->setVolume(newvol);
hDlg->setVolumeMapper(volumeMapper);
volumeMapper->Update();
newvol->Update();
*/
- }
-
- else
- {
-
+ } else {
if(hDlg->getRefreshed())
{
int i=0,size;