#include "NameWrapper.h"
#include "wx/artprov.h"
#include "ConceptDataWrap.h"
-
-#include <manualContour.h>
-//#include "ImageSourceThing.h"
-//#include "wxContour_ActionCommandsID.h"
-//#include "OutlineModelBuilder.h"
-//#include "wxContourEventHandler.h"
#include <creaWx.h>
+#include <string>
+using namespace std;
+
//----------------------------------------------------------------------------------------------------------------
// Class implementation
//----------------------------------------------------------------------------------------------------------------
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;
_refLineControl = NULL;
_refLineModel = NULL;
_refLineView = NULL;
+// _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<vtkImageData*> images, long style,std::string datadir)
+ wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir)
: wxPanel(parent, id, pos, size, style)
{
m_mgr.SetManagedWindow(this);
+ _contourGroup = 1;
_creatingContoursActive = false;
_theViewPanel = NULL;
-// _modelManager = NULL;
- _instantPanel = NULL;
-// _buttonsBar = NULL;
-// _gridPanel = NULL;
-// _drawToolsPanel = NULL;
-// _operationsToolsPanel = NULL;
-// _autoFormsPanel = NULL;
-// _standardToolsPanel = NULL;
-// _editionToolsPanel = NULL;
-// _listViewPanel = NULL;
-// _sceneManager = NULL;
-// _actualInstant = NULL;
+ _instantPanel = NULL;
_refLineControl = NULL;
_refLineModel = NULL;
_refLineView = NULL;
+// _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 = 6+1;
+ _numberOfVariablesStatistics = 7;
+ _datadir = datadir;
- _performingOperation = new PerformingOperation();
-//JCP 17 - 10 - 2008
- inredo = 0;
- inundo = 0;
+ inredo = 0;
+ inundo = 0;
- kernelManager = new KernelManagerContour(images,datadir+"/data/");
- //kernelManager->setVectImages(images);
- //kernelManager->initializeEnvironment();
-
- //vtkImageData* selectedimage = kernelManager->getVectImages()[0];
-
-//-------------------------------------------------------------
+ _pannew = interfMainPanel::getInstance(this,datadir+"/data/Icons");//, eventHandler);
+ _performingOperation = new PerformingOperation();
+
+ if(images.size() > 0)
+ {
+ this->setVectImages(images);
+ }
- /*frame = new wxContourMainFrame(_builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(), _builder->getContourEnv(),NULL, wxID_ANY, wxT("ROI Application Sample"), wxPoint(50,50), wxSize(800, 600));
- frame->Show(TRUE);*/
+ _contourextractdata = NULL;
+}
- //Creating the evtHandler of the panels
- //wxContourEventHandler * eventHandler = new wxContourEventHandler();
+void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
+{
- //Creating the window that will show the panels
+ _images = imgs;
- //Getting the parent for the panels ( using aui )
- wxAuiNotebook * notebook = this->createNotebook();
+ #if defined(__GNUC__)
+ std::string str_home(getenv("HOME"));
+ #elif defined(_WIN32)
+ std::string str_home(getenv("USERPROFILE"));
+ #endif
+ std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/";
- //JCP 17 - 11 - 08
- //wxInstantChooserPanel * instantPanel = new wxInstantChooserPanel( notebook, "Instant Chooser", true);
- //JCP 17 - 11 - 08
std::vector<std::string> conceptNameVect;
std::vector<int> conceptSizeVect;
-
+ notebook = this->createNotebook();
- _instantPanel = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
- _theViewPanel = new wxContourViewPanel( kernelManager->getSourceImage(), notebook );
+
+ kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp );
+ _instantPanel = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
+ _theViewPanel = new wxContourViewPanel( kernelManager->getSourceImage(), notebook );
- kernelManager->getConceptsInformation(conceptNameVect, conceptSizeVect);
+//-------------------------------------------------------------
+ kernelManager->getConceptsInformation(conceptNameVect, conceptSizeVect);
_instantPanel->addConcepts(conceptNameVect, conceptSizeVect);
-
+
double val = _theViewPanel->getCurrentDeep();
_instantPanel->setConceptValue( "Axe Depth", (int)val );
//*******************changeInstant();
_theViewPanel->setVerticalConcept( "Axe Depth", data->getMinValue(), data->getMaxValue(), data->getMinShowedValue(), data->getMaxShowedValue(), data->getActualValue() );
- //eventHandler->setModelManager( kernelManager->getOutlineModelManager() );
- //eventHandler->setViewPanel( _theViewPanel );
- //_theViewPanel->initializeScenceManager();
- //eventHandler->setInstantChooserPanel( _instantPanel );
-
- //bool successConfiuration = eventHandler->configureEventsHandling();
-
- //successConfiuration &= this->configurePanels( notebook );
- this->configurePanels( notebook );
-
- interfMainPanel* pannew = interfMainPanel::getInstance(parent,datadir+"/data/Icons");//, eventHandler);
-
-//JCP 17 -10 - 2008
+ this->configurePanels( );
-
- }
+}
- wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir ){
+ wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir )
+ {
if(instance == NULL){
instance = new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir);
}
return instance;
}
- std::vector<vtkImageData*> wxContourMainFrame ::getVectImages(){
+ std::vector<vtkImageData*> wxContourMainFrame ::getVectImages()
+ {
return kernelManager->getVectImages();
}
- wxContourMainFrame* wxContourMainFrame :: getInstance(){
+
+ wxContourMainFrame* wxContourMainFrame :: getInstance()
+ {
return instance;
-
+ }
+
+ void wxContourMainFrame :: resetInstance()
+ {
+ instance->Destroy();
}
wxContourMainFrame :: ~wxContourMainFrame()
{
- m_mgr.UnInit();
- //El problema al cerrar la aplicacion puede estar asociado
- //a que wxAUINotebook esta en la aplicacion
- //principal (wxContourGUIExample)tambien
-//EED???? delete _theViewPanel;
-//EED???? delete _instantPanel;
-//EED???? delete _buttonsBar;
-//EED???? delete _actualInstant;
-//EED???? delete _sceneManager;
+ delete _contourextractdata;
+ deleteAllContours();
+ _pannew->Close();
+ interfMainPanel::resetInstance();
+ delete kernelManager;
+ instance = NULL;
+ //_pannew->Destroy();
+ //delete _pannew;
+
+ m_mgr.UnInit();
+ //delete m_mgr;
+
+ //El problema al cerrar la aplicacion puede estar asociado
+ //a que wxAUINotebook esta en la aplicacion
+ //principal (wxContourGUIExample)tambien
+ //EED???? delete _theViewPanel;
+ //EED???? delete _instantPanel;
+ //EED???? delete _buttonsBar;
+ //EED???? delete _actualInstant;
+ //EED???? delete _sceneManager;
}
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(wxAuiNotebook* theNoteBook)
+ bool wxContourMainFrame :: configurePanels( )
{
bool configured = _theViewPanel!=NULL;
-
+
configured &= _theViewPanel!=NULL;
if( _theViewPanel!=NULL )
{
- theNoteBook->AddPage( _theViewPanel, wxT(" View ") );
+ notebook->AddPage( _theViewPanel, wxT(" View ") );
m_mgr.Update();
}
if( configured )
{
- theNoteBook->AddPage( _instantPanel, wxT("Instant Page") );
+ notebook->AddPage( _instantPanel, wxT("Instant Page") );
m_mgr.Update();
}
- m_mgr.AddPane(theNoteBook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false));
+ m_mgr.AddPane(notebook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false));
m_mgr.Update();
-/* configured &= _buttonsBar!=NULL;
- if( _buttonsBar!=NULL )
- {
- m_mgr.AddPane(_buttonsBar, wxAuiPaneInfo().
- Name(wxT("TB")).Caption(wxT("Buttons Bar")).
- ToolbarPane().Top().
- LeftDockable( ).RightDockable( false ).CloseButton(false));
- m_mgr.Update();
- }*/
- //CreateStatusBar();
-
+
SetMinSize(wxSize(300,300));
m_mgr.Update();
return configured;
}
- void wxContourMainFrame :: setNotebook( wxAuiNotebook * noteBook )
- {
+ bool wxContourMainFrame::addNewPanel(wxPanel* panel)
+ {
+ bool configured = panel!=NULL;
+ configured &= panel!=NULL;
+
+ if( configured )
+ {
+ notebook->AddPage( panel, wxT(" Viewer "), true );
+ m_mgr.Update();
+ }
+ return configured;
}
//------------------------------------------------------------------------------------------------------------
// Attributes getters and setters
//------------------------------------------------------------------------------------------------------------
-
-
+
+
void wxContourMainFrame :: setInstantChooserPanel( wxInstantChooserPanel * theInstantChooserPanel )
{
- _instantPanel = theInstantChooserPanel;
+ _instantPanel = theInstantChooserPanel;
}
// void wxContourMainFrame :: setButtonsBar( wxContour_ButtonsBar * theButtonsBar )
// }
// void wxContourMainFrame :: setOperationsToolsPanel( wxContour_OperationsToolsPanel * theOperationsToolsPanel )
-// {
+// {
// _operationsToolsPanel = theOperationsToolsPanel;
// }
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<int> instantVector;
_instantPanel->getInstant( instantVector );
std::string theName = kernelManager->createOutline(manModelContour, instantVector);
-
+
/*std::vector<int> instantVector;
_instantPanel->getInstant( instantVector );
std::string theName;
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) ;
}
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<int> instantVector;
_instantPanel->getInstant( instantVector );
std::string theName = kernelManager->createOutline(manModelContour, instantVector);
-
+
/*std::vector<int> instantVector;
_instantPanel->getInstant( instantVector );
std::string theName;
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;
for ( iSector=0 ; iSector<sizeSectors ; iSector++ )
{
ang = ((PanelBullEyeOptions*)panel)->GetAngOfCrownSection(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(){
for (j=0;j<jSize; j++)
{
if (lstKeyNameToBeErase[k]==lstKeyNameActualSlice[j])
- {
+ {
ok=true;
}
} // for j
_theViewPanel->removeFromScene(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;
//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() ))
deleteContour( (*contourthing)->getName() );
} //for ii
}// for z
- } // if
+ } // if
JCP --08-09-2008 */
}
_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::changeInstant(){
+
+
+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<int> 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<int> 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 );
-
+
+ // 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(){
-
+
+
+
+void wxContourMainFrame :: updateInstantOutlines()
+{
_theViewPanel->removeSceneContours();
_theViewPanel->addNameWrapperToScene();
//for( int i=0; i<size; i++)
- //{
+ //{
// _theViewPanel->getSceneManager()->addToScene(namesWrapping[i]->getKeyName(), true, true, true, false, false );
//}
}
return kernelManager->getNameWrapping(i);
}
-void wxContourMainFrame::updateInstantImageData(){
+void wxContourMainFrame::updateInstantImageData()
+{
std::vector<int> inst;
_instantPanel->getInstant(inst);
_theViewPanel->setImageSlice(z);
}
}
-void wxContourMainFrame::updateInstantAxes(){
+
+void wxContourMainFrame::updateInstantAxes()
+{
}
+
void wxContourMainFrame::onChangeDeep(int val){
- _instantPanel->setConceptValue( "Axe Depth", (int)val );
+ _instantPanel->setConceptValue( "Axe Depth", (int)val );
changeInstant();
}
_instantPanel->getInstant( tempVector );
_performingOperation->setEndOperationInstantVector ( tempVector );
std::vector<std::string> elems = _performingOperation->getKeyNamesOperationElems();
- int i,size = elems.size();
+ int i,size = elems.size();
for( i=0; i<size; i++ )
- {
+ {
createCopyContourOf( elems[i], tempVector, i>0 );
- }
+ }
}
}
void wxContourMainFrame::onUndo(){
if(kernelManager->onRedo(filename)){
loadState(filename);
}
-
+
}
void wxContourMainFrame :: createCopyContourOf ( std::string anExistingKName, std::vector<int> &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 );
}
void wxContourMainFrame :: createMirrorContourOf ( std::string anExistingKName, std::vector<int> &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);
double pnt1X = refPoint1->GetX();
double pnt1Y = refPoint1->GetY();
- double pnt1Z = refPoint1->GetZ();
+// double pnt1Z = refPoint1->GetZ();
double pnt2X = refPoint2->GetX();
double pnt2Y = refPoint2->GetY();
- double pnt2Z = refPoint2->GetZ();
+// double pnt2Z = refPoint2->GetZ();
double angle = (atan2(pnt2Y - pnt1Y, pnt2X - pnt1X) * 180 / 3.1415926535897932384626433832795)+90;
vtkTransform *t = vtkTransform::New();
_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);
+//EED03
+/*EED Borrame
+void wxContourMainFrame::loadContours( FILE *pFile, bool staticContour )
+{
+ char tmp[255];
- 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)
+ if (staticContour==false)
{
- std::string fileNameContourROI = (const char *)(dialog.GetPath().mb_str());
- kernelManager->setCurrentFileName(fileNameContourROI);
- saveFileWithContours( fileNameContourROI );
+ 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::saveFileWithContours( std::string filename ){
-
- 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 ; i<sizeLstNameThings ; i++)
- {
- kernelManager->SaveThingName( 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 ; i<sizeLstNameThings ; i++)
- {
- kernelManager->SaveThingName( pFile, lstNameThings[i] );
- _theViewPanel->getSceneManager()->SaveThingName( pFile, lstNameThings[i] );
- }// for i
- fclose(pFile);
-}
-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<int> instantVector;
int typeContourModel;
- manualContourModel *manModelContour;
+ manualBaseModel *manModelContour;
int typeView;
int i;
{
instantVector.clear();
fscanf(pFile,"%s",tmp); // Instant
-
fscanf(pFile,"%s",tmp); // 1
instantVector.push_back( atoi(tmp) );
fscanf(pFile,"%s",tmp); // 2
fscanf(pFile,"%s",tmp); // 6
instantVector.push_back( atoi(tmp) );
-
fscanf(pFile,"%s",tmp); // TypeContourModel
fscanf(pFile,"%s",tmp); // ##
typeContourModel = atoi(tmp);
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 );
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)
+
+void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool interactiveInterface)
{
-
- 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;
+ char tmp[255];
+ char tmpD[255];
- //Tipo de pixeles de salida 1
- typedef unsigned char OutputPixelType;
- typedef itk::Image< OutputPixelType, Dimension > OutputImageType;
+ FILE *pFile =fopen(fileNameContourROI.c_str(),"r+");
- //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;
+//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); // #
+ }
- //Definición del segundo tipo de conversión de pixeles
- typedef itk::CastImageFilter<
- OutputImageType2, InternalImageType > CastFilterType2;
+ fscanf(pFile,"%s",tmp); // --CreaContour--
- //Tercer tipo de conversión
- typedef itk::RescaleIntensityImageFilter<
- InternalImageType,
- OutputImageType > CastFilterType3;
+ 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);
- //Cuarto tipo de conversión
- typedef itk::RescaleIntensityImageFilter<
- OutputImageType,
- OutputImageType > CastFilterType4;
+ //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
+ }
- ThresholdingFilterType::Pointer thresholder = ThresholdingFilterType::New();
-
- thresholder->SetLowerThreshold( 0.0 );
- thresholder->SetUpperThreshold( 128 );
+ 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
+ }
- thresholder->SetOutsideValue( 255 );
- thresholder->SetInsideValue( 0 );
+ //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
+ }
- //Definción de conexiónes entre VTK e ITK y el writer
- typedef itk::VTKImageToImageFilter<OutputImageType2> ConnectorType;
- typedef itk::ImageToVTKImageFilter<OutputImageType> ConnectorType2;
- typedef itk::ImageFileWriter< OutputImageType > WriterType;
+ //AD:02-06-09
+ else if (version=="1.0.0")
+ {
+ openContours(pFile,pFileData,false); //Skips ImageDimensions and ImageSpacing
+ }
- ConnectorType::Pointer connector= ConnectorType::New();
- ConnectorType2::Pointer connector2= ConnectorType2::New();
-
+ fclose(pFile);
- CastFilterType::Pointer filter=CastFilterType::New();
- CastFilterType2::Pointer filter2=CastFilterType2::New();
+ if(pFileData != NULL)
+ {
+ fclose(pFileData);
+ }
+ }
+ _theViewPanel->getSceneManager()->removeSceneContours();
+ changeInstant();
- connector->SetInput( imagedata );
- filter2->SetInput(connector->GetOutput());
+}
- typedef itk::CurvatureAnisotropicDiffusionImageFilter<
- InternalImageType,
- InternalImageType > SmoothingFilterType;
- SmoothingFilterType::Pointer smoothing = SmoothingFilterType::New();
- typedef itk::GradientMagnitudeRecursiveGaussianImageFilter<
- InternalImageType,
- InternalImageType > GradientFilterType;
+void wxContourMainFrame::onImport(){
+ std::string filename, filenamecontours;
+ wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxOPEN );
- typedef itk::SigmoidImageFilter<
- InternalImageType,
- InternalImageType > SigmoidFilterType;
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ filename = dialog.GetPath().mb_str();
+ filenamecontours = kernelManager->parseOsirixFile(filename);
- GradientFilterType::Pointer gradientMagnitude = GradientFilterType::New();
+ if(filenamecontours.compare("") != 0){
+ onLoadContours(filenamecontours,true);
+ }
- SigmoidFilterType::Pointer sigmoid = SigmoidFilterType::New();
+ }
+}
+void wxContourMainFrame::onTest(){
+ std::string filename, filenamecontours;
+ wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxOPEN );
- sigmoid->SetOutputMinimum( 0.0 );
- sigmoid->SetOutputMaximum( 255.0 );
+ 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: "<<GetFileLocation()<<std::endl;
+ std::string fileNameContourROI = GetFileLocation();
+ std::cout<<"Nombre del archivo: "<<fileNameContourROI<<std::endl;
+ kernelManager->setCurrentFileName(fileNameContourROI);
+ saveFileWithContours( fileNameContourROI);
+ }
+//------------------------------------------------------------------------------------------------------------
+}
+//AD: 29-05-09
+void wxContourMainFrame::saveFileWithContours( std::string filename )
+{
- FastMarchingFilterType::Pointer fastMarching = FastMarchingFilterType::New();
+ FILE *pFile=fopen(filename.c_str(),"w+");
- typedef itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType,
- InternalImageType > GeodesicActiveContourFilterType;
- GeodesicActiveContourFilterType::Pointer geodesicActiveContour =
- GeodesicActiveContourFilterType::New();
+//CMRU 03-09-09-----------------------------------------------------------------------------------------------
+ filename.append("data");
+ std::cout<<"Nombre del archivo: "<<filename<<std::endl;
+ FILE *pFileData=fopen(filename.c_str(),"w+");
+//------------------------------------------------------------------------------------------------------------
- typedef itk::ZeroCrossingImageFilter<
- InternalImageType,
- InternalImageType > ZeroCrossingFilterType;
-ZeroCrossingFilterType::Pointer zeroCrossing =
- ZeroCrossingFilterType::New();
+ std::vector< std::string > lstNameThings;
+ int i,sizeLstNameThings;
-const double propagationScaling = atof( prop );
+ fprintf(pFile,"--CreaContour--\n");
+ fprintf(pFile,"Version %s\n", "1.0.3" );
- geodesicActiveContour->SetPropagationScaling( propagationScaling );
- geodesicActiveContour->SetCurvatureScaling( 1.0 );
- geodesicActiveContour->SetAdvectionScaling( 1.0 );
+//CMRU 03-09-09-----------------------------------------------------------------------------------------------
+ fprintf(pFileData,"--CreaContour--\n");
+ fprintf(pFileData,"Version %s\n", "1.0.3" );
+ fprintf(pFileData,"OnePixelSize %f\n", _onePixelSize);
- geodesicActiveContour->SetMaximumRMSError( 0.02 );
- int it=atoi( iter );
- geodesicActiveContour->SetNumberOfIterations( it );
+//------------------------------------------------------------------------------------------------------------
- smoothing->SetInput( filter2->GetOutput() );
- gradientMagnitude->SetInput( smoothing->GetOutput() );
- sigmoid->SetInput( gradientMagnitude->GetOutput() );
- 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() );
-
+ vtkImageData *image = _images[0];
- smoothing->SetTimeStep( 0.125 );
- smoothing->SetNumberOfIterations( 5 );
- smoothing->SetConductanceParameter( 9.0 );
+ int dimRange[3];
+ image->GetDimensions(dimRange);
+ fprintf(pFile,"ImageDimensions %d %d %d\n", dimRange[0], dimRange[1], dimRange[2] );
- const double sigma = atof( sigm );
- gradientMagnitude->SetSigma( sigma );
+ double spaRange[3];
+ image->GetSpacing(spaRange);
- const double alpha = atof( alf );
- const double beta = atof( bet );
+ fprintf(pFile,"ImageSpacing %f %f %f\n", spaRange[0], spaRange[1], spaRange[2] );
- sigmoid->SetAlpha( alpha );
- sigmoid->SetBeta( beta );
-
- typedef FastMarchingFilterType::NodeContainer NodeContainer;
- typedef FastMarchingFilterType::NodeType NodeType;
+ // 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 ; i<sizeLstNameThings ; i++)
+ {
+//CMRU 03-09-09-----------------------------------------------------------------------------------------------
+ manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(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 ; i<sizeLstNameThings ; i++)
+ {
+ kernelManager->SaveThingName( 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<int> instantVector;
+ int typeContourModel;
+ manualBaseModel *manModelContour;
+ int typeView;
+
+/*
+ if (compatible==true)
+ {
+ int i;
+ for (i=0;i<numberOfContours;i++)
+ {
+ instantVector.clear();
+ fscanf(pFile,"%s",tmp); // Instant
+
+ fscanf(pFile,"%s",tmp); // 1
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 2
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 3
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 4
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 5
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 6
+ instantVector.push_back( atoi(tmp) );
+
+
+ fscanf(pFile,"%s",tmp); // TypeContourModel
+ fscanf(pFile,"%s",tmp); // ##
+ typeContourModel = atoi(tmp);
+
+ manModelContour = kernelManager->factoryManualContourModel(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;i<numberOfContours;i++)
+ {
+ instantVector.clear();
+ fscanf(pFile,"%s",tmp); // Instant
+
+ fscanf(pFile,"%s",tmp); // 1
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 2
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 3
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 4
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 5
+ instantVector.push_back( atoi(tmp) );
+ fscanf(pFile,"%s",tmp); // 6
+ instantVector.push_back( atoi(tmp) );
+
+ fscanf(pFile,"%s",tmp); // TypeContourModel
+ fscanf(pFile,"%s",tmp); // ##
+ typeContourModel = atoi(tmp);
+
+ manModelContour = kernelManager->factoryManualContourModel(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<OutputImageType2> ConnectorType;
+ typedef itk::ImageToVTKImageFilter<OutputImageType> 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,
+ InternalImageType > GeodesicActiveContourFilterType;
+ GeodesicActiveContourFilterType::Pointer geodesicActiveContour =
+ GeodesicActiveContourFilterType::New();
+
+ typedef itk::ZeroCrossingImageFilter<
+ InternalImageType,
+ InternalImageType > ZeroCrossingFilterType;
+ ZeroCrossingFilterType::Pointer zeroCrossing =
+ ZeroCrossingFilterType::New();
- NodeContainer::Pointer seeds = NodeContainer::New();
+ const double propagationScaling = atof( crea::wx2std(prop).c_str() );
- InternalImageType::IndexType seedPosition;
- seedPosition[0] = x;
- seedPosition[1] = y;
+ geodesicActiveContour->SetPropagationScaling( propagationScaling );
+ geodesicActiveContour->SetCurvatureScaling( 1.0 );
+ geodesicActiveContour->SetAdvectionScaling( 1.0 );
- const double initialDistance = atof( distanc );
+ geodesicActiveContour->SetMaximumRMSError( 0.02 );
+ int it=atoi( crea::wx2std(iter).c_str() );
+ geodesicActiveContour->SetNumberOfIterations( it );
- NodeType node;
+ smoothing->SetInput( filter2->GetOutput() );
+ gradientMagnitude->SetInput( smoothing->GetOutput() );
+ sigmoid->SetInput( gradientMagnitude->GetOutput() );
+ fastMarching->SetInput( sigmoid->GetOutput() );
+ geodesicActiveContour->SetInput( fastMarching->GetOutput() );
+ geodesicActiveContour->SetFeatureImage( sigmoid->GetOutput() );
- const double seedValue = - initialDistance;
+ zeroCrossing->SetInput( geodesicActiveContour->GetOutput() );
+ //thresholder->SetInput( zeroCrossing->GetOutput() );
+ thresholder->SetInput( geodesicActiveContour->GetOutput() );
+ connector2->SetInput( thresholder->GetOutput() );
- node.SetValue( seedValue );
- node.SetIndex( seedPosition );
-
- seeds->Initialize();
- seeds->InsertElement( 0, node );
- fastMarching->SetTrialPoints( seeds );
+ smoothing->SetTimeStep( 0.125 );
+ smoothing->SetNumberOfIterations( 5 );
+ smoothing->SetConductanceParameter( 9.0 );
- fastMarching->SetSpeedConstant( 1.0 );
-
- fastMarching->SetOutputSize(
- connector->GetOutput()->GetBufferedRegion().GetSize() );
-
- fastMarching->SetStoppingValue( 800 );
- try
+
+ const double sigma = atof( crea::wx2std(sigm).c_str() );
+ gradientMagnitude->SetSigma( sigma );
+
+ const double alpha = atof( crea::wx2std(alf).c_str() );
+ const double beta = atof( crea::wx2std(bet).c_str() );
+
+ sigmoid->SetAlpha( alpha );
+ sigmoid->SetBeta( beta );
+
+ typedef FastMarchingFilterType::NodeContainer NodeContainer;
+ typedef FastMarchingFilterType::NodeType NodeType;
+
+ NodeContainer::Pointer seeds = NodeContainer::New();
+
+ InternalImageType::IndexType seedPosition;
+ seedPosition[0] = x;
+ seedPosition[1] = y;
+
+ const double initialDistance = atof( crea::wx2std(distanc).c_str() );
+
+ NodeType node;
+
+ const double seedValue = - initialDistance;
+
+ node.SetValue( seedValue );
+ node.SetIndex( seedPosition );
+
+ seeds->Initialize();
+ seeds->InsertElement( 0, node );
+
+ fastMarching->SetTrialPoints( seeds );
+
+ fastMarching->SetSpeedConstant( 1.0 );
+
+ 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( );
vtkPolyData* polyDataResult = cntVTK->GetOutput();
- std::cout<<"Points "<<polyDataResult->GetNumberOfPoints()<<std::endl;
+
//std::cout<<"Points "<<polyDataResult->GetNumberOfPoints()<<std::endl;
polyDataResult->Update( );
polyDataResult->UpdateInformation();
-//EED
- /*
-ofstream myfile;
-myfile.open ("C:/Creatis/example.txt");
-myfile << "\n";
-polyDataResult->Print(myfile);
-myfile << "-------------------------------------\n";
-polyDataResult->GetLines()->Print(myfile);
-myfile.close();*/
+ //EED
+ /*
+ ofstream myfile;
+ myfile.open ("C:/Creatis/example.txt");
+ myfile << "\n";
+ polyDataResult->Print(myfile);
+ myfile << "-------------------------------------\n";
+ polyDataResult->GetLines()->Print(myfile);
+ myfile.close();*/
cntVTK -> Delete();
cpd -> Delete();
conn -> Delete();
-//--Calculating control points
+ //--Calculating control points
std::vector<double> vecX;
std::vector<double> vecY;
double xAct=0;
double yAct=0;
int ii,size=polyDataResult->GetNumberOfPoints();
-ofstream myfile;
-myfile.open ("C:/Creatis/example2.txt");
+ ofstream myfile;
+ myfile.open ("C:/Creatis/example2.txt");
size=polyDataResult->GetNumberOfPoints();
for (ii=0;ii<size;ii++)
std::cout<<" x Anterior "<<xAct<<" x actual "<<x<<std::endl;
std::cout<<" y Anterior "<<yAct<<" y actual "<<y<<std::endl;
std::cout<<" x "<<p[0]<<" y "<<p[1]<<std::endl;
- vecZ.push_back( -900 );
+ vecZ.push_back( 900 );
xAct=x;
yAct=y;
}
vecXo.push_back(p[0]);
vecYo.push_back(p[1]);
}
-
+
}
else*/ if(fabs(xAct-x)>11)
{
{
vecX.push_back( p[0] );
myfile <<p[0]<<","<<p[1]<<"\n";
- std::cout<<" x Anterior "<<xAct<<" x actual "<<x<<std::endl;
- std::cout<<" y Anterior "<<yAct<<" y actual "<<y<<std::endl;
- std::cout<<" x "<<p[0]<<" y "<<p[1]<<std::endl;
+ //std::cout<<" x Anterior "<<xAct<<" x actual "<<x<<std::endl;
+ //std::cout<<" y Anterior "<<yAct<<" y actual "<<y<<std::endl;
+
//std::cout<<" x "<<p[0]<<" y "<<p[1]<<std::endl;
vecY.push_back( p[1] );
- vecZ.push_back( -900 );
+ vecZ.push_back( 900 );
xAct=x;
yAct=y;
}
-
-
+
+
}
while(!vecXo.empty())
{
vecX.push_back(vecXo.back());
- std::cout<<" x Siguiente "<<vecXo.back();
+ //std::cout<<" x Siguiente "<<vecXo.back();
vecXo.pop_back();
- vecZ.push_back( -900 );
+ vecZ.push_back( 900 );
}
while(!vecYo.empty())
{
ExtractControlPoints2D *extractcontrolpoints2d = new ExtractControlPoints2D();
extractcontrolpoints2d->SetContour( &vecX , &vecY , &vecZ );
-
-int method=2;
+
+ int method=2;
if (method==0){
extractcontrolpoints2d->GetInitialControlPoints( &vecCtrlPointX , &vecCtrlPointY , &vecCtrlPointZ );
}
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 ; j<sizeCtrPt ; j++)
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->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();
}
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();
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();
// cntVTK->SetValue( 1, vmax );
cntVTK->Update( );
cntVTK->UpdateInformation();
-
+
vtkCleanPolyData* cpd = vtkCleanPolyData::New( );
cpd->SetInput( cntVTK->GetOutput( ) );
cpd->ConvertLinesToPointsOff( );
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();
{
id = polyDataResult->GetLines()->GetData()->GetValue(ii);
p = polyDataResult->GetPoint(id);
- double x=p[0];
- double y=p[1];
+// double x=p[0];
+// double y=p[1];
vecX.push_back( p[0] );
vecY.push_back( p[1] );
- vecZ.push_back( -900 );
+ vecZ.push_back( 900 );
// vecZ.push_back( p[2] );
}
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 ; j<sizeCtrPt ; j++)
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->configureViewControlTo(theName, manModelContour, spc, typeofcontour);
//_theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc, typeofcontour ) ;
} // if addedModel
} // if sizeCtrPt
}
-
int wxContourMainFrame::GetImageDataSizeZ(){
return _theViewPanel->GetImageDataSizeZ();
}
//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++ )
{
//Creates a reference line to be used as the axis of the mirroring
void wxContourMainFrame::referenceLine()
{
- wxBusyCursor wait;
- double spc[3];
+ if (_refLineControl==NULL)
+ {
+ wxBusyCursor wait;
+ double spc[3];
- vtkImageData *vtkimagedata = _theViewPanel->getImageData();
- vtkimagedata->GetSpacing(spc);
+ vtkImageData *vtkimagedata = _theViewPanel->getImageData();
+ vtkimagedata->GetSpacing(spc);
- wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
+ wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
- _refLineControl = new manualLineControler();
- _refLineModel = new manualContourModelLine();
- _refLineView = new manualViewLine();
- _refLineView->SetModel( _refLineModel );
- _refLineView->SetWxVtkBaseView( viewer2D );
- _refLineView->SetRange( 2 );
- _refLineView->SetZ( 1200 );
+ _refLineControl = new manualLineControler();
+ _refLineModel = new manualContourModelLine();
+ _refLineView = new manualViewLine();
+ _refLineView->SetModel( _refLineModel );
+ _refLineView->SetWxVtkBaseView( viewer2D );
+ _refLineView->SetRange( 2 );
+ _refLineView->SetZ( 1200 );
- _refLineView->SetSpacing(spc);
+ _refLineView->SetSpacing(spc);
- _refLineView->SetColorNormalContour(0, 0, 1);
- _refLineView->SetColorEditContour(0, 0.5, 0.5);
- _refLineView->SetWidthLine(4);
+ _refLineView->SetColorNormalContour(0, 0, 1);
+ _refLineView->SetColorEditContour(0, 0.5, 0.5);
+ _refLineView->SetWidthLine(4);
- _refLineControl->SetModelView( _refLineModel , _refLineView );
- viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl );
- _refLineModel->SetCloseContour(false);
- _refLineControl->CreateNewManualContour();
-/*
- double z = _refLineControl->GetZ();
+ _refLineControl->SetModelView( _refLineModel , _refLineView );
+ vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView();
+ style->AddInteractorStyleMaracas( _refLineControl );
+ _refLineModel->SetCloseContour(false);
+ _refLineControl->CreateNewManualContour();
- _refLineModel->AddPoint(50,100,z);
- _refLineModel->AddPoint(80,40,z);
+//AD: Inicializar el mirroring con una linea ya pintada
+ /*
+ double z = _refLineControl->GetZ();
- _refLineControl->AddPoint(50,100,z);
- _refLineControl->AddPoint(80,40,z);
+ 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;
- _refLineView->UpdateViewPoint(0);
- _refLineView->UpdateViewPoint(1);
+ _refLineControl->AddPoint(x,y1,z);
+ _refLineControl->AddPoint(x,y2,z);
+ _refLineControl->SetCompleteCreation(true);
- _refLineControl->SetCompleteCreation(true);
- _refLineControl->SetEditable(true);
-*/
- _refLineControl->SetActive(true);
- _refLineView->RefreshContour();
+ _refLineModel->AddPoint(x,y1,z);
+ _refLineModel->AddPoint(x,y2,z);
+ _refLineModel->UpdateSpline();
+
+ _refLineView->UpdateViewPoint(0);
+ _refLineView->UpdateViewPoint(1);
+ */
+
+ _refLineControl->SetActive(true);
+ _refLineView->RefreshContour();
+ }
}
//Hides the referenceLine
{
if (_refLineControl!=NULL)
{
- _refLineView->RemoveCompleteContourActor();
+ if (_refLineControl->GetActive())
+ {
+ _refLineView->RemoveCompleteContourActor();
+ _refLineControl->SetEditable(false);
+ _refLineControl->SetActive(false);
+
+ RefreshInterface();
+ }
}
}
{
if (_refLineControl!=NULL)
{
- wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
+ if (_refLineControl->GetActive()==false)
+ {
+ wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
- _refLineView->SetModel( _refLineModel );
- _refLineView->SetWxVtkBaseView( viewer2D );
- _refLineView->SetRange( 2 );
- _refLineView->SetZ( 1200 );
+ _refLineView->SetModel( _refLineModel );
+ _refLineView->SetWxVtkBaseView( viewer2D );
+ _refLineView->SetRange( 2 );
+ _refLineView->SetZ( 1200 );
- _refLineControl->SetModelView( _refLineModel , _refLineView );
- viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl );
- _refLineControl->CreateNewManualContour();
- //_refLineControl->SetActive(true);
- //_refLineControl->SetEditable(true);
- _refLineView->RefreshContour();
+ _refLineControl->SetModelView( _refLineModel , _refLineView );
+ vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView();
+ style->AddInteractorStyleMaracas( _refLineControl );
+ _refLineControl->CreateNewManualContour();
+ _refLineControl->SetActive(true);
+ _refLineView->RefreshContour();
+
+ RefreshInterface();
+ }
}
}
+void wxContourMainFrame::refLineChangeWidth(int width)
+{
+ _refLineView->SetWidthLine(width);
+ _refLineView->RefreshContour();
+
+ RefreshInterface();
+}
+
+
void wxContourMainFrame::onMirror()
{
//AD:02-09
_instantPanel->getInstant( tempVector );
_performingOperation->setEndOperationInstantVector ( tempVector );
std::vector<std::string> elems = _performingOperation->getKeyNamesOperationElems();
- int i,size = elems.size();
+ int i,size = elems.size();
for( i=0; i<size; i++ )
- {
+ {
createMirrorContourOf( elems[i], tempVector, i>0 );
- }
+ }
}
//deleteContour( _refName );
//_refName = "";
}
-void wxContourMainFrame::showAxis(bool show){
+
+void wxContourMainFrame::showAxis(bool show)
+{
_theViewPanel->SetVisibleAxis(show);
_theViewPanel->Refresh();
}
_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: "<<range[0]<<" Val 2: "<<range[1]<<std::endl;
+
+ return (int)range[1];
+ */
return _theViewPanel->getColorWindow();
}
-int wxContourMainFrame::getWindowLevel(){
+
+int wxContourMainFrame::getWindowLevel()
+{
+ /*
+ double range[2];
+ vtkImageData * img = getImageData();
+ img->GetScalarRange(range);
+
+ std::cout<<"Val 1: "<<range[0]<<" Val 2: "<<range[1]<<std::endl;
+
+ return (int)range[1];
+ */
return _theViewPanel->getWindowLevel();
}
void wxContourMainFrame::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel){
_theViewPanel->onBrigthnessColorWindowLevel(colorwindow, windowlevel);
-
RefreshInterface();
}
void wxContourMainFrame::onInterpolation(bool interpolate){
- _theViewPanel->onInterpolation(interpolate);
+ _theViewPanel->onInterpolation(interpolate);
RefreshInterface();
}
_instantPanel->setConceptValue( name, actual );
}
+
void wxContourMainFrame::resetAppend(){
kernelManager->resetAppend();
-
+
}
+
void wxContourMainFrame::onSpreadAdd(){
- std::vector<double> vecX;
- std::vector<double> vecY;
- std::vector<double> vecZ;
+ std::vector<double> vecX;
+ std::vector<double> vecY;
+ std::vector<double> vecZ;
_theViewPanel->GetPointsOfActualContour(&vecX , &vecY , &vecZ );
-
std::vector<int> 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<int> 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<ContourThing**> lstContourThings = kernelManager->getOutlinesAtInstant( &instant );
+ sizeLstContourThings = lstContourThings.size();
+ if (sizeLstContourThings>=1)
+ {
+ std::vector<double> vecX;
+ std::vector<double> vecY;
+ std::vector<double> vecZ;
+ ContourThing **contourthing = lstContourThings[0];
+ manualBaseModel *cModel = (*contourthing)->getModel();
+ int i,size = cModel->GetNumberOfPointsSpline();
+ double x,y,z;
+ for (i=0; i<size; i++)
+ {
+ cModel->GetSpline_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<double> vecCtrlPointX;
std::vector<double> vecCtrlPointY;
std::vector<double> vecCtrlPointZ;
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<int>& tempVector){
-
+
}
std::vector<std::string> 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<manualContourModel*> lstManConMod;
- std::vector<manualContourModel*> lstManConModTmp;
- std::vector<manualContourModel*> lstManConModExp;
+ std::vector<manualBaseModel*> lstManConMod;
+ std::vector<manualBaseModel*> lstManConModTmp;
+ std::vector<manualBaseModel*> lstManConModExp;
std::vector<double> pLstValue;
std::vector<double> pLstValuePosX;
std::vector<double> pLstValuePosY;
std::vector<double> pLstValuePosZ;
- int resultSize;
+ int resultSize;
int resultGrayRangeCount;
- double resultMin;
+ double resultMin;
double resultMax;
double resultAverage;
double resultStandardeviation;
std::vector<int> 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<int> 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);
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 );
if (typeContourGroup==3) // contour separete
{
sizeContourGroup=lstManConModExp.size();
- if ( maxContourGroup<sizeContourGroup )
+ if ( maxContourGroup<sizeContourGroup )
{
maxContourGroup=sizeContourGroup;
}
int tmpIntA;
-
-
for( iContourGroup=0 ; iContourGroup<sizeContourGroup ; iContourGroup++ ){
lstManConModTmp.clear();
+
+
+
if (typeContourGroup==3) // contour separete
{
lstManConModTmp.push_back( lstManConModExp[iContourGroup]);
lstManConModTmp = lstManConModExp;
}
- contourextractdata->SetLstManualContourModel( 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);
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;
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 );
- SaveImageResult( 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);
+ }
-
- FILE *pFile=fopen(filename.c_str(),"w+");
+ if (statistics)
+ {
+ std::ostringstream name;
+ name << filename << ".xls";
- int sizeZ = _theViewPanel->GetImageDataSizeZ();
- wxString tmpString;
- int i,j,maxX,maxY=sizeZ;
- maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols();
+ FILE *pFile=fopen(name.str().c_str(),"w+");
- int iTitle,sizeTitle = (maxX / _numberOfVariablesStatistics);
- for ( iTitle=0; iTitle<sizeTitle ; iTitle++)
- {
- fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle,tmpString.c_str() );
- }
- fprintf(pFile,"\n" );
+ wxString tmpString;
+ int i,j,maxX;
+// int sizeZ = _theViewPanel->GetImageDataSizeZ();
+// int maxY=sizeZ+2;
- for ( j=0; j<maxY ; j++)
- {
- fprintf(pFile,"%d\t" , j );
- for (i=0 ; i<maxX ; i++){
- tmpString = interfMainPanel::getInstance()->getCellValue(j, i);//_grid->GetCellValue( j , i );
- fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) );
- } // for i
- fprintf(pFile,"\n" );
- } // for j
+ maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols();
- fclose(pFile);
+ // -- Title --
+ int iTitle,sizeTitle = (maxX / _numberOfVariablesStatistics);
+ for ( iTitle=0; iTitle<sizeTitle ; iTitle++)
+ {
+ // fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle,tmpString.c_str() );
+ fprintf(pFile,"slice\t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle );
+ }
+ fprintf(pFile,"\n\n" );
+
+
+
+ if (selection==0 ) // actual slice
+ {
+ std::vector<int> 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 ; i<maxX ; i++){
+ tmpString = interfMainPanel::getInstance()->getCellValue(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 ; i<maxX ; i++){
+ tmpString = interfMainPanel::getInstance()->getCellValue(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<manualContourModel*> lstManConMod;
- std::vector<manualContourModel*> lstManConModTmp;
- std::vector<manualContourModel*> lstManConModExp;
+ std::vector<manualBaseModel*> lstManConMod;
+ std::vector<manualBaseModel*> lstManConModTmp;
+ std::vector<manualBaseModel*> lstManConModExp;
std::vector<double> pLstValue;
std::vector<double> pLstValuePosX;
std::vector<double> pLstValuePosY;
std::vector<int> 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;
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 ; z<sizeZ ; z++)
{
porcent = 100.0* (z-minZ)/totalZ;
-
+
tmpString.Printf(_T("Saving Values"));
tmpString.Printf(_T(" %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
interfMainPanel::getInstance()->setStringInfoPanel(tmpString);
//Extraction data from contours of each slice
- contourextractdata->SetZtoBeAnalys( z);
+ _contourextractdata->SetZtoBeAnalys( z);
tempVector[1]=z;
Instant instant(&tempVector);
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);
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" );
} // for z
interfMainPanel::getInstance()->setStringInfoPanel(_T(""));
//_staticTextInformation->SetLabel( _T("") );
- delete contourextractdata;
+
}
-void wxContourMainFrame::SaveImageResult(std::string directory,std::string namefile, 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<manualContourModel*> lstManConMod;
- std::vector<manualContourModel*> lstManConModTmp;
- std::vector<manualContourModel*> lstManConModExp;
+ std::vector<manualBaseModel*> lstManConMod;
+ std::vector<manualBaseModel*> lstManConModTmp;
+ std::vector<manualBaseModel*> lstManConModExp;
std::vector<int> 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; z<minZ; z++){
+ _contourextractdata->ResetImageResult(z);
+ }
+ // cleanning image after range
+ for (z=maxZ+1; z<sizeZimage; z++){
+ _contourextractdata->ResetImageResult(z);
+ }
+
// For each slice..
- for ( z=0 ; z<sizeZ ; z++)
+ for ( z=minZ ; z<=maxZ ; z++)
{
porcent = 100.0* (z-minZ)/totalZ;
interfMainPanel::getInstance()->setStringInfoPanel(tmpString);
//Extraction data from contours of each slice
- contourextractdata->SetZtoBeAnalys( z);
+ _contourextractdata->SetZtoBeAnalys( z);
tempVector[1]=z;
Instant instant(&tempVector);
lstManConModTmp = lstManConModExp;
}
- contourextractdata->SetLstManualContourModel( lstManConModTmp );
+ _contourextractdata->SetLstManualContourModel( lstManConModTmp );
+ _contourextractdata->CalculateImageResult(); // with actual Z
+ } // for iContourGroup
+ } // for z
-// for (ii=0 ; ii<sizeLstContourThings ; ii++)
-// {
-// ContourThing **contourthing = lstContourThings[ii];
-// lstManConMod.push_back( (*contourthing)->getModel() );
-// }
-// contourextractdata->SetLstManualContourModel( lstManConMod );
+ (*value) = _contourextractdata->GetVtkImageValueResult();
+ (*mask) = _contourextractdata->GetVtkImageMaskResult();
- contourextractdata->CalculateImageResult(); // with actual Z
+}
- } // for iContourGroup
- } // for z
+void wxContourMainFrame::SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value)
+{
std::string temp = directory + "/" + namefile + "-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());
// Image Value
vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( );
- writerValueImage->SetInput( contourextractdata->GetVtkImageValueResult() );
+ writerValueImage->SetInput( value );
+ writerValueImage->SetInput( value );
writerValueImage->SetFileName( (const char *)filename.mb_str() );
writerValueImage->SetFileDimensionality( 3 );
+ writerValueImage->SetCompression(false);
writerValueImage->Write( );
// Image Mask
filename.append(_T("-Mask.mhd"));*/
vtkMetaImageWriter *writerMaskImage = vtkMetaImageWriter::New( );
- writerMaskImage->SetInput( contourextractdata->GetVtkImageMaskResult() );
+ writerMaskImage->SetInput( mask );
writerMaskImage->SetFileName( (const char *)filename.mb_str() );
writerMaskImage->SetFileDimensionality( 3 );
+ writerValueImage->SetCompression(false);
writerMaskImage->Write( );
interfMainPanel::getInstance()->setStringInfoPanel( _T("") );
- delete contourextractdata;
+
}
+
+
void wxContourMainFrame::onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow){
if( name.compare( _theViewPanel->getVerticalConceptName() ) == 0){
_theViewPanel->setActualVertical( value);
}
void wxContourMainFrame::onSnakePressed(){
- std::vector<double> vecX;
- std::vector<double> vecY;
- std::vector<double> vecZ;
- _theViewPanel->GetPointsOfActualContour( &vecX , &vecY , &vecZ );
+ std::vector<double> vecX;
+ std::vector<double> vecY;
+ std::vector<double> vecZ;
+ _theViewPanel->GetPointsOfActualContour( &vecX , &vecY , &vecZ );
if (vecX.size()!=0){
std::vector<int> tempVector;
} // for
wxDialog* dialog = new wxDialog(this, -1, wxString(_T("Snake")));
- wxPanel* panel = new wxPanel(dialog,-1);
- wxStaticText* sttext = new wxStaticText(panel, -1, wxString(_T("Panel para snake")));
+ 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
}
}else{
onSave();
}
-}
\ No newline at end of file
+}
+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<std::string> 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<std::string> 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<std::string> 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<<std::endl;
+}
+//------------------------------------------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff