X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=ca8e2bcb7a8d23cd7001794051aa9003adbdf498;hb=c76fc07e0c9a1153b86ae3f7163402716ec17ccb;hp=1ff0de0ff5334b65aaf3a85d891659b9c0f1a1b5;hpb=8ba77b9cce93770de811bdac8a8341bcb10f036a;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index 1ff0de0..ca8e2bc 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + //---------------------------------------------------------------------------------------------------------------- // Class definition include //---------------------------------------------------------------------------------------------------------------- @@ -45,13 +70,13 @@ char wxContourMainFrame::COPY = 'C'; // _gridPanel = NULL; // _drawToolsPanel = NULL; // _operationsToolsPanel = NULL; - //_autoFormsPanel = NULL; + //_autoFormsPanel = NULL; // _standardToolsPanel = NULL; // _editionToolsPanel = NULL; // _listViewPanel = NULL; // _sceneManager = NULL; - //_actualInstant = NULL; - _numberOfVariablesStatistics = 6+1; + //_actualInstant = NULL; + _numberOfVariablesStatistics= 6+1; _refLineControl = NULL; _refLineModel = NULL; @@ -68,11 +93,10 @@ char wxContourMainFrame::COPY = 'C'; _viewMaskImagePanel = NULL; _viewThresholdImage = NULL; _viewThresholdImagePanel = NULL; - _viewColorLayerImage = NULL; _viewColorLayerImagePanel = NULL; } - wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir) + wxContourMainFrame::wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir) : wxPanel(parent, id, pos, size, style) { m_mgr.SetManagedWindow(this); @@ -89,70 +113,49 @@ char wxContourMainFrame::COPY = 'C'; _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_style = wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; + m_notebook_theme = 0; //wxContour_ActionCommandsID a; - _numberOfVariablesStatistics = 7; - - _datadir = datadir; - - - inredo = 0; - inundo = 0; - + _numberOfVariablesStatistics= 7; + _datadir = datadir; + inredo = 0; + inundo = 0; _pannew = interfMainPanel::getInstance(this,datadir+"/data/Icons");//, eventHandler); - _performingOperation = new PerformingOperation(); - + _performingOperation = new PerformingOperation(); if(images.size() > 0) { this->setVectImages(images); } - _contourextractdata = NULL; } void wxContourMainFrame::setVectImages(std::vector imgs) { - _images = imgs; - #if defined(__GNUC__) std::string str_home(getenv("HOME")); #elif defined(_WIN32) - std::string str_home(getenv("USERPROFILE")); + std::string str_home(getenv("USERPROFILE")); #endif - std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/"; - + std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/"; std::vector conceptNameVect; std::vector conceptSizeVect; - notebook = this->createNotebook(); - - - kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp ); - - - _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); _instantPanel->addConcepts(conceptNameVect, conceptSizeVect); - - double val = _theViewPanel->getCurrentDeep(); _instantPanel->setConceptValue( "Axe Depth", (int)val ); //JCP _instantPanel->setConceptValue("time", num de imagenes); ConceptDataWrap * data = _instantPanel->getConceptDataOf( "Axe Depth" ); //*******************changeInstant(); _theViewPanel->setVerticalConcept( "Axe Depth", data->getMinValue(), data->getMaxValue(), data->getMinShowedValue(), data->getMaxShowedValue(), data->getActualValue() ); - this->configurePanels( ); - } @@ -230,17 +233,13 @@ void wxContourMainFrame::setVectImages(std::vector imgs) notebook->AddPage( _theViewPanel, wxT(" View ") ); m_mgr.Update(); } - - if( configured ) { notebook->AddPage( _instantPanel, wxT("Instant Page") ); m_mgr.Update(); } - m_mgr.AddPane(notebook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false)); m_mgr.Update(); - SetMinSize(wxSize(300,300)); m_mgr.Update(); return configured; @@ -321,20 +320,25 @@ void wxContourMainFrame::onCreateContourSpline( ){ createContour( 1 ); } -void wxContourMainFrame::onCreateContourRectangle( ){ + +void wxContourMainFrame::onCreateContourRectangle( ) +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation createContour( 2 ); } -void wxContourMainFrame::onCreateContourCircle( ){ + +void wxContourMainFrame::onCreateContourCircle( ) +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation createContour( 3 ); } -void wxContourMainFrame::onCreateContourLine( ){ +void wxContourMainFrame::onCreateContourLine( ) +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation @@ -342,7 +346,8 @@ void wxContourMainFrame::onCreateContourLine( ){ } // RaC 09-09 -------------------------------------- -void wxContourMainFrame::onCreateContourPoints( ){ +void wxContourMainFrame::onCreateContourPoints( ) +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation @@ -351,7 +356,8 @@ void wxContourMainFrame::onCreateContourPoints( ){ // RaC 09-09 -------------------------------------- // RaC 10-09 -------------------------------------- -void wxContourMainFrame::onCreateContourPolygon( ){ +void wxContourMainFrame::onCreateContourPolygon( ) +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation @@ -386,15 +392,14 @@ void wxContourMainFrame :: onCreateContourBullEye(wxPanel* panel ) _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , 4) ; } } + void wxContourMainFrame :: createContour( int typeContour ) { //Creating the manualContourModel and including in the model manualBaseModel * manModelContour = kernelManager->factoryManualContourModel(typeContour); - std::vector instantVector; _instantPanel->getInstant( instantVector ); std::string theName = kernelManager->createOutline(manModelContour, instantVector); - /*std::vector instantVector; _instantPanel->getInstant( instantVector ); std::string theName; @@ -408,9 +413,9 @@ void wxContourMainFrame :: createContour( int typeContour ) //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) ; - } - + } // if addedModel } + manualBaseModel * wxContourMainFrame::factoryManualContourModel(wxPanel* panel){ manualContourModelBullEye *manModelContourBullEye = new manualContourModelBullEye(); @@ -443,13 +448,15 @@ manualBaseModel * wxContourMainFrame::factoryManualContourModel(wxPanel* panel){ return manModelContour; } -void wxContourMainFrame :: saveState(){ +void wxContourMainFrame :: saveState() +{ std::string temp = kernelManager->saveState(); saveFileWithContours(temp); } -void wxContourMainFrame::onDeleteContour(){ +void wxContourMainFrame::onDeleteContour() +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation @@ -510,7 +517,8 @@ void wxContourMainFrame :: deleteContours( std::vector keyNamesVec } } -void wxContourMainFrame :: deleteContour( std::string theKeyName ){ +void wxContourMainFrame :: deleteContour( std::string theKeyName ) +{ /* manualContourModel * cModel; manualViewBaseContour * cViewer; @@ -599,17 +607,20 @@ void wxContourMainFrame::deleteAllContours(){ JCP --08-09-2008 */ } -void wxContourMainFrame::setConceptValue( std::string name, int value ){ +void wxContourMainFrame::setConceptValue( std::string name, int value ) +{ _instantPanel->setConceptValue(name, value); } -ConceptDataWrap* wxContourMainFrame::getLastConceptData(){ +ConceptDataWrap* wxContourMainFrame::getLastConceptData() +{ return _instantPanel->getLastConceptData(); } -bool wxContourMainFrame::getIfConceptCheckedAt( std::string name, int pos ){ +bool wxContourMainFrame::getIfConceptCheckedAt( std::string name, int pos ) +{ return _instantPanel->getIfConceptCheckedAt( name, pos ); } @@ -652,11 +663,10 @@ void wxContourMainFrame::changeInstant() std::vector instantVect; _instantPanel->getInstant( instantVect ); int actualSlice = instantVect[1]; - kernelManager->setInstant(instantVect); - // Refresh Mask image - if(_viewMaskImage!=NULL){ + if(_viewMaskImage!=NULL) + { _viewMaskImage->SetZ(actualSlice); if (_viewMaskImagePanel->IsVisible()==true) { @@ -664,24 +674,16 @@ void wxContourMainFrame::changeInstant() getMaskValue(&mask,&value, _contourGroup , 0, -1, -1); _viewMaskImage->onThreshold(); } - } - + } // if _viewMaskImage // Refresh Threshold image - if(_viewThresholdImage!=NULL){ + if(_viewThresholdImage!=NULL) + { _viewThresholdImage->SetZ(actualSlice); - if (_viewThresholdImagePanel->IsVisible()==true){ + if (_viewThresholdImagePanel->IsVisible()==true) + { _viewThresholdImage->onThreshold(); } - } - - // Refresh Threshold image - if(_viewColorLayerImage!=NULL){ - _viewColorLayerImage->SetZ(actualSlice); - if (_viewColorLayerImagePanel->IsVisible()==true){ - _viewColorLayerImage->onThreshold(); - } - } - + } // if _viewThresholdImage updateInstantOutlines(); updateInstantImageData(); updateInstantAxes(); @@ -689,7 +691,7 @@ void wxContourMainFrame::changeInstant() -void wxContourMainFrame :: updateInstantOutlines() +void wxContourMainFrame::updateInstantOutlines() { _theViewPanel->removeSceneContours(); _theViewPanel->addNameWrapperToScene(); @@ -700,10 +702,13 @@ void wxContourMainFrame :: updateInstantOutlines() //} } -int wxContourMainFrame::getNamesWrappingSize(){ +int wxContourMainFrame::getNamesWrappingSize() +{ return kernelManager->getNamesWrappingSize(); } -std::string wxContourMainFrame::getNameWrapping(int i){ + +std::string wxContourMainFrame::getNameWrapping(int i) +{ return kernelManager->getNameWrapping(i); } @@ -735,7 +740,6 @@ void wxContourMainFrame::onChangeDeep(int val){ void wxContourMainFrame::onCopy(){ std::vector currentSelection = _theViewPanel->getSelectedObjects(); - std::vector tempVector; _instantPanel->getInstant( tempVector ); _performingOperation->reset(); @@ -744,9 +748,8 @@ void wxContourMainFrame::onCopy(){ _performingOperation->setKeyNamesOperationElems( currentSelection ); } -void wxContourMainFrame::onPaste(){ - - +void wxContourMainFrame::onPaste() +{ char theStartCommand = _performingOperation->getStartCommand(); if ( theStartCommand == COPY ) { @@ -764,7 +767,9 @@ void wxContourMainFrame::onPaste(){ } } } -void wxContourMainFrame::onUndo(){ + +void wxContourMainFrame::onUndo() +{ std::string filename; if(kernelManager->onUndoSaveFile(filename)){ saveFileWithContours(filename); @@ -833,109 +838,11 @@ void wxContourMainFrame :: createMirrorContourOf ( std::string anExistingKName, _theViewPanel->getSceneManager()->createCopyContourOf( anExistingKName, cloneName, manualModel , append ); } -//EED04 -void wxContourMainFrame ::loadState(std::string filename){ - +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.3 || 1.0.2 || 1.0.1 || 1.0.0 - - deleteAllContours(); - - loadContours(pFile, false); - loadContours(pFile, true); - - fclose(pFile); - */ -} - - -//EED03 -/*EED Borrame -void wxContourMainFrame::loadContours( FILE *pFile, bool staticContour ) -{ - char tmp[255]; - - if (staticContour==false) - { - 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 - } - - fscanf(pFile,"%s",tmp); // NumberOfContours - fscanf(pFile,"%s",tmp); // ## - int numberOfContours = atoi(tmp); - - std::vector instantVector; - int typeContourModel; - manualBaseModel *manModelContour; - int typeView; - - int i; - for (i=0;ifactoryManualContourModel(typeContourModel); - manModelContour->Open(pFile); - - 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==true) - { - Instant instant(&instantVector); - kernelManager->changeContourOfManager( theName , &instant ); - } - }// for numberOfContours } -*/ void wxContourMainFrame::onLoad() @@ -945,7 +852,12 @@ void wxContourMainFrame::onLoad() if(GetFileLocation().empty()) { //------------------------------------------------------------------------------------------------------------ +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxOPEN ); +#else + wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxFD_OPEN ); +#endif if (dialog.ShowModal() == wxID_OK) { fileNameContourROI = (const char *)(dialog.GetPath().mb_str()); @@ -956,14 +868,46 @@ void wxContourMainFrame::onLoad() } +void wxContourMainFrame::SetZForAllContours(int pz) +{ + //-- Normal Contours + std::vector< std::string > lstNameThings; + int i,sizeLstNameThings; + int ii,sizeLstPoints; + + lstNameThings = kernelManager->GetLstNameThings(); + sizeLstNameThings = lstNameThings.size(); + for (i=0 ; igetOutlineByKeyName(lstNameThings[i]); + sizeLstPoints = manualModel->GetSizeLstPoints(); + for (ii=0 ; iiGetManualPoint(ii)->SetPointZ(-900); + }// for ii list of points + }// for i list of Things + + //-- Static Contours + + lstNameThings = kernelManager->GetLstNameThingsStatic(); + sizeLstNameThings = lstNameThings.size(); + for (i=0 ; igetOutlineByKeyName(lstNameThings[i]); + sizeLstPoints = manualModel->GetSizeLstPoints(); + for (ii=0 ; iiGetManualPoint(ii)->SetPointZ(-900); + }// for ii list of points + }// for i list of static things +} + void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool interactiveInterface) { char tmp[255]; char tmpD[255]; - FILE *pFile =fopen(fileNameContourROI.c_str(),"r+"); - - //CMRU 03-09-09- ---------------------------------------------------------------------------------------------- if(pFile != NULL) { @@ -982,13 +926,10 @@ void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool int fscanf(pFileData,"%s",tmpD); // NumberOfContours fscanf(pFileData,"%s",tmpD); // # } - fscanf(pFile,"%s",tmp); // --CreaContour-- - 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); - //AD:02-06-09 _tmpReadFileTypeOfTransformation=-1; if (version=="1.0.3") @@ -996,17 +937,16 @@ void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool int readDimSpc(pFile,interactiveInterface); // DimSpc interactive ON openContours(pFile,pFileData,false); openContours(pFile,pFileData,true); //Load StaticContours - } - + } if (version=="1.0.2") { //EED001 - readDimSpc(pFile,interactiveInterface); // DimSpc interactive ON + readDimSpc(pFile,interactiveInterface); // DimSpc interactive ON openContours(pFile,pFileData,false); - readDimSpc(pFile,false); // DimSpc interactive OFF - openContours(pFile,pFileData,true); //Load StaticContours + readDimSpc(pFile,false); // DimSpc interactive OFF + openContours(pFile,pFileData,true); // Load StaticContours + SetZForAllContours(-900); } - //AD:02-06-09 else if (version=="1.0.1") { @@ -1025,19 +965,22 @@ void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool int if(pFileData != NULL) { fclose(pFileData); - } + } // if } _theViewPanel->getSceneManager()->removeSceneContours(); changeInstant(); - } - -void wxContourMainFrame::onImport(){ +void wxContourMainFrame::onImport() +{ std::string filename, filenamecontours; +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxOPEN ); - +#else + wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxFD_OPEN ); +#endif if (dialog.ShowModal() == wxID_OK) { filename = dialog.GetPath().mb_str(); @@ -1045,19 +988,25 @@ void wxContourMainFrame::onImport(){ if(filenamecontours.compare("") != 0){ onLoadContours(filenamecontours,true); - } - - } + } // if + } // if } -void wxContourMainFrame::onTest(){ + +void wxContourMainFrame::onTest() +{ std::string filename, filenamecontours; +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxOPEN ); +#else + wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxFD_OPEN ); +#endif if (dialog.ShowModal() == wxID_OK) { filename = dialog.GetPath().mb_str(); std::cout << "This is the filename: " << filename << std::endl; - } + } // if } @@ -1067,7 +1016,12 @@ void wxContourMainFrame::onSave(){ if(GetFileLocation().empty()) { //------------------------------------------------------------------------------------------------------------ +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxSAVE ); +#else + wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxFD_SAVE ); +#endif if (dialog.ShowModal() == wxID_OK) { std::string fileNameContourROI = (const char *)(dialog.GetPath().mb_str()); @@ -1134,11 +1088,22 @@ void wxContourMainFrame::saveFileWithContours( std::string filename ) fprintf(pFileData,"NumberOfContours %d\n", sizeLstNameThings ); //------------------------------------------------------------------------------------------------------------ + +// EED 2017-05-30 + double spc[3]; + spc[0]=1; + spc[1]=1; + spc[2]=1; + for (i=0 ; igetOutlineByKeyName(lstNameThings[i]); - double sizeInPixel = manualModel ->GetPathSize(); + +// EED 2017-05-30 +// double sizeInPixel = manualModel ->GetPathSize( ); + double sizeInPixel = manualModel ->GetPathSize( spc ); + double realContourSize = sizeInPixel*_onePixelSize; manualModel ->SetRealSize(realContourSize); //------------------------------------------------------------------------------------------------------------ @@ -1204,7 +1169,7 @@ void wxContourMainFrame::readDimSpc(FILE *pFile, bool interactiveOption) //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)); + wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(460,360)); wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL); @@ -1397,14 +1362,16 @@ void wxContourMainFrame::openContours( FILE *pFile, FILE *pFileData, bool static } -void wxContourMainFrame::RefreshInterface(){ +void wxContourMainFrame::RefreshInterface() +{ changeInstant(); _theViewPanel->RefreshInterface(); //wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)this->_theViewPanel->getWxVtkBaseView(); //wxvtk2dbaseview->Refresh(); } -vtkImageData* wxContourMainFrame::getImageData(){ +vtkImageData* wxContourMainFrame::getImageData() +{ return _theViewPanel->getImageData(); } @@ -1475,7 +1442,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d //DefinciÛn de conexiÛnes entre VTK e ITK y el writer typedef itk::VTKImageToImageFilter ConnectorType; typedef itk::ImageToVTKImageFilter ConnectorType2; - typedef itk::ImageFileWriter< OutputImageType > WriterType; +//EED10JUIN2011 typedef itk::ImageFileWriter< OutputImageType > WriterType; ConnectorType::Pointer connector= ConnectorType::New(); ConnectorType2::Pointer connector2= ConnectorType2::New(); @@ -1515,7 +1482,12 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d FastMarchingFilterType::Pointer fastMarching = FastMarchingFilterType::New(); - + +printf("EED wxContourMainFrame::SegmentationOneSliceITK Skypping this code. Not compiling GeodesicActiveContourLevelSetImageFilter in fedora 17 with ITK 3.20.1 \n "); +/*EED 17 sept 2010 + > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - Not compiling GeodesicActiveContourLevelSetImageFilter in fedora 17 with ITK 3.20.1 + + typedef itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType, InternalImageType > GeodesicActiveContourFilterType; GeodesicActiveContourFilterType::Pointer geodesicActiveContour = @@ -1548,7 +1520,12 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d //thresholder->SetInput( zeroCrossing->GetOutput() ); thresholder->SetInput( geodesicActiveContour->GetOutput() ); connector2->SetInput( thresholder->GetOutput() ); - + +< - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - < - +*/ + + + smoothing->SetTimeStep( 0.125 ); smoothing->SetNumberOfIterations( 5 ); @@ -1601,34 +1578,63 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d vtkMarchingContourFilter* cntVTK = vtkMarchingContourFilter::New( ); - cntVTK->SetInput( idata ); - cntVTK->SetNumberOfContours( 1 ); cntVTK->SetValue( 0, 255 ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + cntVTK->SetInput( idata ); cntVTK->Update( ); cntVTK->UpdateInformation(); +#else + cntVTK->SetInputData( idata ); +#endif vtkCleanPolyData* cpd = vtkCleanPolyData::New( ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 cpd->SetInput( cntVTK->GetOutput( ) ); cpd->Update( ); cpd->UpdateInformation(); +#else + cpd->SetInputData( cntVTK->GetOutput( ) ); +#endif + vtkPolyDataConnectivityFilter* conn = vtkPolyDataConnectivityFilter::New( ); conn->SetExtractionModeToLargestRegion( ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 conn->SetInput( cpd->GetOutput( ) ); conn->Update( ); conn->UpdateInformation(); +#else + conn->SetInputData( cpd->GetOutput( ) ); +#endif + vtkStripper* vtkstripper = vtkStripper::New( ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 vtkstripper->SetInput( conn->GetOutput() ); vtkstripper->Update(); vtkstripper->UpdateInformation(); - +#else + vtkstripper->SetInputData( conn->GetOutput() ); + cntVTK->Update(); +#endif vtkPolyData* polyDataResult = cntVTK->GetOutput(); //std::cout<<"Points "<GetNumberOfPoints()<Update( ); polyDataResult->UpdateInformation(); +#else + // .. +#endif //EED /* @@ -1797,7 +1803,8 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d } // if sizeCtrPt - +/* +//EED10JUIN2011 WriterType::Pointer writer = WriterType::New(); CastFilterType3::Pointer caster = CastFilterType3::New(); @@ -1847,6 +1854,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d caster5->SetOutputMinimum( 0 ); caster5->SetOutputMaximum( 255 ); writer5->Update(); +*/ } catch( itk::ExceptionObject & excep ) { @@ -1887,19 +1895,41 @@ void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue // y = y*spc[1]; // z = z*spc[3]; +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 imageReslice->SetInput( imagedata ); +#else + imageReslice->SetInputData( imagedata ); +#endif imageReslice->SetInformationInput(imagedata); imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1); imageReslice->SetResliceAxesOrigin(0,0,z); imageReslice->SetOutputDimensionality(2); imageReslice->SetInterpolationModeToLinear(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + // .. +#else + imageReslice->Update(); +#endif + imagedata = imageReslice->GetOutput(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 imagedata->Update(); imagedata->UpdateInformation(); +#else + // .. +#endif vtkContourFilter* cntVTK = vtkContourFilter::New( ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 cntVTK->SetInput( imagedata ); +#else + cntVTK->SetInputData( imagedata ); +#endif cntVTK->SetNumberOfContours( 1 ); //cntVTK->SetValue( 0, vmin ); @@ -1910,7 +1940,12 @@ void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue cntVTK->UpdateInformation(); vtkCleanPolyData* cpd = vtkCleanPolyData::New( ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 cpd->SetInput( cntVTK->GetOutput( ) ); +#else + cpd->SetInputData( cntVTK->GetOutput( ) ); +#endif cpd->ConvertLinesToPointsOff( ); cpd->Update( ); cpd->UpdateInformation(); @@ -1919,27 +1954,47 @@ void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue conn->SetExtractionModeToClosestPointRegion( ); //conn->SetMaxRecursionDepth( 3000 ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 conn->SetInput( cpd->GetOutput( ) ); +#else + conn->SetInputData( cpd->GetOutput( ) ); +#endif conn->SetClosestPoint( x, y, 0 ); conn->Update( ); conn->UpdateInformation(); vtkCleanPolyData* cpd2 = vtkCleanPolyData::New( ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 cpd2->SetInput( conn->GetOutput( ) ); +#else + cpd2->SetInputData( conn->GetOutput( ) ); +#endif cpd2->Update(); cpd2->UpdateInformation(); vtkStripper* vtkstripper = vtkStripper::New( ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 vtkstripper->SetInput( cpd2->GetOutput() ); +#else + vtkstripper->SetInputData( cpd2->GetOutput() ); +#endif vtkstripper->Update(); vtkstripper->UpdateInformation(); vtkPolyData* polyDataResult = vtkstripper->GetOutput(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 polyDataResult->Update( ); polyDataResult->UpdateInformation(); +#else + //... +#endif /* EED ofstream myfile; @@ -2285,29 +2340,33 @@ int wxContourMainFrame::getWindowLevel() return _theViewPanel->getWindowLevel(); } -void wxContourMainFrame::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel){ +void wxContourMainFrame::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel) +{ _theViewPanel->onBrigthnessColorWindowLevel(colorwindow, windowlevel); RefreshInterface(); } -void wxContourMainFrame::onInterpolation(bool interpolate){ +void wxContourMainFrame::onInterpolation(bool interpolate) +{ _theViewPanel->onInterpolation(interpolate); RefreshInterface(); } -void wxContourMainFrame::onChangeInstant(std::string name,int actual){ +void wxContourMainFrame::onChangeInstant(std::string name,int actual) +{ _instantPanel->setConceptValue( name, actual ); } -void wxContourMainFrame::resetAppend(){ +void wxContourMainFrame::resetAppend() +{ kernelManager->resetAppend(); - } -void wxContourMainFrame::onSpreadAdd(){ +void wxContourMainFrame::onSpreadAdd() +{ std::vector vecX; std::vector vecY; std::vector vecZ; @@ -2319,7 +2378,8 @@ void wxContourMainFrame::onSpreadAdd(){ } -void wxContourMainFrame::onSpreadAddAll(){ +void wxContourMainFrame::onSpreadAddAll() +{ //EED02 std::vector tempVector; _instantPanel->getInstant( tempVector ); @@ -2357,7 +2417,8 @@ void wxContourMainFrame::onSpreadAddAll(){ } -void wxContourMainFrame::onSpreadGo(int type){ +void wxContourMainFrame::onSpreadGo(int type) +{ //JCP 20-10-08 Undo redo implementation saveState(); //JCP 20-10-08 Undo redo implementation @@ -2412,11 +2473,12 @@ void wxContourMainFrame::onSpreadGo(int type){ //RefreshInterface(); } -void wxContourMainFrame::getInstantVector(std::vector& tempVector){ - +void wxContourMainFrame::getInstantVector(std::vector& tempVector) +{ } -std::vector wxContourMainFrame::getOutlinesName(int slide){ +std::vector wxContourMainFrame::getOutlinesName(int slide) +{ std::vector tempVector; _instantPanel->getInstant(tempVector); //Asignation of slide number should be different ex by name @@ -2433,7 +2495,6 @@ void wxContourMainFrame::SetScalarRange(int grayRangeMin, int grayRangeMax) void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax) { -//EED01Juillet2009 GenerateContourExtractData(); wxString tempString; int maxContourGroup = 0; @@ -2458,8 +2519,6 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel std::vector tempVector; _instantPanel->getInstant( tempVector ); -//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getImageData(); -// int sizeZ = _theViewPanel->GetImageDataSizeZ(); int z; int ii,sizeLstContourThings; @@ -2482,7 +2541,6 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel totalZ = maxZ-minZ+1; -//EED01Juillet2009 _contourextractdata->SetImage( imagedata); _contourextractdata->InitVolumeStatistics(); @@ -2746,7 +2804,6 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefile,int typeContourGroup) { wxBusyCursor wait; -//EED01Juillet2009 GenerateContourExtractData(); //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection(); _contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); @@ -2762,7 +2819,6 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil std::vector tempVector; _instantPanel->getInstant( tempVector ); -//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData(); int sizeZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ(); int z; int ii,sizeLstContourThings; @@ -2776,7 +2832,6 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil maxZ = sizeZ;//_mbarrange->GetEnd(); totalZ = maxZ-minZ+1; -//EED01Juillet2009 _contourextractdata->SetImage( imagedata); // For each slice.. for ( z=0 ; z_radiolstboxContourGroup->GetSelection(); if (typeContourGroup==3) @@ -2913,7 +2967,6 @@ void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value totalZ = maxZ-minZ; -//EED01Juillet2009 _contourextractdata->SetImage( imagedata); // cleanning image before range for (z=0; zGetSpacing(spc,0); // returns the spacing of the first image + + std::string temp = directory + "/" + namefile + "-image-Value.mhd"; wxString filename = crea::std2wx(temp); - // 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()); - filename.append(_T("\\")); - filename.append(_T("%s"),namefile.c_str()); - filename.append(_T("-Value.mhd"));*/ // Image Value + + vtkImageChangeInformation *valueChInfo = vtkImageChangeInformation::New(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + valueChInfo->SetInput(value); +#else + valueChInfo->SetInputData(value); +#endif + valueChInfo->SetSpacingScale(spc); vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( ); - writerValueImage->SetInput( value ); - writerValueImage->SetInput( value ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + writerValueImage->SetInput( valueChInfo->GetOutput() ); +#else + writerValueImage->SetInputData( valueChInfo->GetOutput() ); +#endif writerValueImage->SetFileName( (const char *)filename.mb_str() ); writerValueImage->SetFileDimensionality( 3 ); writerValueImage->SetCompression(false); writerValueImage->Write( ); // Image Mask - // filename.Printf("%s\\%s-Mask.mhd",directory.c_str(),namefile.c_str(),z); - temp = directory + "/" + namefile + "-Mask.mhd"; + temp = directory + "/" + namefile + "-image-Mask.mhd"; // LG 14/01/09 : using crea filename = crea::std2wx(temp); // filename.Printf(_T(temp.c_str())); - /*filename.Printf(_T("%s"),directory.c_str()); - filename.append(_T("\\")); - filename.append(_T("%s"),namefile.c_str()); - filename.append(_T("-Mask.mhd"));*/ + vtkImageChangeInformation *maskChInfo = vtkImageChangeInformation::New(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + maskChInfo->SetInput(mask); +#else + maskChInfo->SetInputData(mask); +#endif + maskChInfo->SetSpacingScale(spc); vtkMetaImageWriter *writerMaskImage = vtkMetaImageWriter::New( ); - writerMaskImage->SetInput( mask ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + writerMaskImage->SetInput( maskChInfo->GetOutput() ); +#else + writerMaskImage->SetInputData( maskChInfo->GetOutput() ); +#endif + writerMaskImage->SetFileName( (const char *)filename.mb_str() ); writerMaskImage->SetFileDimensionality( 3 ); - writerValueImage->SetCompression(false); + writerMaskImage->SetCompression(false); writerMaskImage->Write( ); interfMainPanel::getInstance()->setStringInfoPanel( _T("") ); @@ -3117,12 +3190,8 @@ wxPanel *wxContourMainFrame::getColorLayerImageViewPanel(wxWindow *parent) _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() ); + _viewColorLayerImagePanel = new ColorLayerImageViewPanel( parent, min, max, 100, 1); + _viewColorLayerImagePanel->GetColorLayerImageViewManager()->SetwxVtkBaseView( 0 , _theViewPanel->getWxVtkBaseView() ); } return _viewColorLayerImagePanel; } @@ -3172,10 +3241,18 @@ double wxContourMainFrame::getContourSizeInPixels() std::string cloneName = currentSelection [0]; manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);//_modelManager->getOutlineByKeyName( cloneName )->getModel(); - contourSize = manualModel-> GetPathSize(); + +// EED 2017-05-30 +// contourSize = manualModel->GetPathSize(); + double spc[3]; + spc[0]=1; + spc[1]=1; + spc[2]=1; + contourSize = manualModel->GetPathSize( spc ); } return contourSize; } + manualBaseModel * wxContourMainFrame::getContour () { std::vector currentSelection = _theViewPanel->getSelectedObjects(); @@ -3205,9 +3282,16 @@ void wxContourMainFrame::onPrintLabel (wxString label, manualBaseModel* manualMo } void wxContourMainFrame::onInsertCalculation(manualBaseModel* manualModel) { - double sizeInPixel = manualModel ->GetPathSize(); +// EED 2017-05-30 +// double sizeInPixel = manualModel ->GetPathSize( ); + double spc[3]; + spc[0]=1; // ???? + spc[1]=1; // ???? + spc[2]=1; // ???? + double sizeInPixel = manualModel ->GetPathSize( spc ); + double onePixelRealSize = interfMainPanel::getInstance()->GetPixelValue();; - double realContourSize = sizeInPixel*onePixelRealSize; + double realContourSize = sizeInPixel*onePixelRealSize; manualModel ->SetRealSize(realContourSize); } @@ -3227,3 +3311,103 @@ void wxContourMainFrame::SetFileLocation(std::string newFileLocation) std::cout<<"GETFILELOCATION:"<<_fileLocation<)_theViewPanel->getSceneManager()->getSelectedObjects() , + flipDirection + ); + +} + +void wxContourMainFrame::FlipActualSliceContours(int flipDirection) +{ + FlipLstOfContours( + (std::vector)_theViewPanel->getSceneManager()->GetlstContoursNameActualSlice() , + flipDirection + ); +} + +void wxContourMainFrame::FlipAllContours(int flipDirection) +{ + FlipLstOfContours( + kernelManager->GetLstNameThings() , + flipDirection + ); +} + +void wxContourMainFrame::FlipLstOfContours(std::vector lstNameThings, int flipDirection) +{ + int ext[6]; + getImageData()->GetExtent(ext); + int sizeX = ext[1]-ext[0]; + int sizeY = ext[3]-ext[2]; + + + int i,sizeLstNameThings; + int ii,sizeLstPoints; + + sizeLstNameThings = lstNameThings.size(); + for (i=0 ; igetOutlineByKeyName(lstNameThings[i]); + if (flipDirection==0) + { + manualModel->Transform_Ax_Plus_B(-1,sizeX,1,0 ); + } else { + manualModel->Transform_Ax_Plus_B(1,0,-1,sizeY ); + } + }// for i list of Things + + //-- Static Contours + + lstNameThings = kernelManager->GetLstNameThingsStatic(); + sizeLstNameThings = lstNameThings.size(); + for (i=0 ; igetOutlineByKeyName(lstNameThings[i]); + if (flipDirection==0) + { + manualModel->Transform_Ax_Plus_B(-1,sizeX,1,0 ); + } else { + manualModel->Transform_Ax_Plus_B(1,0,-1,sizeY ); + } + }// for i list of static things +} + +void wxContourMainFrame::FlipContours(int typeContourFlip, int flipDirection) +{ + printf("EED wxContourMainFrame::FlipContours( %d , %d ) \n",typeContourFlip, flipDirection ); + + saveState(); + + if (typeContourFlip==0) // + { + FlipSelectedContours(flipDirection); + } + + if (typeContourFlip==1) // + { + FlipActualSliceContours(flipDirection); + } + + if (typeContourFlip==2) // + { + FlipAllContours(flipDirection); + } + RefreshInterface(); +} + + + + +