/**
** Class constructor
**/
-wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent)
+wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id)
: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
{
- //_propid = propid;
+ _id = id;
+
+ dialog = NULL;
+
volmanager = new wxMaracasMultipleVolumeRendererManager();
surrendmanager1 = new wxMaracasSurfaceRenderingManager();
surrendmanager2 = new wxMaracasSurfaceRenderingManager();
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSA(_propid, false);
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
- this->deleteVolume(_propidV);
+ this->deleteVolume(_id);
delete wxtabs;
}
if(inImg == NULL)
{
- //std::string s = std::string(pathfile.mb_str());
vtkImageData* img = volmanager->getImageData(pathfile);
- vtkImageData* img1 = surrendmanager1->getImageData(pathfile);
- vtkImageData* img2 = surrendmanager2->getImageData(pathfile);
- vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
- if(img!=NULL && img1!=NULL && img2!=NULL && img3!=NULL)
+ //vtkImageData* img1 = surrendmanager1->getImageData(pathfile);
+ //vtkImageData* img2 = surrendmanager2->getImageData(pathfile);
+ //vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
+ if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/)
{
- //s = std::string(filename.mb_str());
addVolume(img, filename);
- addSurface1(img1, filename);
- addSurface2(img2, filename);
- addSurface3(img3, filename);
+ addSurface1(img, filename);
+ addSurface2(img, filename);
+ addSurface3(img, filename);
+ volname = (wxString) filename;
wxtabs->Refresh();
}
}
else
{
- //s = std::string(filename.mb_str());
addVolume(inImg, filename);
addSurface1(inImg, filename);
addSurface2(inImg, filename);
{
try
{
- _propidV = volmanager->addVolume(img, dataname);
+ int _propidV = volmanager->addVolume(_id, img, dataname);
if(_propidV!=-1)
{
wxMaracasMultipleVolumeRendererPanel* controlpanV = new wxMaracasMultipleVolumeRendererPanel(wxtabs, _propidV, img, true);
{
try
{
- _propidSA = surrendmanager1->addPropMHD(img, dataname);
+ int _propidSA = surrendmanager1->addPropMHD(_id, img, dataname);
if(_propidSA!=-1)
{
{
try
{
- _propidSB = surrendmanager2->addPropMHD(img, dataname);
+ int _propidSB = surrendmanager2->addPropMHD(_id, img, dataname);
if(_propidSB!=-1)
{
wxMaracasSurfaceRenderingPanel* controlpanSB = new wxMaracasSurfaceRenderingProp3DMHD(wxtabs, _propidSB, true, 2);
{
try
{
- _propidSC = surrendmanager3->addPropMHD(img, dataname);
+ int _propidSC = surrendmanager3->addPropMHD(_id, img, dataname);
if(_propidSC!=-1)
{
void wxMaracasRenderTabbedPanel::onCheckBoxSAChange(wxCommandEvent& event)
{
try{
- surrendmanager1->addRemoveActor(this->getPropIdSA(), checkboxSA->GetValue());
+ surrendmanager1->addRemoveActor(this->getPropIdV(), checkboxSA->GetValue());
}
catch(char* str){
std::cout << "Exception : " << str << '\n';
void wxMaracasRenderTabbedPanel::onCheckBoxSBChange(wxCommandEvent& event)
{
try{
- surrendmanager2->addRemoveActor(this->getPropIdSB(), checkboxSB->GetValue());
+ surrendmanager2->addRemoveActor(this->getPropIdV(), checkboxSB->GetValue());
}
catch(char* str){
std::cout << "Exception : " << str << '\n';
void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event)
{
try{
- surrendmanager3->addRemoveActor(this->getPropIdSC(), checkboxSC->GetValue());
+ surrendmanager3->addRemoveActor(this->getPropIdV(), checkboxSC->GetValue());
}
catch(char* str){
std::cout << "Exception : " << str << '\n';
**
**/
void wxMaracasRenderTabbedPanel::onOpenParameters(wxCommandEvent& event){
-
- dialog = new wxMaracasRenderImageManagementPanel(this, volmanager, surrendmanager1, surrendmanager2, surrendmanager3, this->getPropIdV());
- dialog->SetSize(400, 580);
- dialog->Show();
+ if(dialog == NULL)
+ {
+ dialog = new wxMaracasRenderImageManagementPanel(this, volmanager, surrendmanager1, surrendmanager2, surrendmanager3, volname, _id);
+ dialog->SetSize(400, 580);
+ dialog->Show();
+ }
+ else if(dialog != NULL)
+ {
+ dialog->Show();
+ }
}
-
/**
** Gets volume rendering image asociated to the given ID
**/
/**
**
**/
-vtkImageData* wxMaracasRenderTabbedPanel::getVolImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getVolImage()
{
return volmanager->getImageData();
}
/**
** Gets surface rendering A image asociated to the given ID
**/
-vtkImageData* wxMaracasRenderTabbedPanel::getSurfAImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getSurfAImage()
{
return surrendmanager1->getImageData();
}
/**
** Gets surface rendering B image asociated to the given ID
**/
-vtkImageData* wxMaracasRenderTabbedPanel::getSurfBImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getSurfBImage()
{
return surrendmanager2->getImageData();
}
/**
** Gets surface rendering C image asociated to the given ID
**/
-vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage()
{
return surrendmanager3->getImageData();
}
**/
int wxMaracasRenderTabbedPanel::getPropIdV()
{
- return _propidV;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSA()
-{
- return _propidSA;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSB()
-{
- return _propidSB;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSC()
-{
- return _propidSC;
-}
-
+ return _id;
+}
\ No newline at end of file