X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=6fbe98bbdb338086f27e2161ad1a80a98152eaf0;hb=5d784a0e59017c7e1117c1162241629e7dea872c;hp=e6a1eec84fc756e626e1892c515088358323c7b9;hpb=c9965cf71b0d0cf7c85e8877d0c3505c97b1c3e9;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index e6a1eec..6fbe98b 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -13,14 +13,11 @@ #include "NameWrapper.h" #include "wx/artprov.h" #include "ConceptDataWrap.h" - -#include -//#include "ImageSourceThing.h" -//#include "wxContour_ActionCommandsID.h" -//#include "OutlineModelBuilder.h" -//#include "wxContourEventHandler.h" #include +#include +using namespace std; + //---------------------------------------------------------------------------------------------------------------- // Class implementation //---------------------------------------------------------------------------------------------------------------- @@ -32,22 +29,23 @@ wxContourMainFrame* wxContourMainFrame:: instance = NULL; char wxContourMainFrame::COPY = 'C'; - + wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,long style) //: wxPanel(parent, id, title, pos, size, style) //: wxWindow(parent, id, pos, size, style) : wxPanel(parent, id, pos, size, style) { m_mgr.SetManagedWindow(this); + _contourGroup = 1; _creatingContoursActive = false; _theViewPanel = NULL; // _modelManager = NULL; _instantPanel = NULL; // _buttonsBar = NULL; -// _gridPanel = NULL; +// _gridPanel = NULL; // _drawToolsPanel = NULL; // _operationsToolsPanel = NULL; - //_autoFormsPanel = NULL; + //_autoFormsPanel = NULL; // _standardToolsPanel = NULL; // _editionToolsPanel = NULL; // _listViewPanel = NULL; @@ -58,23 +56,27 @@ char wxContourMainFrame::COPY = 'C'; _refLineControl = NULL; _refLineModel = NULL; _refLineView = NULL; - _imageReslicer = NULL; - _thresholdTable = NULL; - _thresholdMapper = NULL; - _thresholdActor = NULL; - _actorPresent = false; +// _actorPresent = false; // set up default notebook style // m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; -// m_notebook_theme = 0; +// m_notebook_theme = 0; //wxContour_ActionCommandsID a; + _contourextractdata = NULL; + _viewMaskImage = NULL; + _viewMaskImagePanel = NULL; + _viewThresholdImage = NULL; + _viewThresholdImagePanel = NULL; + _viewColorLayerImage = NULL; + _viewColorLayerImagePanel = NULL; } - wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir) + wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir) : wxPanel(parent, id, pos, size, style) { m_mgr.SetManagedWindow(this); + _contourGroup = 1; _creatingContoursActive = false; _theViewPanel = NULL; @@ -82,21 +84,23 @@ char wxContourMainFrame::COPY = 'C'; _refLineControl = NULL; _refLineModel = NULL; _refLineView = NULL; - _imageReslicer = NULL; - _thresholdTable = NULL; - _thresholdMapper = NULL; - _thresholdActor = NULL; - _actorPresent = false; +// _actorPresent = false; + _viewMaskImage = NULL; + _viewMaskImagePanel = NULL; + _viewThresholdImage = NULL; + _viewThresholdImagePanel = NULL; + _viewColorLayerImage = NULL; + _viewColorLayerImagePanel = NULL; // set up default notebook style m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; - m_notebook_theme = 0; + m_notebook_theme = 0; //wxContour_ActionCommandsID a; _numberOfVariablesStatistics = 7; _datadir = datadir; - + inredo = 0; inundo = 0; @@ -108,9 +112,13 @@ char wxContourMainFrame::COPY = 'C'; this->setVectImages(images); } + _contourextractdata = NULL; } -void wxContourMainFrame::setVectImages( std::vector images ){ +void wxContourMainFrame::setVectImages(std::vector imgs) +{ + + _images = imgs; #if defined(__GNUC__) std::string str_home(getenv("HOME")); @@ -122,19 +130,19 @@ void wxContourMainFrame::setVectImages( std::vector images ){ std::vector conceptNameVect; std::vector conceptSizeVect; - notebook = this->createNotebook(); + notebook = this->createNotebook(); - kernelManager = new KernelManagerContour( images , _datadir+"/data/" , strCreaContourDataTmp ); + kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp ); _instantPanel = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" ); - _theViewPanel = new wxContourViewPanel( kernelManager->getSourceImage(), notebook ); - + _theViewPanel = new wxContourViewPanel( kernelManager->getSourceImage(), notebook ); + //------------------------------------------------------------- kernelManager->getConceptsInformation(conceptNameVect, conceptSizeVect); _instantPanel->addConcepts(conceptNameVect, conceptSizeVect); - + double val = _theViewPanel->getCurrentDeep(); _instantPanel->setConceptValue( "Axe Depth", (int)val ); @@ -148,7 +156,8 @@ void wxContourMainFrame::setVectImages( std::vector images ){ } - wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir ){ + wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir ) + { if(instance == NULL){ instance = new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir); } @@ -162,7 +171,7 @@ void wxContourMainFrame::setVectImages( std::vector images ){ wxContourMainFrame* wxContourMainFrame :: getInstance() { - return instance; + return instance; } void wxContourMainFrame :: resetInstance() @@ -172,7 +181,8 @@ void wxContourMainFrame::setVectImages( std::vector images ){ wxContourMainFrame :: ~wxContourMainFrame() { - + delete _contourextractdata; + deleteAllContours(); _pannew->Close(); interfMainPanel::resetInstance(); delete kernelManager; @@ -183,13 +193,13 @@ void wxContourMainFrame::setVectImages( std::vector images ){ m_mgr.UnInit(); //delete m_mgr; - //El problema al cerrar la aplicacion puede estar asociado - //a que wxAUINotebook esta en la aplicacion + //El problema al cerrar la aplicacion puede estar asociado + //a que wxAUINotebook esta en la aplicacion //principal (wxContourGUIExample)tambien - //EED???? delete _theViewPanel; + //EED???? delete _theViewPanel; //EED???? delete _instantPanel; //EED???? delete _buttonsBar; - //EED???? delete _actualInstant; + //EED???? delete _actualInstant; //EED???? delete _sceneManager; } @@ -205,19 +215,19 @@ void wxContourMainFrame::setVectImages( std::vector images ){ wxBitmap page_bmp = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)); return noteBook; } - + //------------------------------------------------------------------------------------------------------------ - // Creational and initialization methods + // Creational and initialization methods //------------------------------------------------------------------------------------------------------------ bool wxContourMainFrame :: configurePanels( ) { bool configured = _theViewPanel!=NULL; - + configured &= _theViewPanel!=NULL; if( _theViewPanel!=NULL ) { - notebook->AddPage( _theViewPanel, wxT(" View ") ); + notebook->AddPage( _theViewPanel, wxT(" View ") ); m_mgr.Update(); } @@ -230,7 +240,7 @@ void wxContourMainFrame::setVectImages( std::vector images ){ m_mgr.AddPane(notebook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false)); m_mgr.Update(); - + SetMinSize(wxSize(300,300)); m_mgr.Update(); return configured; @@ -241,7 +251,7 @@ void wxContourMainFrame::setVectImages( std::vector images ){ { bool configured = panel!=NULL; configured &= panel!=NULL; - + if( configured ) { notebook->AddPage( panel, wxT(" Viewer "), true ); @@ -253,12 +263,12 @@ void wxContourMainFrame::setVectImages( std::vector images ){ //------------------------------------------------------------------------------------------------------------ // Attributes getters and setters //------------------------------------------------------------------------------------------------------------ - - + + void wxContourMainFrame :: setInstantChooserPanel( wxInstantChooserPanel * theInstantChooserPanel ) { - _instantPanel = theInstantChooserPanel; + _instantPanel = theInstantChooserPanel; } // void wxContourMainFrame :: setButtonsBar( wxContour_ButtonsBar * theButtonsBar ) @@ -277,7 +287,7 @@ void wxContourMainFrame::setVectImages( std::vector images ){ // } // void wxContourMainFrame :: setOperationsToolsPanel( wxContour_OperationsToolsPanel * theOperationsToolsPanel ) -// { +// { // _operationsToolsPanel = theOperationsToolsPanel; // } @@ -304,44 +314,62 @@ void wxContourMainFrame::setVectImages( std::vector images ){ void wxContourMainFrame::onCreateContourSpline( ){ - + //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation createContour( 1 ); - + } void wxContourMainFrame::onCreateContourRectangle( ){ //JCP 20-10-08 Undo redo implementation saveState(); - //JCP 20-10-08 Undo redo implementation + //JCP 20-10-08 Undo redo implementation createContour( 2 ); } void wxContourMainFrame::onCreateContourCircle( ){ //JCP 20-10-08 Undo redo implementation saveState(); - //JCP 20-10-08 Undo redo implementation + //JCP 20-10-08 Undo redo implementation createContour( 3 ); } void wxContourMainFrame::onCreateContourLine( ){ //JCP 20-10-08 Undo redo implementation saveState(); - //JCP 20-10-08 Undo redo implementation + //JCP 20-10-08 Undo redo implementation createContour( 6 ); } +// RaC 09-09 -------------------------------------- +void wxContourMainFrame::onCreateContourPoints( ){ + //JCP 20-10-08 Undo redo implementation + saveState(); + //JCP 20-10-08 Undo redo implementation + createContour( 7 ); +} +// RaC 09-09 -------------------------------------- + +// RaC 10-09 -------------------------------------- +void wxContourMainFrame::onCreateContourPolygon( ){ + //JCP 20-10-08 Undo redo implementation + saveState(); + //JCP 20-10-08 Undo redo implementation + createContour( 10 ); +} +// RaC 10-09 -------------------------------------- + //------------------------------------------------------------------------------------------------------------ void wxContourMainFrame :: onCreateContourBullEye(wxPanel* panel ) { - //Creating the manualContourModel and including in the model - manualContourModel * manModelContour = factoryManualContourModel(panel ); + //Creating the manualBaseModel and including in the model + manualBaseModel * manModelContour = factoryManualContourModel(panel ); std::vector instantVector; _instantPanel->getInstant( instantVector ); std::string theName = kernelManager->createOutline(manModelContour, instantVector); - + /*std::vector instantVector; _instantPanel->getInstant( instantVector ); std::string theName; @@ -351,9 +379,9 @@ void wxContourMainFrame :: onCreateContourBullEye(wxPanel* panel ) if( addedModel ) { double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default - _theViewPanel->getSpacing(spc); + _theViewPanel->getSpacing(spc); //Adding the manualContourControler to interface objects structure - //Adding the manualViewContour to interface objects structure + //Adding the manualViewContour to interface objects structure //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , 4) ; } @@ -361,13 +389,12 @@ void wxContourMainFrame :: onCreateContourBullEye(wxPanel* panel ) void wxContourMainFrame :: createContour( int typeContour ) { //Creating the manualContourModel and including in the model - manualContourModel * manModelContour = kernelManager->factoryManualContourModel(typeContour); - + manualBaseModel * manModelContour = kernelManager->factoryManualContourModel(typeContour); std::vector instantVector; _instantPanel->getInstant( instantVector ); std::string theName = kernelManager->createOutline(manModelContour, instantVector); - + /*std::vector instantVector; _instantPanel->getInstant( instantVector ); std::string theName; @@ -376,18 +403,18 @@ void wxContourMainFrame :: createContour( int typeContour ) if( addedModel ) { double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default - _theViewPanel->getSpacing(spc); + _theViewPanel->getSpacing(spc); //Adding the manualContourControler to interface objects structure - //Adding the manualViewContour to interface objects structure + //Adding the manualViewContour to interface objects structure //_sceneManager->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , typeContour) ; - } + } } -manualContourModel * wxContourMainFrame::factoryManualContourModel(wxPanel* panel){ +manualBaseModel * wxContourMainFrame::factoryManualContourModel(wxPanel* panel){ manualContourModelBullEye *manModelContourBullEye = new manualContourModelBullEye(); - manualContourModel *manModelContour=NULL; + manualBaseModel *manModelContour=NULL; manModelContour = manModelContourBullEye; if (panel!=NULL){ int iCrown,sizeCrowns,iSector,sizeSectors; @@ -408,18 +435,18 @@ manualContourModel * wxContourMainFrame::factoryManualContourModel(wxPanel* pane for ( iSector=0 ; iSectorGetAngOfCrownSection(iCrown,iSector); - angDelta= ((PanelBullEyeOptions*)panel)->GetAngDeltaOfCrownSection(iCrown); + angDelta= ((PanelBullEyeOptions*)panel)->GetAngDeltaOfCrownSection(iCrown); manModelContourBullEye->AddSector(radioA,radioB,ang,angDelta); } // for iSector } // for iCrown } // if _panelBullEyeOptions - + return manModelContour; } -void wxContourMainFrame :: saveState(){ - +void wxContourMainFrame :: saveState(){ + std::string temp = kernelManager->saveState(); - saveFileWithContours(temp); + saveFileWithContours(temp); } void wxContourMainFrame::onDeleteContour(){ @@ -460,7 +487,7 @@ void wxContourMainFrame::onDeleteContour(){ for (j=0;jremoveFromScene(theKeyName); kernelManager->deleteCModel(theKeyName); - //_theViewPanel->getSceneManager()->removeFromScene( theKeyName ); + //_theViewPanel->getSceneManager()->removeFromScene( theKeyName ); //cViewer = conwrapviewControl->getViewer(); //_theViewPanel->getSceneManager()->removeWrap( theKeyName ); - //cControler* conwrapviewControl->getControler(); -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxContourEventHandler::deleteContours() \n" ); -//fprintf(ff," %s %p\n",keyNamesVector[i].c_str(), cControler ); -//fclose(ff); + //cControler* conwrapviewControl->getControler(); // delete cModel; // delete cViewer; // delete cControler; @@ -542,15 +564,15 @@ void wxContourMainFrame::deleteAllContours(){ //int minZ = _mbarrangeDeleteAll->GetStart(); //int maxZ = _mbarrangeDeleteAll->GetEnd(); int minZ, maxZ; - + minZ = 0; maxZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ(); - + //JCP --08-09-2008 - - _theViewPanel->getSceneManager()->removeSceneContours( ); + + _theViewPanel->getSceneManager()->removeSceneContours( ); _theViewPanel->getSceneManager()->removeAllOutlines(); - kernelManager->removeAllOutlines(); + kernelManager->removeAllOutlines(); //JCP --08-09-2008 /* if ( (minZ==0) && (maxZ==_mbarrangeDeleteAll->GetMax() )) @@ -573,7 +595,7 @@ void wxContourMainFrame::deleteAllContours(){ deleteContour( (*contourthing)->getName() ); } //for ii }// for z - } // if + } // if JCP --08-09-2008 */ } @@ -581,39 +603,99 @@ void wxContourMainFrame::setConceptValue( std::string name, int value ){ _instantPanel->setConceptValue(name, value); } + ConceptDataWrap* wxContourMainFrame::getLastConceptData(){ return _instantPanel->getLastConceptData(); } + + bool wxContourMainFrame::getIfConceptCheckedAt( std::string name, int pos ){ return _instantPanel->getIfConceptCheckedAt( name, pos ); } + + +void wxContourMainFrame::ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ) +{ + vtkImageData * mask; + vtkImageData * value; + this->getMaskValue(&mask, &value, typeContourGroup, selection, minZ, maxZ); + + std::vector nTypeView; + nTypeView.push_back(5); + nTypeView.push_back(1); + nTypeView.push_back(2); + nTypeView.push_back(0); + + wxFrame *frame = new wxFrame(this, -1,_T("Result image extracted.."),wxDefaultPosition,wxSize(600,600), wxDEFAULT_FRAME_STYLE|wxSTAY_ON_TOP); + wxAuiManager *m_mgr_noteBookViewerResult = new wxAuiManager(); + m_mgr_noteBookViewerResult->SetManagedWindow(frame); + + wxAuiNotebook* noteBookViewerResult = new wxAuiNotebook(frame, -1, wxPoint(600, 600), wxSize(430,200), m_notebook_style); + m_mgr_noteBookViewerResult->AddPane(noteBookViewerResult, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false)); + + wxPanel *panelViewer1 = new wxMaracas_N_ViewersWidget(noteBookViewerResult, value,&nTypeView); + wxPanel *panelViewer2 = new wxMaracas_N_ViewersWidget(noteBookViewerResult, mask,&nTypeView); + + + noteBookViewerResult->AddPage( panelViewer1, wxT("Image result") ); + noteBookViewerResult->AddPage( panelViewer2, wxT("Mask result") ); + m_mgr_noteBookViewerResult->Update(); + frame->Show(); +} + + + + void wxContourMainFrame::changeInstant() { std::vector instantVect; _instantPanel->getInstant( instantVect ); -// Instant * theInstant = new Instant ( &instantVect ); - - //Setting the actual instant - //_actualInstant = theInstant; + int actualSlice = instantVect[1]; kernelManager->setInstant(instantVect); - //_modelManager->setInstant( _actualInstant ); - - onThresholdChange(); + + // Refresh Mask image + if(_viewMaskImage!=NULL){ + _viewMaskImage->SetZ(actualSlice); + if (_viewMaskImagePanel->IsVisible()==true) + { + vtkImageData *mask, *value; + getMaskValue(&mask,&value, _contourGroup , 0, -1, -1); + _viewMaskImage->onThreshold(); + } + } + + // Refresh Threshold image + if(_viewThresholdImage!=NULL){ + _viewThresholdImage->SetZ(actualSlice); + if (_viewThresholdImagePanel->IsVisible()==true){ + _viewThresholdImage->onThreshold(); + } + } + + // Refresh Threshold image + if(_viewColorLayerImage!=NULL){ + _viewColorLayerImage->SetZ(actualSlice); + if (_viewColorLayerImagePanel->IsVisible()==true){ + _viewColorLayerImage->onThreshold(); + } + } + updateInstantOutlines(); updateInstantImageData(); updateInstantAxes(); } + void wxContourMainFrame :: updateInstantOutlines() { _theViewPanel->removeSceneContours(); _theViewPanel->addNameWrapperToScene(); //for( int i=0; igetSceneManager()->addToScene(namesWrapping[i]->getKeyName(), true, true, true, false, false ); //} } @@ -646,7 +728,7 @@ void wxContourMainFrame::updateInstantAxes() void wxContourMainFrame::onChangeDeep(int val){ - _instantPanel->setConceptValue( "Axe Depth", (int)val ); + _instantPanel->setConceptValue( "Axe Depth", (int)val ); changeInstant(); } @@ -675,11 +757,11 @@ void wxContourMainFrame::onPaste(){ _instantPanel->getInstant( tempVector ); _performingOperation->setEndOperationInstantVector ( tempVector ); std::vector elems = _performingOperation->getKeyNamesOperationElems(); - int i,size = elems.size(); + int i,size = elems.size(); for( i=0; i0 ); - } + } } } void wxContourMainFrame::onUndo(){ @@ -696,12 +778,12 @@ void wxContourMainFrame::onRedo(){ if(kernelManager->onRedo(filename)){ loadState(filename); } - + } void wxContourMainFrame :: createCopyContourOf ( std::string anExistingKName, std::vector &instantNoTouchData, bool append ) { std::string cloneName = kernelManager->createCopyContourOf( anExistingKName, instantNoTouchData ); - manualContourModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);//_modelManager->getOutlineByKeyName( cloneName )->getModel(); + manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);//_modelManager->getOutlineByKeyName( cloneName )->getModel(); _theViewPanel->getSceneManager()->createCopyContourOf( anExistingKName, cloneName, manualModel , append ); } @@ -709,7 +791,7 @@ void wxContourMainFrame :: createCopyContourOf ( std::string anExistingKName, st void wxContourMainFrame :: createMirrorContourOf ( std::string anExistingKName, std::vector &instantNoTouchData, bool append ) { std::string cloneName = kernelManager->createCopyContourOf( anExistingKName, instantNoTouchData ); - manualContourModel * manualModel = kernelManager->getOutlineByKeyName(cloneName); + manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName); manualPoint * refPoint1 = _refLineModel->GetManualPoint(0); manualPoint * refPoint2 = _refLineModel->GetManualPoint(1); @@ -751,105 +833,57 @@ void wxContourMainFrame :: createMirrorContourOf ( std::string anExistingKName, _theViewPanel->getSceneManager()->createCopyContourOf( anExistingKName, cloneName, manualModel , append ); } +//EED04 void wxContourMainFrame ::loadState(std::string filename){ + + deleteAllContours(); + onLoadContours(filename,false); + + /* EED Borrame char tmp[255]; FILE *pFile=fopen(filename.c_str(),"r+"); fscanf(pFile,"%s",tmp); // --CreaContour-- fscanf(pFile,"%s",tmp); // Version - fscanf(pFile,"%s",tmp); // 1.0.1 - std::string version(tmp); + fscanf(pFile,"%s",tmp); // 1.0.3 || 1.0.2 || 1.0.1 || 1.0.0 deleteAllContours(); - openContours(pFile,false); - if (version!="1.0.0"){ - openContours(pFile,true); - } + loadContours(pFile, false); + loadContours(pFile, true); fclose(pFile); - - //_theViewPanel->getSceneManager()->removeSceneContours(); - //changeInstant(); - + */ } -void wxContourMainFrame::onLoad(){ - char tmp[255]; - wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxOPEN ); - if (dialog.ShowModal() == wxID_OK) - { - std::string fileNameContourROI = (const char *)(dialog.GetPath().mb_str()); - FILE *pFile=fopen(fileNameContourROI.c_str(),"r+"); - - fscanf(pFile,"%s",tmp); // --CreaContour-- - - fscanf(pFile,"%s",tmp); // Version - fscanf(pFile,"%s",tmp); // 1.0.1 - std::string version(tmp); - - openContours(pFile,false); - if (version!="1.0.0"){ - openContours(pFile,true); - } -// _theViewPanel->getSceneManager()->openFileWithContours(ff); - fclose(pFile); - } - _theViewPanel->getSceneManager()->removeSceneContours(); - changeInstant(); -} -void wxContourMainFrame::onSave(){ - wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxSAVE ); - if (dialog.ShowModal() == wxID_OK) - { - std::string fileNameContourROI = (const char *)(dialog.GetPath().mb_str()); - kernelManager->setCurrentFileName(fileNameContourROI); - saveFileWithContours( fileNameContourROI ); - } -} -void wxContourMainFrame::saveFileWithContours( std::string filename ) +//EED03 +/*EED Borrame +void wxContourMainFrame::loadContours( FILE *pFile, bool staticContour ) { + char tmp[255]; - FILE *pFile=fopen(filename.c_str(),"w+"); - std::vector< std::string > lstNameThings; - int i,sizeLstNameThings; - - fprintf(pFile,"--CreaContour--\n"); - fprintf(pFile,"Version %s\n", "1.0.1" ); - - // Normal Contours - lstNameThings = kernelManager->GetLstNameThings(); - sizeLstNameThings = lstNameThings.size(); - fprintf(pFile,"NumberOfContours %d\n", sizeLstNameThings ); - for (i=0 ; iSaveThingName( pFile, lstNameThings[i] ); - _theViewPanel->getSceneManager()->SaveThingName( pFile, lstNameThings[i] ); - }// for i - - //-- Contours Statics - lstNameThings = kernelManager->GetLstNameThingsStatic(); - sizeLstNameThings = lstNameThings.size(); - fprintf(pFile,"NumberOfContoursStatic %d\n", sizeLstNameThings ); - for (i=0 ; iSaveThingName( pFile, lstNameThings[i] ); - _theViewPanel->getSceneManager()->SaveThingName( pFile, lstNameThings[i] ); - }// for i - fclose(pFile); -} + fscanf(pFile,"%s",tmp); // ImageDimensions + fscanf(pFile,"%s",tmp); // X + fscanf(pFile,"%s",tmp); // Y + fscanf(pFile,"%s",tmp); // Z + + fscanf(pFile,"%s",tmp); // ImageSpacing + fscanf(pFile,"%s",tmp); // X + fscanf(pFile,"%s",tmp); // Y + fscanf(pFile,"%s",tmp); // Z + } -void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){ - char tmp[255]; - fscanf(pFile,"%s",tmp); // NumberOfContours + fscanf(pFile,"%s",tmp); // NumberOfContours fscanf(pFile,"%s",tmp); // ## - int numberOfContours = atoi(tmp); + int numberOfContours = atoi(tmp); std::vector instantVector; int typeContourModel; - manualContourModel *manModelContour; + manualBaseModel *manModelContour; int typeView; int i; @@ -857,7 +891,6 @@ void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){ { instantVector.clear(); fscanf(pFile,"%s",tmp); // Instant - fscanf(pFile,"%s",tmp); // 1 instantVector.push_back( atoi(tmp) ); fscanf(pFile,"%s",tmp); // 2 @@ -871,7 +904,6 @@ void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){ fscanf(pFile,"%s",tmp); // 6 instantVector.push_back( atoi(tmp) ); - fscanf(pFile,"%s",tmp); // TypeContourModel fscanf(pFile,"%s",tmp); // ## typeContourModel = atoi(tmp); @@ -881,13 +913,7 @@ void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){ fscanf(pFile,"%s",tmp); // TypeView fscanf(pFile,"%s",tmp); // ## - typeView = atoi(tmp); - - -// if (typeView==1) -// { -// } - + typeView = atoi(tmp); std::string theName; theName = kernelManager->createOutline( manModelContour, instantVector ); @@ -895,149 +921,608 @@ void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){ if( addedModel ) { double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default - _theViewPanel->getSpacing(spc); + _theViewPanel->getSpacing(spc); //Adding the manualContourControler to interface objects structure - //Adding the manualViewContour to interface objects structure + //Adding the manualViewContour to interface objects structure //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , typeView) ; - } + } if (staticContour==true) { Instant instant(&instantVector); kernelManager->changeContourOfManager( theName , &instant ); } - }// for numberOfContours - -} - -void wxContourMainFrame::RefreshInterface(){ - changeInstant(); - _theViewPanel->RefreshInterface(); - //wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)this->_theViewPanel->getWxVtkBaseView(); - //wxvtk2dbaseview->Refresh(); } +*/ -vtkImageData* wxContourMainFrame::getImageData(){ - return _theViewPanel->getImageData(); -} -void wxContourMainFrame::onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation) +void wxContourMainFrame::onLoad() { - //JCP 20-10-08 Undo redo implementation - saveState(); - //JCP 20-10-08 Undo redo implementation - - wxBusyCursor wait; - int x = _theViewPanel->GetX(); - int y = _theViewPanel->GetY(); - int z = _theViewPanel->GetZ(); - SegmentationOneSliceITK( x,y,z,distance, sigma, alfa, beta, propagation, iterations, inflation); - RefreshInterface(); + std::string fileNameContourROI = GetFileLocation(); +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + if(GetFileLocation().empty()) + { +//------------------------------------------------------------------------------------------------------------ + wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxOPEN ); + if (dialog.ShowModal() == wxID_OK) + { + fileNameContourROI = (const char *)(dialog.GetPath().mb_str()); + } + } + + onLoadContours(fileNameContourROI,true); } -void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString distanc, wxString sigm, wxString alf, wxString bet, wxString prop, wxString iter, wxString inflation) -{ - int typeofcontour = 1; - //Image Data - vtkImageData *imagedata = getImageData(); - - //Tipo de pixeles a utilizar internamente en ITK - typedef float InternalPixelType; - const unsigned int Dimension = 2; - typedef itk::Image< InternalPixelType, Dimension > InternalImageType; - //Tipo de pixeles de salida 1 - typedef unsigned char OutputPixelType; - typedef itk::Image< OutputPixelType, Dimension > OutputImageType; +void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool interactiveInterface) +{ + char tmp[255]; + char tmpD[255]; - //Tipo de pixeles de salida 2 - typedef unsigned short OutputPixelType2; - typedef itk::Image< OutputPixelType2, Dimension > OutputImageType2; + FILE *pFile =fopen(fileNameContourROI.c_str(),"r+"); - //DefiniciÛn del thresholder - typedef itk::BinaryThresholdImageFilter< - InternalImageType, - OutputImageType > ThresholdingFilterType; - - //DefiniciÛn del primer filtro de conversiÛn de pixeles - typedef itk::CastImageFilter< - OutputImageType, OutputImageType2 > CastFilterType; - //DefiniciÛn del segundo tipo de conversiÛn de pixeles - typedef itk::CastImageFilter< - OutputImageType2, InternalImageType > CastFilterType2; +//CMRU 03-09-09- ---------------------------------------------------------------------------------------------- + if(pFile != NULL) + { +//------------------------------------------------------------------------------------------------------------ + fileNameContourROI.append("data"); + FILE *pFileData=fopen(fileNameContourROI.c_str(),"r+"); + if(pFileData != NULL) + { + fscanf(pFileData,"%s",tmpD); // --CreaContour-- + fscanf(pFileData,"%s",tmpD); // Version + fscanf(pFileData,"%s",tmpD); // 1.0.3 || 1.0.2 || 1.0.1 || 1.0.0 + + fscanf(pFileData,"%s",tmpD); // onePixelSize + fscanf(pFileData,"%s",tmpD); // # + _onePixelSize = atof(tmpD); + fscanf(pFileData,"%s",tmpD); // NumberOfContours + fscanf(pFileData,"%s",tmpD); // # + } - //Tercer tipo de conversiÛn - typedef itk::RescaleIntensityImageFilter< - InternalImageType, - OutputImageType > CastFilterType3; + fscanf(pFile,"%s",tmp); // --CreaContour-- - //Cuarto tipo de conversiÛn - typedef itk::RescaleIntensityImageFilter< - OutputImageType, - OutputImageType > CastFilterType4; + fscanf(pFile,"%s",tmp); // Version + fscanf(pFile,"%s",tmp); // 1.0.3 || 1.0.2 || 1.0.1 || 1.0.0 + std::string version(tmp); - ThresholdingFilterType::Pointer thresholder = ThresholdingFilterType::New(); - - thresholder->SetLowerThreshold( 0.0 ); - thresholder->SetUpperThreshold( 128 ); + //AD:02-06-09 + _tmpReadFileTypeOfTransformation=-1; + if (version=="1.0.3") + { + readDimSpc(pFile,interactiveInterface); // DimSpc interactive ON + openContours(pFile,pFileData,false); + openContours(pFile,pFileData,true); //Load StaticContours + } - thresholder->SetOutsideValue( 255 ); - thresholder->SetInsideValue( 0 ); + if (version=="1.0.2") + { +//EED001 + readDimSpc(pFile,interactiveInterface); // DimSpc interactive ON + openContours(pFile,pFileData,false); + readDimSpc(pFile,false); // DimSpc interactive OFF + openContours(pFile,pFileData,true); //Load StaticContours + } - //DefinciÛn de conexiÛnes entre VTK e ITK y el writer - typedef itk::VTKImageToImageFilter ConnectorType; - typedef itk::ImageToVTKImageFilter ConnectorType2; - typedef itk::ImageFileWriter< OutputImageType > WriterType; + //AD:02-06-09 + else if (version=="1.0.1") + { + openContours(pFile,pFileData,false); //Skips ImageDimensions and ImageSpacing + openContours(pFile,pFileData,true); //Load StaticContours, skips ImageDimensions and ImageSpacing + } - ConnectorType::Pointer connector= ConnectorType::New(); - ConnectorType2::Pointer connector2= ConnectorType2::New(); - + //AD:02-06-09 + else if (version=="1.0.0") + { + openContours(pFile,pFileData,false); //Skips ImageDimensions and ImageSpacing + } - CastFilterType::Pointer filter=CastFilterType::New(); - CastFilterType2::Pointer filter2=CastFilterType2::New(); + fclose(pFile); - connector->SetInput( imagedata ); - filter2->SetInput(connector->GetOutput()); + if(pFileData != NULL) + { + fclose(pFileData); + } + } + _theViewPanel->getSceneManager()->removeSceneContours(); + changeInstant(); - typedef itk::CurvatureAnisotropicDiffusionImageFilter< - InternalImageType, - InternalImageType > SmoothingFilterType; +} - SmoothingFilterType::Pointer smoothing = SmoothingFilterType::New(); - typedef itk::GradientMagnitudeRecursiveGaussianImageFilter< - InternalImageType, - InternalImageType > GradientFilterType; - typedef itk::SigmoidImageFilter< - InternalImageType, - InternalImageType > SigmoidFilterType; +void wxContourMainFrame::onImport(){ + std::string filename, filenamecontours; + wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxOPEN ); - GradientFilterType::Pointer gradientMagnitude = GradientFilterType::New(); + if (dialog.ShowModal() == wxID_OK) + { + filename = dialog.GetPath().mb_str(); + filenamecontours = kernelManager->parseOsirixFile(filename); - SigmoidFilterType::Pointer sigmoid = SigmoidFilterType::New(); + if(filenamecontours.compare("") != 0){ + onLoadContours(filenamecontours,true); + } - sigmoid->SetOutputMinimum( 0.0 ); - sigmoid->SetOutputMaximum( 255.0 ); + } +} +void wxContourMainFrame::onTest(){ + std::string filename, filenamecontours; + wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxOPEN ); + if (dialog.ShowModal() == wxID_OK) + { + filename = dialog.GetPath().mb_str(); + std::cout << "This is the filename: " << filename << std::endl; + } +} - typedef itk::FastMarchingImageFilter< - InternalImageType, - InternalImageType > FastMarchingFilterType; + +//AD: 29-05-09 +void wxContourMainFrame::onSave(){ +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + if(GetFileLocation().empty()) + { +//------------------------------------------------------------------------------------------------------------ + wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxSAVE ); + if (dialog.ShowModal() == wxID_OK) + { + std::string fileNameContourROI = (const char *)(dialog.GetPath().mb_str()); + kernelManager->setCurrentFileName(fileNameContourROI); + saveFileWithContours( fileNameContourROI ); + } + } +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + else + { + std::cout<<"Nombre del archivo: "<setCurrentFileName(fileNameContourROI); + saveFileWithContours( fileNameContourROI); + } +//------------------------------------------------------------------------------------------------------------ +} + +//AD: 29-05-09 +void wxContourMainFrame::saveFileWithContours( std::string filename ) +{ + + FILE *pFile=fopen(filename.c_str(),"w+"); + +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + filename.append("data"); + std::cout<<"Nombre del archivo: "< lstNameThings; + int i,sizeLstNameThings; + + fprintf(pFile,"--CreaContour--\n"); + fprintf(pFile,"Version %s\n", "1.0.3" ); + +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + fprintf(pFileData,"--CreaContour--\n"); + fprintf(pFileData,"Version %s\n", "1.0.3" ); + fprintf(pFileData,"OnePixelSize %f\n", _onePixelSize); + +//------------------------------------------------------------------------------------------------------------ + + vtkImageData *image = _images[0]; + + int dimRange[3]; + image->GetDimensions(dimRange); + + fprintf(pFile,"ImageDimensions %d %d %d\n", dimRange[0], dimRange[1], dimRange[2] ); + + double spaRange[3]; + image->GetSpacing(spaRange); + + fprintf(pFile,"ImageSpacing %f %f %f\n", spaRange[0], spaRange[1], spaRange[2] ); + + // Normal Contours + + lstNameThings = kernelManager->GetLstNameThings(); + sizeLstNameThings = lstNameThings.size(); + fprintf(pFile,"NumberOfContours %d\n", sizeLstNameThings ); + +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + fprintf(pFileData,"NumberOfContours %d\n", sizeLstNameThings ); +//------------------------------------------------------------------------------------------------------------ + + for (i=0 ; igetOutlineByKeyName(lstNameThings[i]); + double sizeInPixel = manualModel ->GetPathSize(); + double realContourSize = sizeInPixel*_onePixelSize; + manualModel ->SetRealSize(realContourSize); +//------------------------------------------------------------------------------------------------------------ + + //int size= kernelManager->GetLstNameThings().size(); + + kernelManager->SaveThingName( pFile, pFileData, lstNameThings[i] ); + _theViewPanel->getSceneManager()->SaveThingName( pFile, lstNameThings[i] ); + }// for i + + //-- Static Contours + +// fprintf(pFile,"ImageDimensions %d %d %d\n", dimRange[0], dimRange[1], dimRange[2] ); +// fprintf(pFile,"ImageSpacing %f %f %f\n", spaRange[0], spaRange[1], spaRange[2] ); + + lstNameThings = kernelManager->GetLstNameThingsStatic(); + sizeLstNameThings = lstNameThings.size(); + fprintf(pFile,"NumberOfContoursStatic %d\n", sizeLstNameThings ); + +//CMRU 03-09-09----------------------------------------------------------------------------------------------- + fprintf(pFileData,"NumberOfContoursStatic %d\n", sizeLstNameThings ); +//------------------------------------------------------------------------------------------------------------ + + for (i=0 ; iSaveThingName( pFile, pFileData, lstNameThings[i] ); + _theViewPanel->getSceneManager()->SaveThingName( pFile, lstNameThings[i] ); + }// for i + fclose(pFile); + fclose(pFileData); +} + + +//EED02 +void wxContourMainFrame::readDimSpc(FILE *pFile, bool interactiveOption) +{ + char tmp[255]; + int imageDim[3]; + double imageSpac[3]; + vtkImageData *image = _images[0]; + image->GetDimensions(imageDim); + image->GetSpacing(imageSpac); + + fscanf(pFile,"%s",tmp); // ImageDimensions + fscanf(pFile,"%s",tmp); // X + _tmpReadFileImageDim[0] = atoi(tmp); + fscanf(pFile,"%s",tmp); // Y + _tmpReadFileImageDim[1] = atoi(tmp); + fscanf(pFile,"%s",tmp); // Z + _tmpReadFileImageDim[2] = atoi(tmp); + + fscanf(pFile,"%s",tmp); // ImageSpacing + fscanf(pFile,"%s",tmp); // X + _tmpReadFileImageSpac[0] = atof(tmp); + fscanf(pFile,"%s",tmp); // Y + _tmpReadFileImageSpac[1] = atof(tmp); + fscanf(pFile,"%s",tmp); // Z + _tmpReadFileImageSpac[2] = atof(tmp); + + + if (interactiveOption==true) + { + //Compare Spacing and Dims in X and Y (Necessary in Z?) - Just for Version 2 + if (imageDim[0]!=_tmpReadFileImageDim[0] || imageDim[1]!=_tmpReadFileImageDim[1] || imageSpac[0]!=_tmpReadFileImageSpac[0] || imageSpac[1]!=_tmpReadFileImageSpac[1]) + { + wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(260,160)); + wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); + wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL); + + wxString lstOptOperation[2]; + lstOptOperation[0]=_T("By Dimension"); + lstOptOperation[1]=_T("By Spacing"); + wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,45), 2 , lstOptOperation, 2, wxRA_SPECIFY_COLS); + + dialSizer->Add( new wxStaticText(dial,-1,_T("The image resolution is not compatible with the ")) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1,_T("selected Roi file. Do you want to tranform it?")) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1,_T(" ")) , 0, wxGROW ); + dialSizer->Add(radioOpts,0,wxGROW); + dialSizer->Add( new wxStaticText(dial,-1,_T(" ")) , 0, wxGROW ); + dialSizer->Add(buttonsSizer,0,wxGROW); + dial->SetSizer(dialSizer, true); + dial->Layout(); + dial->ShowModal(); + + int _tmpReadFileTypeOfTransformation = -1; +//EED bool transform = false; + + if (dial->GetReturnCode() == wxID_OK) + { + _tmpReadFileTypeOfTransformation = radioOpts->GetSelection(); + }// if wxOK + + } // if dim spc + } // if interactiveOption +} + + + + +//AD:04-06-09 +void wxContourMainFrame::openContours( FILE *pFile, FILE *pFileData, bool staticContour ) +{ + + char tmp[255]; + + vtkImageData *image = _images[0]; + + int imageDim[3]; + double imageSpac[3]; + image->GetDimensions(imageDim); + image->GetSpacing(imageSpac); + + + fscanf(pFile,"%s",tmp); // NumberOfContours + fscanf(pFile,"%s",tmp); // ## + int numberOfContours = atoi(tmp); + + std::vector instantVector; + int typeContourModel; + manualBaseModel *manModelContour; + int typeView; + +/* + if (compatible==true) + { + int i; + for (i=0;ifactoryManualContourModel(typeContourModel); + manModelContour->Open(pFile); + if(pFileData != NULL) + { + manModelContour->OpenData(pFileData); + } + + fscanf(pFile,"%s",tmp); // TypeView + fscanf(pFile,"%s",tmp); // ## + typeView = atoi(tmp); + + std::string theName; + theName = kernelManager->createOutline( manModelContour, instantVector ); + bool addedModel = theName.compare("") != 0; + if( addedModel ) + { + double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default + _theViewPanel->getSpacing(spc); + //Adding the manualContourControler to interface objects structure + //Adding the manualViewContour to interface objects structure + //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. + _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , typeView) ; + } + + if (staticContour) //StaticContours (will appear in all slices) + { + Instant instant(&instantVector); + kernelManager->changeContourOfManager( theName , &instant ); + } + + }// for numberOfContours + } + + else if (compatible==false) + { +*/ + + int i; + for (i=0;ifactoryManualContourModel(typeContourModel); + manModelContour->Open(pFile); + if(pFileData != NULL) + { + manModelContour->OpenData(pFileData); + } + + if (_tmpReadFileTypeOfTransformation==-1){ + //nothing to do.. + } else if (_tmpReadFileTypeOfTransformation==0){ + double transX, transY; + transX = (double) imageDim[0]/_tmpReadFileImageDim[0]; + transY = (double) imageDim[1]/_tmpReadFileImageDim[1]; + manModelContour->Transform_Ax_Plus_B(transX,0,transY,0); + } else if (_tmpReadFileTypeOfTransformation==1) { + double transX, transY; + transX = (double) _tmpReadFileImageSpac[0]/imageDim[0]; + transY = (double) _tmpReadFileImageSpac[1]/imageDim[1]; + manModelContour->Transform_Ax_Plus_B(transX,0,transY,0); + } + + fscanf(pFile,"%s",tmp); // TypeView + fscanf(pFile,"%s",tmp); // ## + typeView = atoi(tmp); + + std::string theName; + theName = kernelManager->createOutline( manModelContour, instantVector ); + bool addedModel = theName.compare("") != 0; + if( addedModel ) + { + double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default + _theViewPanel->getSpacing(spc); + //Adding the manualContourControler to interface objects structure + //Adding the manualViewContour to interface objects structure + //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. + _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , typeView) ; + } + + if (staticContour) //StaticContours (will appear in all slices) + { + Instant instant(&instantVector); + kernelManager->changeContourOfManager( theName , &instant ); + } + }// for numberOfContours + +/* } */ + +} + +void wxContourMainFrame::RefreshInterface(){ + changeInstant(); + _theViewPanel->RefreshInterface(); + //wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)this->_theViewPanel->getWxVtkBaseView(); + //wxvtk2dbaseview->Refresh(); +} + +vtkImageData* wxContourMainFrame::getImageData(){ + return _theViewPanel->getImageData(); +} + +void wxContourMainFrame::onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation) +{ + //JCP 20-10-08 Undo redo implementation + saveState(); + //JCP 20-10-08 Undo redo implementation + + wxBusyCursor wait; + int x = _theViewPanel->GetX(); + int y = _theViewPanel->GetY(); + int z = _theViewPanel->GetZ(); + SegmentationOneSliceITK( x,y,z,distance, sigma, alfa, beta, propagation, iterations, inflation); + RefreshInterface(); +} + +void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString distanc, wxString sigm, wxString alf, wxString bet, wxString prop, wxString iter, wxString inflation) +{ + int typeofcontour = 1; + //Image Data + vtkImageData *imagedata = getImageData(); + + //Tipo de pixeles a utilizar internamente en ITK + typedef float InternalPixelType; + const unsigned int Dimension = 2; + typedef itk::Image< InternalPixelType, Dimension > InternalImageType; + + //Tipo de pixeles de salida 1 + typedef unsigned char OutputPixelType; + typedef itk::Image< OutputPixelType, Dimension > OutputImageType; + + //Tipo de pixeles de salida 2 + typedef unsigned short OutputPixelType2; + typedef itk::Image< OutputPixelType2, Dimension > OutputImageType2; + + //DefiniciÛn del thresholder + typedef itk::BinaryThresholdImageFilter< + InternalImageType, + OutputImageType > ThresholdingFilterType; + + //DefiniciÛn del primer filtro de conversiÛn de pixeles + typedef itk::CastImageFilter< + OutputImageType, OutputImageType2 > CastFilterType; + + //DefiniciÛn del segundo tipo de conversiÛn de pixeles + typedef itk::CastImageFilter< + OutputImageType2, InternalImageType > CastFilterType2; + + //Tercer tipo de conversiÛn + typedef itk::RescaleIntensityImageFilter< + InternalImageType, + OutputImageType > CastFilterType3; + + //Cuarto tipo de conversiÛn + typedef itk::RescaleIntensityImageFilter< + OutputImageType, + OutputImageType > CastFilterType4; + + ThresholdingFilterType::Pointer thresholder = ThresholdingFilterType::New(); + + thresholder->SetLowerThreshold( 0.0 ); + thresholder->SetUpperThreshold( 128 ); + + thresholder->SetOutsideValue( 255 ); + thresholder->SetInsideValue( 0 ); + + //DefinciÛn de conexiÛnes entre VTK e ITK y el writer + typedef itk::VTKImageToImageFilter ConnectorType; + typedef itk::ImageToVTKImageFilter ConnectorType2; + typedef itk::ImageFileWriter< OutputImageType > WriterType; + + ConnectorType::Pointer connector= ConnectorType::New(); + ConnectorType2::Pointer connector2= ConnectorType2::New(); + + + CastFilterType::Pointer filter=CastFilterType::New(); + CastFilterType2::Pointer filter2=CastFilterType2::New(); + + connector->SetInput( imagedata ); + filter2->SetInput(connector->GetOutput()); + + typedef itk::CurvatureAnisotropicDiffusionImageFilter< + InternalImageType, + InternalImageType > SmoothingFilterType; + + SmoothingFilterType::Pointer smoothing = SmoothingFilterType::New(); + + typedef itk::GradientMagnitudeRecursiveGaussianImageFilter< + InternalImageType, + InternalImageType > GradientFilterType; + + typedef itk::SigmoidImageFilter< + InternalImageType, + InternalImageType > SigmoidFilterType; + + GradientFilterType::Pointer gradientMagnitude = GradientFilterType::New(); + + SigmoidFilterType::Pointer sigmoid = SigmoidFilterType::New(); + + sigmoid->SetOutputMinimum( 0.0 ); + sigmoid->SetOutputMaximum( 255.0 ); + + + typedef itk::FastMarchingImageFilter< + InternalImageType, + InternalImageType > FastMarchingFilterType; FastMarchingFilterType::Pointer fastMarching = FastMarchingFilterType::New(); - typedef itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType, + typedef itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType, InternalImageType > GeodesicActiveContourFilterType; - GeodesicActiveContourFilterType::Pointer geodesicActiveContour = + GeodesicActiveContourFilterType::Pointer geodesicActiveContour = GeodesicActiveContourFilterType::New(); - typedef itk::ZeroCrossingImageFilter< - InternalImageType, + typedef itk::ZeroCrossingImageFilter< + InternalImageType, InternalImageType > ZeroCrossingFilterType; ZeroCrossingFilterType::Pointer zeroCrossing = ZeroCrossingFilterType::New(); @@ -1058,12 +1543,12 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d fastMarching->SetInput( sigmoid->GetOutput() ); geodesicActiveContour->SetInput( fastMarching->GetOutput() ); geodesicActiveContour->SetFeatureImage( sigmoid->GetOutput() ); - + zeroCrossing->SetInput( geodesicActiveContour->GetOutput() ); //thresholder->SetInput( zeroCrossing->GetOutput() ); thresholder->SetInput( geodesicActiveContour->GetOutput() ); connector2->SetInput( thresholder->GetOutput() ); - + smoothing->SetTimeStep( 0.125 ); smoothing->SetNumberOfIterations( 5 ); @@ -1078,7 +1563,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d sigmoid->SetAlpha( alpha ); sigmoid->SetBeta( beta ); - + typedef FastMarchingFilterType::NodeContainer NodeContainer; typedef FastMarchingFilterType::NodeType NodeType; @@ -1096,33 +1581,33 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d node.SetValue( seedValue ); node.SetIndex( seedPosition ); - + seeds->Initialize(); seeds->InsertElement( 0, node ); fastMarching->SetTrialPoints( seeds ); fastMarching->SetSpeedConstant( 1.0 ); - - fastMarching->SetOutputSize( + + fastMarching->SetOutputSize( connector->GetOutput()->GetBufferedRegion().GetSize() ); - + fastMarching->SetStoppingValue( 800 ); try { - + connector2->Update(); vtkImageData *idata = connector2->GetOutput(); vtkMarchingContourFilter* cntVTK = vtkMarchingContourFilter::New( ); - + cntVTK->SetInput( idata ); - + cntVTK->SetNumberOfContours( 1 ); cntVTK->SetValue( 0, 255 ); cntVTK->Update( ); cntVTK->UpdateInformation(); - + vtkCleanPolyData* cpd = vtkCleanPolyData::New( ); cpd->SetInput( cntVTK->GetOutput( ) ); cpd->Update( ); @@ -1212,7 +1697,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d vecXo.push_back(p[0]); vecYo.push_back(p[1]); } - + } else*/ if(fabs(xAct-x)>11) { @@ -1231,8 +1716,8 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d xAct=x; yAct=y; } - - + + } while(!vecXo.empty()) @@ -1268,7 +1753,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d ExtractControlPoints2D *extractcontrolpoints2d = new ExtractControlPoints2D(); extractcontrolpoints2d->SetContour( &vecX , &vecY , &vecZ ); - + int method=2; if (method==0){ extractcontrolpoints2d->GetInitialControlPoints( &vecCtrlPointX , &vecCtrlPointY , &vecCtrlPointZ ); @@ -1287,8 +1772,8 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d actualInstantVector[1]=z; int j,sizeCtrPt = vecCtrlPointX.size(); - - manualContourModel *manModelContour = kernelManager->factoryManualContourModel( typeofcontour ); + + manualBaseModel *manModelContour = kernelManager->factoryManualContourModel( typeofcontour ); manModelContour->SetNumberOfPointsSpline( ((sizeCtrPt/100)+1)*100 ); if (sizeCtrPt>=3){ for (j=0 ; jgetSpacing(spc); + _theViewPanel->getSpacing(spc); //Adding the manualContourControler to interface objects structure - //Adding the manualViewContour to interface objects structure + //Adding the manualViewContour to interface objects structure //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. _theViewPanel->configureViewControlTo(theName, manModelContour, spc, typeofcontour); //_theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc, typeofcontour ) ; } // if addedModel } // if sizeCtrPt - - + + WriterType::Pointer writer = WriterType::New(); CastFilterType3::Pointer caster = CastFilterType3::New(); - + caster->SetInput( gradientMagnitude->GetOutput() ); writer->SetInput( caster->GetOutput() ); writer->SetFileName("Gradient Magnitude.png"); caster->SetOutputMinimum( 0 ); caster->SetOutputMaximum( 255 ); writer->Update(); - + CastFilterType3::Pointer caster2 = CastFilterType3::New(); WriterType::Pointer writer2 = WriterType::New(); @@ -1371,11 +1856,11 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d } void wxContourMainFrame::onSegmentationOneSlice(int isovalue,int sampling,int method){ - + //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation - + wxBusyCursor wait; int x = _theViewPanel->GetX(); int y = _theViewPanel->GetY(); @@ -1386,12 +1871,12 @@ void wxContourMainFrame::onSegmentationOneSlice(int isovalue,int sampling,int me void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue, int sampling, int method ) -{ +{ int typeofcontour = 1; //--Extracting Contour //vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData(); vtkImageData *imagedata = getImageData(); -// double *range = imagedata->GetScalarRange(); +// double *range = imagedata->GetScalarRange(); // double thr = 1; vtkImageReslice *imageReslice = vtkImageReslice::New(); @@ -1423,7 +1908,7 @@ void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue // cntVTK->SetValue( 1, vmax ); cntVTK->Update( ); cntVTK->UpdateInformation(); - + vtkCleanPolyData* cpd = vtkCleanPolyData::New( ); cpd->SetInput( cntVTK->GetOutput( ) ); cpd->ConvertLinesToPointsOff( ); @@ -1433,13 +1918,13 @@ void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue vtkPolyDataConnectivityFilter* conn = vtkPolyDataConnectivityFilter::New( ); conn->SetExtractionModeToClosestPointRegion( ); //conn->SetMaxRecursionDepth( 3000 ); - + conn->SetInput( cpd->GetOutput( ) ); - + conn->SetClosestPoint( x, y, 0 ); conn->Update( ); conn->UpdateInformation(); - + vtkCleanPolyData* cpd2 = vtkCleanPolyData::New( ); cpd2->SetInput( conn->GetOutput( ) ); cpd2->Update(); @@ -1532,7 +2017,7 @@ myfile.close(); actualInstantVector[1]=z; int j,sizeCtrPt = vecCtrlPointX.size(); - manualContourModel *manModelContour = kernelManager->factoryManualContourModel( typeofcontour ); + manualBaseModel *manModelContour = kernelManager->factoryManualContourModel( typeofcontour ); manModelContour->SetNumberOfPointsSpline( ((sizeCtrPt/100)+1)*100 ); if (sizeCtrPt>=3){ for (j=0 ; jgetSpacing(spc); + _theViewPanel->getSpacing(spc); //Adding the manualContourControler to interface objects structure - //Adding the manualViewContour to interface objects structure + //Adding the manualViewContour to interface objects structure //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. _theViewPanel->configureViewControlTo(theName, manModelContour, spc, typeofcontour); //_theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc, typeofcontour ) ; @@ -1567,13 +2052,13 @@ void wxContourMainFrame::onSegmentationAllSlice(int minZ,int maxZ,int isovalue,i //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation - + wxBusyCursor wait; int x = _theViewPanel->GetX(); int y = _theViewPanel->GetY(); int z; - double porcent; - wxString tmpString; + double porcent; + wxString tmpString; double totalZ = maxZ-minZ+1; for( z=minZ ; z<=maxZ ; z++ ) { @@ -1616,18 +2101,27 @@ void wxContourMainFrame::referenceLine() _refLineView->SetWidthLine(4); _refLineControl->SetModelView( _refLineModel , _refLineView ); - viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl ); + vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView(); + style->AddInteractorStyleMaracas( _refLineControl ); _refLineModel->SetCloseContour(false); _refLineControl->CreateNewManualContour(); -//EED?? double z = _refLineControl->GetZ(); +//AD: Inicializar el mirroring con una linea ya pintada /* - _refLineControl->AddPoint(50,100,z); - _refLineControl->AddPoint(80,40,z); + double z = _refLineControl->GetZ(); + + int imageDim[3]; + image->GetDimensions(imageDim); + double x = (double) imageDim[0]/2; + double y1 = (double) (imageDim[1]/2)+15; + double y2 = (double) (imageDim[1]/2)-15; + + _refLineControl->AddPoint(x,y1,z); + _refLineControl->AddPoint(x,y2,z); _refLineControl->SetCompleteCreation(true); - _refLineModel->AddPoint(50,100,z); - _refLineModel->AddPoint(80,40,z); + _refLineModel->AddPoint(x,y1,z); + _refLineModel->AddPoint(x,y2,z); _refLineModel->UpdateSpline(); _refLineView->UpdateViewPoint(0); @@ -1670,7 +2164,8 @@ void wxContourMainFrame::refLineShow() _refLineView->SetZ( 1200 ); _refLineControl->SetModelView( _refLineModel , _refLineView ); - viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl ); + vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView(); + style->AddInteractorStyleMaracas( _refLineControl ); _refLineControl->CreateNewManualContour(); _refLineControl->SetActive(true); _refLineView->RefreshContour(); @@ -1712,219 +2207,33 @@ void wxContourMainFrame::onMirror() _instantPanel->getInstant( tempVector ); _performingOperation->setEndOperationInstantVector ( tempVector ); std::vector elems = _performingOperation->getKeyNamesOperationElems(); - int i,size = elems.size(); + int i,size = elems.size(); for( i=0; i0 ); - } + } } //deleteContour( _refName ); //_refName = ""; } -void wxContourMainFrame::onThreshold() + +void wxContourMainFrame::showAxis(bool show) { - int z = _theViewPanel->GetZ(); - double range[2]; + _theViewPanel->SetVisibleAxis(show); + _theViewPanel->Refresh(); +} - vtkImageData * img = getImageData(); - img->GetScalarRange(range); - int minTot = floor (range[0]); - int maxTot = ceil (range[1]); +void wxContourMainFrame::onRigidPressed(){ + std::vector currentSelection = _theViewPanel->getSelectedObjects(); + int elementsSelected = currentSelection.size(); - double minMax[2]; - _pannew->onThresholdInstantChange(minMax); - int minVal = floor (minMax[0]); - int maxVal = floor (minMax[1]); - - if (!_actorPresent) - { - if (_imageReslicer==NULL) - { - _imageReslicer = vtkImageReslice::New(); - _imageReslicer->SetInput( img ); - _imageReslicer->SetInformationInput(img); - _imageReslicer->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1); - _imageReslicer->SetOutputDimensionality(2); - _imageReslicer->SetInterpolationModeToLinear(); - } - - _imageReslicer->SetResliceAxesOrigin(0,0,z); - - img = _imageReslicer->GetOutput(); - img->Update(); - img->UpdateInformation(); - - wxVtkBaseView * baseView = _theViewPanel->getWxVtkBaseView(); - - if (_thresholdTable==NULL) - { - //Lookup Table - _thresholdTable = vtkLookupTable::New(); - _thresholdTable->SetNumberOfTableValues(maxTot+1); - _thresholdTable->SetTableRange(range); - _thresholdTable->SetAlphaRange(0, 1); - _thresholdTable->SetValueRange(0, 1); - _thresholdTable->SetSaturationRange(0, 0); - _thresholdTable->SetRampToLinear( ); - } - - //Assign a fake color for the upper image, and set the white as transparent - int i; - for(i = minTot; i <= maxTot; i++) - { - if( i >= minVal && i <= maxVal ) - { - _thresholdTable->SetTableValue(i, 1.0, 0.0, 0.0, 1); - } - else if( i >= minTot && i < minVal ) - { - _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent - } - else if( i > maxVal && i < maxTot ) - { - _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent - } - else - { - _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent - } - } - _thresholdTable->Build( ); - - if (_thresholdMapper==NULL) - { - _thresholdMapper = vtkImageMapToColors::New( ); - } - - _thresholdMapper->SetLookupTable( _thresholdTable ); - _thresholdMapper->SetInput( img ); - - if (_thresholdActor==NULL) - { - _thresholdActor = vtkImageActor::New( ); - _thresholdActor->SetOpacity( 0.6 ); - _thresholdActor->InterpolateOn( ); - _thresholdActor->SetPosition( 0,0, 900-1 ); - } - - _thresholdActor->SetInput( _thresholdMapper->GetOutput() ); - - baseView->GetRenderer()->AddActor( _thresholdActor ); - _actorPresent = true; - } - - else - { - _imageReslicer->SetResliceAxesOrigin(0,0,z); - img = _imageReslicer->GetOutput(); - img->Update(); - img->UpdateInformation(); - - //Assign a fake color for the upper image, and set the white as transparent - int i; - for(i = minTot; i <= maxTot; i++) - { - if( i >= minVal && i <= maxVal ) - { - _thresholdTable->SetTableValue(i, 1.0, 0.0, 0.0, 1); - } - else if( i >= minTot && i < minVal ) - { - _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent - } - else if( i > maxVal && i < maxTot ) - { - _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent - } - else - { - _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent - } - } - - _thresholdTable->Build( ); - _thresholdMapper->SetLookupTable( _thresholdTable ); - _thresholdMapper->SetInput( img ); - _thresholdActor->SetInput( _thresholdMapper->GetOutput() ); - } - /* - vtkImageViewer2* viewer = vtkImageViewer2::New(); - viewer->SetInput( upperImageActor->GetInput() ); - viewer->SetColorLevel((range[1]-range[0])/2); - viewer->SetColorWindow(range[1]); - viewer->GetRenderer()->AddActor( upperImageActor ); - viewer->Render(); - */ - _theViewPanel->RefreshInterface(); -} - - -void wxContourMainFrame::onThresholdChange() -{ - if (_actorPresent) - { - onThreshold(); - } -} - -void wxContourMainFrame::onThresholdInterpolation(bool interpolate) -{ - if (_thresholdActor!=NULL) - { - if (interpolate) - { - _thresholdActor->InterpolateOn( ); - } - - else - { - _thresholdActor->InterpolateOff( ); - } - - _theViewPanel->RefreshInterface(); - } -} - -void wxContourMainFrame::onThresholdChangeOpacity (int opacity) -{ - if (_actorPresent) - { - _thresholdActor->SetOpacity(opacity*0.1); - } - - _theViewPanel->RefreshInterface(); -} - -void wxContourMainFrame::onThresholdRemove() -{ - if (_actorPresent) - { - wxVtkBaseView * baseView = _theViewPanel->getWxVtkBaseView(); - baseView->GetRenderer()->RemoveActor( _thresholdActor ); - _actorPresent = false; - } - - _theViewPanel->RefreshInterface(); -} - -void wxContourMainFrame::showAxis(bool show) -{ - _theViewPanel->SetVisibleAxis(show); - _theViewPanel->Refresh(); -} - - -void wxContourMainFrame::onRigidPressed(){ - std::vector currentSelection = _theViewPanel->getSelectedObjects(); - int elementsSelected = currentSelection.size(); - - if ( elementsSelected >= 1 ){ - //JCP 20-10-08 Undo redo implementation - saveState(); - //JCP 20-10-08 Undo redo implementation + if ( elementsSelected >= 1 ){ + //JCP 20-10-08 Undo redo implementation + saveState(); + //JCP 20-10-08 Undo redo implementation std::vector tempVector; _instantPanel->getInstant( tempVector ); @@ -1942,15 +2251,37 @@ void wxContourMainFrame::onWidthOfContour(double width){ _theViewPanel->removeSceneContours(); _theViewPanel->SetWidthContour(width); - + //_theViewPanel->getSceneManager()->SetWidthContour( width ); RefreshInterface(); } -int wxContourMainFrame::getColorWindow(){ + +int wxContourMainFrame::getColorWindow() +{ + /* + double range[2]; + vtkImageData * img = getImageData(); + img->GetScalarRange(range); + + std::cout<<"Val 1: "<getColorWindow(); } -int wxContourMainFrame::getWindowLevel(){ + +int wxContourMainFrame::getWindowLevel() +{ + /* + double range[2]; + vtkImageData * img = getImageData(); + img->GetScalarRange(range); + + std::cout<<"Val 1: "<getWindowLevel(); } @@ -1961,7 +2292,7 @@ void wxContourMainFrame::onBrigthnessColorWindowLevel(int colorwindow,int window } void wxContourMainFrame::onInterpolation(bool interpolate){ - _theViewPanel->onInterpolation(interpolate); + _theViewPanel->onInterpolation(interpolate); RefreshInterface(); } @@ -1969,33 +2300,68 @@ void wxContourMainFrame::onChangeInstant(std::string name,int actual){ _instantPanel->setConceptValue( name, actual ); } + void wxContourMainFrame::resetAppend(){ kernelManager->resetAppend(); - + } + void wxContourMainFrame::onSpreadAdd(){ - std::vector vecX; - std::vector vecY; - std::vector vecZ; + std::vector vecX; + std::vector vecY; + std::vector vecZ; _theViewPanel->GetPointsOfActualContour(&vecX , &vecY , &vecZ ); - std::vector tempVector; _instantPanel->getInstant( tempVector ); - std::string val = kernelManager->onSpreadAdd(&vecX , &vecY , &vecZ, tempVector); - interfMainPanel::getInstance()->appendStringSpread(val); - } -void wxContourMainFrame::onSpreadGo(int type){ +void wxContourMainFrame::onSpreadAddAll(){ +//EED02 + std::vector tempVector; + _instantPanel->getInstant( tempVector ); + int minZ,maxZ; + minZ = 0; + maxZ = interfMainPanel::getInstance()->GetImageDataSizeZ(); + int z; + int sizeLstContourThings; + for ( z=minZ ; z<=maxZ ; z++ ) + { + tempVector[1]=z; + Instant instant(&tempVector); + std::vector lstContourThings = kernelManager->getOutlinesAtInstant( &instant ); + sizeLstContourThings = lstContourThings.size(); + if (sizeLstContourThings>=1) + { + std::vector vecX; + std::vector vecY; + std::vector vecZ; + ContourThing **contourthing = lstContourThings[0]; + manualBaseModel *cModel = (*contourthing)->getModel(); + int i,size = cModel->GetNumberOfPointsSpline(); + double x,y,z; + for (i=0; iGetSpline_i_Point(i, &x, &y, &z); + vecX.push_back(x); + vecY.push_back(y); + vecZ.push_back(z); + } // for i + std::string val = kernelManager->onSpreadAdd(&vecX , &vecY , &vecZ, tempVector); + interfMainPanel::getInstance()->appendStringSpread(val); + }// if sizeLstContourThings + } // for z +} + + +void wxContourMainFrame::onSpreadGo(int type){ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation - - wxBusyCursor wait; + wxBusyCursor wait; std::vector vecCtrlPointX; std::vector vecCtrlPointY; std::vector vecCtrlPointZ; @@ -2020,34 +2386,34 @@ void wxContourMainFrame::onSpreadGo(int type){ porcent = 100.0* (z-minZ)/totalZ; int numero = (int)(z-minZ+1)/(int)totalZ; std::string stringtemp = " "+kernelManager->intToString(porcent)+"% "+kernelManager->intToString(numero)+" "+kernelManager->intToString(z); - - interfMainPanel::getInstance()->setStringSpread(stringtemp); + + interfMainPanel::getInstance()->setStringSpread(stringtemp); int typeofcontour = 1; std::string theName; - manualContourModel* manModelContour = kernelManager->GetPoints(z, type, &vecCtrlPointX,&vecCtrlPointY,&vecCtrlPointZ, theName,typeofcontour, tempVector); + manualBaseModel* manModelContour = kernelManager->GetPoints(z, type, &vecCtrlPointX,&vecCtrlPointY,&vecCtrlPointZ, theName,typeofcontour, tempVector); if( manModelContour!=NULL ){ double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default - this->_theViewPanel->getSpacing(spc); + this->_theViewPanel->getSpacing(spc); //Adding the manualContourControler to interface objects structure - //Adding the manualViewContour to interface objects structure + //Adding the manualViewContour to interface objects structure //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active. _theViewPanel->configureViewControlTo( theName, manModelContour,spc,typeofcontour ) ; } // if addedModel - } + } if(z > maxZ){ porcent = 100.0; int numero = (int)(z-minZ+1)/(int)totalZ; std::string stringtemp = " "+kernelManager->intToString(porcent)+"% "+kernelManager->intToString(numero)+" "+kernelManager->intToString(z); - + interfMainPanel::getInstance()->setStringSpread(stringtemp); }// for z //RefreshInterface(); } void wxContourMainFrame::getInstantVector(std::vector& tempVector){ - + } std::vector wxContourMainFrame::getOutlinesName(int slide){ @@ -2058,24 +2424,33 @@ std::vector wxContourMainFrame::getOutlinesName(int slide){ return kernelManager->getOutlinesNameAtInstant(tempVector); } -void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ){ + +void wxContourMainFrame::SetScalarRange(int grayRangeMin, int grayRangeMax) +{ + _contourextractdata->SetScalarRange(grayRangeMin,grayRangeMax); +} + + +void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax) +{ +//EED01Juillet2009 GenerateContourExtractData(); + + wxString tempString; int maxContourGroup = 0; - ContourExtractData *contourextractdata = new ContourExtractData(); - - contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); + _contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); - std::vector lstManConMod; - std::vector lstManConModTmp; - std::vector lstManConModExp; + std::vector lstManConMod; + std::vector lstManConModTmp; + std::vector lstManConModExp; std::vector pLstValue; std::vector pLstValuePosX; std::vector pLstValuePosY; std::vector pLstValuePosZ; - int resultSize; + int resultSize; int resultGrayRangeCount; - double resultMin; + double resultMin; double resultMax; double resultAverage; double resultStandardeviation; @@ -2083,54 +2458,46 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel std::vector tempVector; _instantPanel->getInstant( tempVector ); - vtkImageData *imagedata = _theViewPanel->getImageData(); - int sizeZ = _theViewPanel->GetImageDataSizeZ(); +//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getImageData(); +// int sizeZ = _theViewPanel->GetImageDataSizeZ(); int z; int ii,sizeLstContourThings; int minZ,maxZ; double totalZ; - double porcent; + double porcent; wxString tmpString; - if (selection==0 ) // actual slice { - std::vector tempVector; - _instantPanel->getInstant( tempVector ); int actualSlice = tempVector[1]; minZ = actualSlice; maxZ = actualSlice; - } - else if (selection==2 ) // All slices - { - minZ = 0; - maxZ = sizeZ-1; - } - else if (selection==1 ) // slice range - { + } else { // slice range minZ = minimumZ; maxZ = maximumZ; } - + totalZ = maxZ-minZ+1; - contourextractdata->SetImage( imagedata); +//EED01Juillet2009 _contourextractdata->SetImage( imagedata); + + _contourextractdata->InitVolumeStatistics(); // For each slice.. for ( z=minZ ; z<=maxZ ; z++ ) { - + porcent = 100.0* (z-minZ)/totalZ; tmpString.Printf(_T(" %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ ,z); - interfMainPanel::getInstance()->setStringInfoPanel(tmpString); + interfMainPanel::getInstance()->setStringInfoPanel(tmpString); //_staticTextInformation->SetLabel(tmpString); //Extraction data from contours of each slice - contourextractdata->SetZtoBeAnalys( z); + _contourextractdata->SetZtoBeAnalys(z); tempVector[1]=z; Instant instant(&tempVector); @@ -2143,10 +2510,9 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel ContourThing **contourthing = lstContourThings[ii]; lstManConMod.push_back( (*contourthing)->getModel() ); } - lstManConModExp = kernelManager->ExploseEachModel( lstManConMod ); + lstManConModExp = kernelManager->ExploseEachModel( lstManConMod ); - wxString tempString; tempString.Printf(_T("%d - %d"),z, sizeLstContourThings); interfMainPanel::getInstance()->setRowLabelInfoPanel(z, tempString); //_grid->SetRowLabelValue(z, tempString ); @@ -2155,7 +2521,7 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel if (typeContourGroup==3) // contour separete { sizeContourGroup=lstManConModExp.size(); - if ( maxContourGroupSetLstManualContourModel( lstManConModTmp ); + _contourextractdata->SetLstManualContourModel( lstManConModTmp ); + _contourextractdata->SetScalarRange(grayRangeMin,grayRangeMax); pLstValue.clear(); pLstValuePosX.clear(); pLstValuePosY.clear(); pLstValuePosZ.clear(); - contourextractdata->GetValuesInsideCrown( &pLstValue, + + + int numberOfPixels; + _contourextractdata->GetValuesInsideCrown( &numberOfPixels, + &pLstValue, &pLstValuePosX, &pLstValuePosY, &pLstValuePosZ); + + resultSize=numberOfPixels; // Statistics of each slice. - contourextractdata->Statistics( &pLstValue, - minimumZ, - maximumZ, - &resultGrayRangeCount, - &resultSize, - &resultMin, + _contourextractdata->Statistics( &pLstValue, + grayRangeMin, + grayRangeMax, + &resultGrayRangeCount, + &resultSize, + &resultMin, &resultMax, &resultAverage, &resultStandardeviation); - + if (interfMainPanel::getInstance()->getNumberColsInformationPanel()<_numberOfVariablesStatistics*(iContourGroup+1) ) { interfMainPanel::getInstance()->appendColsInformationPanel(_numberOfVariablesStatistics); @@ -2205,28 +2579,68 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel tmpIntA=_numberOfVariablesStatistics*iContourGroup ; - tempString.Printf(_T("%d"),resultSize); - interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA, tempString); + tempString.Printf(_T("%d"),numberOfPixels); + + interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA, tempString); tempString.Printf(_T("%d"),resultGrayRangeCount); interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA+1, tempString); - + tempString.Printf(_T("%f"),resultMin); interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA+2, tempString); - + tempString.Printf(_T("%f"),resultMax); interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA+3, tempString); - + tempString.Printf(_T("%f"),resultAverage); interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA+4, tempString); - + tempString.Printf(_T("%f"),resultStandardeviation); interfMainPanel::getInstance()->setCellValueInfoPanel(z, tmpIntA+5, tempString); - + } // for iContourGroup } // for z + // Print Volume Statistics + + + int vol_rCountRange; + int vol_rsize; + double vol_minValue; + double vol_maxValue; + double vol_average; + double vol_standardeviation; + + if (selection!=0 ) // actual slice + { + + _contourextractdata->GetVolumeStatistics(&vol_rCountRange, &vol_rsize, + &vol_minValue, &vol_maxValue, + &vol_average, &vol_standardeviation); + + interfMainPanel::getInstance()->setRowLabelInfoPanel(maxZ+2, _T("Total:")); + + tempString.Printf(_T("%d"),vol_rsize); + interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 0, tempString); + + tempString.Printf(_T("%d"),vol_rCountRange); + interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 1, tempString); + + tempString.Printf(_T("%f"),vol_minValue); + interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 2, tempString); + + tempString.Printf(_T("%f"),vol_maxValue); + interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 3, tempString); + + tempString.Printf(_T("%f"),vol_average); + interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 4, tempString); + + tempString.Printf(_T("%f"),vol_standardeviation); + interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 5, tempString); + } + //----------------------------------------- + int iTitleGroup; wxString tmpTitleString; int tmpIntB; @@ -2243,61 +2657,103 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel interfMainPanel::getInstance()->setColLableInfoPanel( tmpIntB + 4, _T("Average") ); interfMainPanel::getInstance()->setColLableInfoPanel( tmpIntB + 5, _T("St.Dev.") ); interfMainPanel::getInstance()->setColLableInfoPanel( tmpIntB + 6, _T(" ") ); - } - + }// for title interfMainPanel::getInstance()->setStringInfoPanel( _T("") ); - delete contourextractdata; } -void wxContourMainFrame::onSaveResults(std::string directory,std::string namefile, std::string filename, int typeContourGroup){ - SaveValuesXYZ( directory , namefile, typeContourGroup ); +//AD: 29-05-09 +void wxContourMainFrame::onSaveResults(std::string directory,std::string namefile, std::string filename, + int typeContourGroup, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics) +{ + if (XYZValues) + { + SaveValuesXYZ( directory , namefile, typeContourGroup ); + } + + if (contourImage) + { + vtkImageData * mask; + vtkImageData * value; + this->getMaskValue(&mask, &value, typeContourGroup,selection,minZ,maxZ); + this->SaveImageResult( directory , namefile, mask, value); + } - vtkImageData* mask, *value; - this->getMaskValue(mask, value, typeContourGroup); - this->SaveImageResult( directory , namefile, mask, value); + if (statistics) + { + std::ostringstream name; + name << filename << ".xls"; - - FILE *pFile=fopen(filename.c_str(),"w+"); - int sizeZ = _theViewPanel->GetImageDataSizeZ(); + FILE *pFile=fopen(name.str().c_str(),"w+"); - wxString tmpString; - int i,j,maxX,maxY=sizeZ; - maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols(); - int iTitle,sizeTitle = (maxX / _numberOfVariablesStatistics); - for ( iTitle=0; iTitleGetImageDataSizeZ(); +// int maxY=sizeZ+2; + maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols(); - for ( j=0; jgetCellValue(j, i);//_grid->GetCellValue( j , i ); - fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) ); - } // for i - fprintf(pFile,"\n" ); - } // for j + // -- Title -- + int iTitle,sizeTitle = (maxX / _numberOfVariablesStatistics); + for ( iTitle=0; iTitle tempVector; + _instantPanel->getInstant( tempVector ); + int actualSlice = tempVector[1]; + minZ = actualSlice; + maxZ = actualSlice; + } + + // Stadistics... + for ( j=minZ; j<=maxZ ; j++) + { + fprintf(pFile,"%d\t" , j ); + for (i=0 ; igetCellValue(j, i);//_grid->GetCellValue( j , i ); + fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) ); + } // for i + fprintf(pFile,"\n" ); + } // for j + + + // Total of stadistics..... + if (selection!=0) + { + fprintf(pFile,"\n Total:\t" ); + for (i=0 ; igetCellValue(maxZ+2, i);//_grid->GetCellValue( maxZ+2 , i ); + fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) ); + } // for i + fprintf(pFile,"\n" ); + } + + fclose(pFile); + } } +//AD: 29-05-09 void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefile,int typeContourGroup) { wxBusyCursor wait; - ContourExtractData *contourextractdata = new ContourExtractData(); +//EED01Juillet2009 GenerateContourExtractData(); + //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection(); - contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); + _contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); - std::vector lstManConMod; - std::vector lstManConModTmp; - std::vector lstManConModExp; + std::vector lstManConMod; + std::vector lstManConModTmp; + std::vector lstManConModExp; std::vector pLstValue; std::vector pLstValuePosX; std::vector pLstValuePosY; @@ -2306,7 +2762,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil std::vector tempVector; _instantPanel->getInstant( tempVector ); - vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData(); +//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData(); int sizeZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ(); int z; int ii,sizeLstContourThings; @@ -2314,20 +2770,20 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil int minZ,maxZ; double totalZ; - double porcent; + double porcent; wxString tmpString; minZ = 0;// _mbarrange->GetStart(); maxZ = sizeZ;//_mbarrange->GetEnd(); totalZ = maxZ-minZ+1; - contourextractdata->SetImage( imagedata); +//EED01Juillet2009 _contourextractdata->SetImage( imagedata); // For each slice.. for ( z=0 ; zsetStringInfoPanel(tmpString); @@ -2335,7 +2791,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil //Extraction data from contours of each slice - contourextractdata->SetZtoBeAnalys( z); + _contourextractdata->SetZtoBeAnalys( z); tempVector[1]=z; Instant instant(&tempVector); @@ -2370,13 +2826,15 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil lstManConModTmp = lstManConModExp; } - contourextractdata->SetLstManualContourModel( lstManConModTmp ); + _contourextractdata->SetLstManualContourModel( lstManConModTmp ); pLstValue.clear(); pLstValuePosX.clear(); pLstValuePosY.clear(); pLstValuePosZ.clear(); - contourextractdata->GetValuesInsideCrown( &pLstValue, + int numberOfPixels; + _contourextractdata->GetValuesInsideCrown( &numberOfPixels, + &pLstValue, &pLstValuePosX, &pLstValuePosY, &pLstValuePosZ); @@ -2397,7 +2855,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil filename.append(_T(".txt"));*/ // filename.Printf(temp.c_str()); - + FILE *pFile=fopen((const char *)filename.mb_str(),"w+"); fprintf(pFile,"value \t x \t y \t z\n" ); @@ -2411,46 +2869,64 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil } // for z interfMainPanel::getInstance()->setStringInfoPanel(_T("")); //_staticTextInformation->SetLabel( _T("") ); - delete contourextractdata; + } -void wxContourMainFrame::getMaskValue(vtkImageData* mask,vtkImageData* value,int typeContourGroup){ +void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup, int selection, int minZ, int maxZ){ wxBusyCursor wait; - ContourExtractData *contourextractdata = new ContourExtractData( true ); +//EED01Juillet2009 GenerateContourExtractData(); + //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection(); if (typeContourGroup==3) { typeContourGroup=1; } - contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); + _contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); - std::vector lstManConMod; - std::vector lstManConModTmp; - std::vector lstManConModExp; + std::vector lstManConMod; + std::vector lstManConModTmp; + std::vector lstManConModExp; std::vector tempVector; _instantPanel->getInstant( tempVector ); - vtkImageData *imagedata = _theViewPanel->getImageData(); - int sizeZ = _theViewPanel->GetImageDataSizeZ(); + vtkImageData *imagedata = _theViewPanel->getImageData(); + int ext[6]; + imagedata->GetExtent(ext); + int sizeZimage = ext[5]-ext[4]+1; int z; int ii,sizeLstContourThings; - int minZ,maxZ; double totalZ; - double porcent; + double porcent; wxString tmpString; - minZ = 0;// _mbarrange->GetStart(); - maxZ = sizeZ;//_mbarrange->GetEnd(); - totalZ = maxZ-minZ+1; - contourextractdata->SetImage( imagedata); + if (selection==0 ) // actual slice + { + int actualSlice = tempVector[1]; + minZ = actualSlice; + maxZ = actualSlice; + } + + totalZ = maxZ-minZ; + +//EED01Juillet2009 _contourextractdata->SetImage( imagedata); + + // cleanning image before range + for (z=0; zResetImageResult(z); + } + // cleanning image after range + for (z=maxZ+1; zResetImageResult(z); + } + // For each slice.. - for ( z=0 ; zsetStringInfoPanel(tmpString); //Extraction data from contours of each slice - contourextractdata->SetZtoBeAnalys( z); + _contourextractdata->SetZtoBeAnalys( z); tempVector[1]=z; Instant instant(&tempVector); @@ -2492,24 +2968,24 @@ void wxContourMainFrame::getMaskValue(vtkImageData* mask,vtkImageData* value,int lstManConModTmp = lstManConModExp; } - contourextractdata->SetLstManualContourModel( lstManConModTmp ); - contourextractdata->CalculateImageResult(); // with actual Z + _contourextractdata->SetLstManualContourModel( lstManConModTmp ); + _contourextractdata->CalculateImageResult(); // with actual Z } // for iContourGroup } // for z - value = contourextractdata->GetVtkImageValueResult(); - mask = contourextractdata->GetVtkImageMaskResult(); - delete contourextractdata; + (*value) = _contourextractdata->GetVtkImageValueResult(); + (*mask) = _contourextractdata->GetVtkImageMaskResult(); + } void wxContourMainFrame::SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value) { - - std::string temp = directory + "/" + namefile + "-Value.mhd"; + + std::string temp = directory + "/" + namefile + "-image-Value.mhd"; wxString filename = crea::std2wx(temp); - // LG + // LG // filename.Printf(_T(temp.c_str())); //filename.Printf(_T("%s\\%s-Value.mhd",directory.c_str(),namefile.c_str(),z); /*filename.Printf(_T("%s"),directory.c_str()); @@ -2520,13 +2996,15 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef // Image Value vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( ); writerValueImage->SetInput( value ); + writerValueImage->SetInput( value ); writerValueImage->SetFileName( (const char *)filename.mb_str() ); writerValueImage->SetFileDimensionality( 3 ); + writerValueImage->SetCompression(false); writerValueImage->Write( ); // Image Mask // filename.Printf("%s\\%s-Mask.mhd",directory.c_str(),namefile.c_str(),z); - temp = directory + "/" + namefile + "-Mask.mhd"; + temp = directory + "/" + namefile + "-image-Mask.mhd"; // LG 14/01/09 : using crea filename = crea::std2wx(temp); @@ -2541,10 +3019,11 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef writerMaskImage->SetInput( mask ); writerMaskImage->SetFileName( (const char *)filename.mb_str() ); writerMaskImage->SetFileDimensionality( 3 ); + writerMaskImage->SetCompression(false); writerMaskImage->Write( ); interfMainPanel::getInstance()->setStringInfoPanel( _T("") ); - + } @@ -2561,10 +3040,10 @@ void wxContourMainFrame::onChangeInstantInstantPanel(std::string name,int value, } void wxContourMainFrame::onSnakePressed(){ - std::vector vecX; - std::vector vecY; - std::vector vecZ; - _theViewPanel->GetPointsOfActualContour( &vecX , &vecY , &vecZ ); + std::vector vecX; + std::vector vecY; + std::vector vecZ; + _theViewPanel->GetPointsOfActualContour( &vecX , &vecY , &vecZ ); if (vecX.size()!=0){ std::vector tempVector; @@ -2577,11 +3056,11 @@ void wxContourMainFrame::onSnakePressed(){ } // for wxDialog* dialog = new wxDialog(this, -1, wxString(_T("Snake"))); - wxPanel* panel = new wxPanel(dialog,-1); + wxPanel* panel = new wxPanel(dialog,-1); // wxStaticText* sttext = new wxStaticText(panel, -1, wxString(_T("Panel para snake"))); new wxStaticText(panel, -1, wxString(_T("Panel para snake"))); dialog->ShowModal(); - } // if + } // if } @@ -2597,3 +3076,154 @@ void wxContourMainFrame::ShowToolsPanel(bool show){ _pannew->Show(show); } + + +void wxContourMainFrame::SetContourGroup(int contourGroup) +{ + _contourGroup = contourGroup; +} + + +wxPanel *wxContourMainFrame::getMaskImageViewPanel(wxWindow *parent) +{ + + if (_viewMaskImagePanel==NULL) + { + _contourextractdata = new ContourExtractData(true); + _contourextractdata->SetImage( _theViewPanel->getImageData() ); +// double range[2]; +// _theViewPanel->getImageData()->GetScalarRange(range); + //int min = (int)floor (range[0]); + //int max = (int)ceil (range[1]); + int min = 254; + int max = 256; + _viewMaskImagePanel = new ThresholdImageViewPanel( parent, -1, -1 , 0); + _viewMaskImage = new ThresholdImageView(); + _viewMaskImage->SetImage(_contourextractdata->GetVtkImageMaskResult() ); + _viewMaskImage->SetminMaxValue( min, max); + _viewMaskImage->SetBaseColor( 0,0,1 ); + _viewMaskImagePanel->SetThresholdImageView( _viewMaskImage ); + _viewMaskImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() ); + } + return _viewMaskImagePanel; +} + + +wxPanel *wxContourMainFrame::getColorLayerImageViewPanel(wxWindow *parent) +{ + if (_viewColorLayerImagePanel==NULL) + { + double range[2]; + _theViewPanel->getImageData()->GetScalarRange(range); + int min = (int)floor (range[0]); + int max = (int)ceil (range[1]); + _viewColorLayerImagePanel = new ColorLayerImageViewPanel( parent, min, max , 1); + _viewColorLayerImage = new ColorLayerImageView(); +// _viewColorLayerImage->SetImage( _theViewPanel->getImageData() ); + _viewColorLayerImage->SetImage( NULL ); + _viewColorLayerImagePanel->SetColorLayerImageView( _viewColorLayerImage ); + _viewColorLayerImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() ); + } + return _viewColorLayerImagePanel; +} + + +wxPanel *wxContourMainFrame::getThresholdImageViewPanel(wxWindow *parent) +{ + if (_viewThresholdImagePanel==NULL) + { + double range[2]; + _theViewPanel->getImageData()->GetScalarRange(range); + int min = (int)floor (range[0]); + int max = (int)ceil (range[1]); + _viewThresholdImagePanel = new ThresholdImageViewPanel( parent, min, max , 1); + _viewThresholdImage = new ThresholdImageView(); + _viewThresholdImage->SetImage( _theViewPanel->getImageData() ); + _viewThresholdImage->SetminMaxValue( min, max); + _viewThresholdImage->SetBaseColor( 1,0,0 ); + _viewThresholdImagePanel->SetThresholdImageView( _viewThresholdImage ); + _viewThresholdImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() ); + } + return _viewThresholdImagePanel; +} + +//CMRU 17-08-09----------------------------------------------------------------------------------------------- +int wxContourMainFrame::getType () +{ + int tipo = 0; + std::vector currentSelection = _theViewPanel->getSelectedObjects(); + + if(!currentSelection.empty()) + { + std::string cloneName = currentSelection [0]; + manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName); + tipo = manualModel-> GetTypeModel(); + } + return tipo; +} + +double wxContourMainFrame::getContourSizeInPixels() +{ + double contourSize = 0; + + std::vector currentSelection = _theViewPanel->getSelectedObjects(); if(!currentSelection.empty()) + if(!currentSelection.empty()) + { + std::string cloneName = currentSelection [0]; + + manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);//_modelManager->getOutlineByKeyName( cloneName )->getModel(); + contourSize = manualModel-> GetPathSize(); + } + return contourSize; +} +manualBaseModel * wxContourMainFrame::getContour () +{ + std::vector currentSelection = _theViewPanel->getSelectedObjects(); + + if(!currentSelection.empty()) + { + std::string cloneName = currentSelection [0]; + manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);//_modelManager->getOutlineByKeyName( cloneName )->getModel(); + return manualModel; + } + return NULL; +} +void wxContourMainFrame::onPrintLabel (wxString label, manualBaseModel* manualModel) +{ + std::string labelAscii(label.ToAscii()); + int pos = labelAscii.find(" "); + + int j; + + for (j=0 ; pos != string::npos;j++) + { + labelAscii.replace( pos, 1, "_" ); + pos= labelAscii.find(" "); + } + + manualModel -> SetLabel(labelAscii); +} +void wxContourMainFrame::onInsertCalculation(manualBaseModel* manualModel) +{ + double sizeInPixel = manualModel ->GetPathSize(); + double onePixelRealSize = interfMainPanel::getInstance()->GetPixelValue();; + double realContourSize = sizeInPixel*onePixelRealSize; + manualModel ->SetRealSize(realContourSize); +} + +double wxContourMainFrame::onePixelSize( double value) +{ + return _onePixelSize = value; +} + +std::string wxContourMainFrame::GetFileLocation() +{ + return _fileLocation; +} + +void wxContourMainFrame::SetFileLocation(std::string newFileLocation) +{ + _fileLocation = newFileLocation; + std::cout<<"GETFILELOCATION:"<<_fileLocation<