From: Juan Prieto Date: Fri, 14 Nov 2008 15:14:50 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~89 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7e39ed1fa75cd57dfea770353f5286bdcee23c24;p=creaContours.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bb441a..ced0a97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,3 +57,4 @@ INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions) SUBDIRS(lib) SUBDIRS(appli) SUBDIRS(bbtk) +SUBDIRS(data) diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx index af72d5c..0589e98 100644 --- a/bbtk/src/bbCreaContournDimensions.cxx +++ b/bbtk/src/bbCreaContournDimensions.cxx @@ -91,7 +91,7 @@ void nDimensions::CreateWidget() //interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons"); - bbSetOutputWidget( frame ); + bbSetOutputWidget( frame1 ); diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..95ff75a --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,12 @@ + +SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/data) + +IF(WIN32) + SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/Debug/data) +ELSE(WIN32) + SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/data) +ENDIF(WIN32) + +FILE(GLOB CONFIGURE_DATA_FILES *.*) + +CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR}) diff --git a/data/Icons/Add.png b/data/Icons/Add.png new file mode 100644 index 0000000..db70db3 Binary files /dev/null and b/data/Icons/Add.png differ diff --git a/data/Icons/Circle.png b/data/Icons/Circle.png new file mode 100644 index 0000000..707e6a0 Binary files /dev/null and b/data/Icons/Circle.png differ diff --git a/data/Icons/Contour.png b/data/Icons/Contour.png new file mode 100644 index 0000000..9a048cb Binary files /dev/null and b/data/Icons/Contour.png differ diff --git a/data/Icons/Delete.png b/data/Icons/Delete.png new file mode 100644 index 0000000..5e45387 Binary files /dev/null and b/data/Icons/Delete.png differ diff --git a/data/Icons/DeleteAll.png b/data/Icons/DeleteAll.png new file mode 100644 index 0000000..3eafa07 Binary files /dev/null and b/data/Icons/DeleteAll.png differ diff --git a/data/Icons/DeleteAllContourSlide.png b/data/Icons/DeleteAllContourSlide.png new file mode 100644 index 0000000..ca26b5c Binary files /dev/null and b/data/Icons/DeleteAllContourSlide.png differ diff --git a/data/Icons/DeleteContour.png b/data/Icons/DeleteContour.png new file mode 100644 index 0000000..544d089 Binary files /dev/null and b/data/Icons/DeleteContour.png differ diff --git a/data/Icons/Go.png b/data/Icons/Go.png new file mode 100644 index 0000000..665285b Binary files /dev/null and b/data/Icons/Go.png differ diff --git a/data/Icons/ITK.png b/data/Icons/ITK.png new file mode 100644 index 0000000..2740e72 Binary files /dev/null and b/data/Icons/ITK.png differ diff --git a/data/Icons/Open.png b/data/Icons/Open.png new file mode 100644 index 0000000..ffbe0b6 Binary files /dev/null and b/data/Icons/Open.png differ diff --git a/data/Icons/Rectangle.png b/data/Icons/Rectangle.png new file mode 100644 index 0000000..c916fc0 Binary files /dev/null and b/data/Icons/Rectangle.png differ diff --git a/data/Icons/Save.png b/data/Icons/Save.png new file mode 100644 index 0000000..790153d Binary files /dev/null and b/data/Icons/Save.png differ diff --git a/data/Icons/Spline.png b/data/Icons/Spline.png new file mode 100644 index 0000000..f71778e Binary files /dev/null and b/data/Icons/Spline.png differ diff --git a/data/Icons/Spread.png b/data/Icons/Spread.png new file mode 100644 index 0000000..ee9c658 Binary files /dev/null and b/data/Icons/Spread.png differ diff --git a/data/Icons/Spread1.png b/data/Icons/Spread1.png new file mode 100644 index 0000000..3157778 Binary files /dev/null and b/data/Icons/Spread1.png differ diff --git a/data/Icons/bullseye.png b/data/Icons/bullseye.png new file mode 100644 index 0000000..040cd4a Binary files /dev/null and b/data/Icons/bullseye.png differ diff --git a/data/Icons/copy.png b/data/Icons/copy.png new file mode 100644 index 0000000..c668a04 Binary files /dev/null and b/data/Icons/copy.png differ diff --git a/data/Icons/info.png b/data/Icons/info.png new file mode 100644 index 0000000..333b038 Binary files /dev/null and b/data/Icons/info.png differ diff --git a/data/Icons/paste.png b/data/Icons/paste.png new file mode 100644 index 0000000..56a26f3 Binary files /dev/null and b/data/Icons/paste.png differ diff --git a/data/Icons/pignon.png b/data/Icons/pignon.png new file mode 100644 index 0000000..d15e144 Binary files /dev/null and b/data/Icons/pignon.png differ diff --git a/data/Icons/redo.png b/data/Icons/redo.png new file mode 100644 index 0000000..887557a Binary files /dev/null and b/data/Icons/redo.png differ diff --git a/data/Icons/remove.png b/data/Icons/remove.png new file mode 100644 index 0000000..9602438 Binary files /dev/null and b/data/Icons/remove.png differ diff --git a/data/Icons/reset.png b/data/Icons/reset.png new file mode 100644 index 0000000..d9f9fd5 Binary files /dev/null and b/data/Icons/reset.png differ diff --git a/data/Icons/segmentation.PNG b/data/Icons/segmentation.PNG new file mode 100644 index 0000000..a9b47ee Binary files /dev/null and b/data/Icons/segmentation.PNG differ diff --git a/data/Icons/snake.png b/data/Icons/snake.png new file mode 100644 index 0000000..7de000f Binary files /dev/null and b/data/Icons/snake.png differ diff --git a/data/Icons/undo.png b/data/Icons/undo.png new file mode 100644 index 0000000..654b06b Binary files /dev/null and b/data/Icons/undo.png differ diff --git a/data/axesOtherConceptsFile.cf b/data/axesOtherConceptsFile.cf new file mode 100644 index 0000000..a1339b6 --- /dev/null +++ b/data/axesOtherConceptsFile.cf @@ -0,0 +1,6 @@ +#automatic concepts specification +numConcepts=1 + +#concept1 +concept1.name=Axe +concept1.size=15 diff --git a/data/hola.mhd b/data/hola.mhd new file mode 100644 index 0000000..0633958 --- /dev/null +++ b/data/hola.mhd @@ -0,0 +1,14 @@ +ObjectType = Image +NDims = 3 +BinaryData = True +BinaryDataByteOrderMSB = False +DimSize = 127 147 187 +HeaderSize = 0 +ElementSpacing = 1 1 1 +Position = 0 0 0 +TransformMatrix = 1 0 0 0 1 0 0 0 1 +Offset = 0 0 0 +CenterOfRotation = 0 0 0 +ElementNumberOfChannels = 1 +ElementType = MET_USHORT +ElementDataFile = hola.raw diff --git a/data/hola.raw b/data/hola.raw new file mode 100644 index 0000000..9945f10 Binary files /dev/null and b/data/hola.raw differ diff --git a/data/holaConceptsFile.cf b/data/holaConceptsFile.cf new file mode 100644 index 0000000..6fdba27 --- /dev/null +++ b/data/holaConceptsFile.cf @@ -0,0 +1,18 @@ +#dimension specification +numConcepts=4 + +#concept1 +concept1.name=Time +concept1.size=20 + +#concept2 +concept2.name=Patients +concept2.size=80 + +#concept3 +concept3.name=Doctors +concept3.size=10 + +#concept4 +concept4.name=Researcher +concept4.size=12 diff --git a/data/holaImagesInstantsFile.of b/data/holaImagesInstantsFile.of new file mode 100644 index 0000000..a4f30e4 --- /dev/null +++ b/data/holaImagesInstantsFile.of @@ -0,0 +1,17 @@ + +#Objects specification1 +numObjects=1 + +#object 1 +object1.name=Source Image 1 + +#instants of the object 1 +object1.numInstants=6 +object1.instant1=1 1 1 +object1.instant2=1 2 1 +object1.instant3=1 1 2 +object1.instant4=1 2 2 +object1.instant5=2 2 2 +object1.instant6=2 1 2 + +#Recordar que el environment no hace ninguna validacion si se dan instantes invalidos se agregan de todos modos. diff --git a/data/imageSectionOtherConceptsFile.cf b/data/imageSectionOtherConceptsFile.cf new file mode 100644 index 0000000..012382e --- /dev/null +++ b/data/imageSectionOtherConceptsFile.cf @@ -0,0 +1,10 @@ +#automatic concepts specification +numConcepts=2 + +#concept1 +concept1.name=Axe +concept1.size=15 + +#concept2 +concept2.name=Axe Depth +concept2.size=300 diff --git a/data/outlinesOtherConceptsFile.cf b/data/outlinesOtherConceptsFile.cf new file mode 100644 index 0000000..012382e --- /dev/null +++ b/data/outlinesOtherConceptsFile.cf @@ -0,0 +1,10 @@ +#automatic concepts specification +numConcepts=2 + +#concept1 +concept1.name=Axe +concept1.size=15 + +#concept2 +concept2.name=Axe Depth +concept2.size=300 diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx index 6121c56..0bf6536 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx @@ -436,12 +436,12 @@ double PanelBullEyeOptions::GetAngDeltaOfCrownSection(int nCrown) else { dataConcept = _instantPanel->getLastConceptData(); - if( dataConcept->getName().compare( _theViewPanel->getVerticalConceptName() ) ) + if( dataConcept->getName().compare( _theViewPanel->getVerticalConceptName() ) == 0) { _theViewPanel->setActualVertical( dataConcept->getActualValue()); //_theViewPanel->setVerticalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue()); } - else if( dataConcept->getName().compare( _theViewPanel->getHorizontalConceptName() ) || _instantPanel->getIfConceptCheckedAt( dataConcept->getName(), 0 ) ) + else if( dataConcept->getName().compare( _theViewPanel->getHorizontalConceptName() ) == 0|| _instantPanel->getIfConceptCheckedAt( dataConcept->getName(), 0 ) ) { _theViewPanel->setHorizontalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue()); } @@ -2613,7 +2613,7 @@ myfile.close(); _instantPanel = theInstantChooserPanel; _instantPanel->setWxEventHandler( this ); - Connect( _instantPanel->GetId(), wxINSTANT_CHOOSER_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourEventHandler::onChangeInstant ); + //Connect( _instantPanel->GetId(), wxINSTANT_CHOOSER_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourEventHandler::onChangeInstant ); std::vector vect; _instantPanel->getInstant( vect ); diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx index 3184c94..e3bc789 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx @@ -4,6 +4,10 @@ #include "wxInstantChooserPanel.h" #include "wxContourMainFrame.h" +//Test JCP 13-10-08 +#include "wxContourEventHandler.h" +//Test JCP 13-10-08 + //---------------------------------------------------------------------------------------------------------------- // Class implementation //---------------------------------------------------------------------------------------------------------------- @@ -196,8 +200,15 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) // Sending the event of wxINSTANT_CHOOSER_CHANGE //------------------------------------------------- wxCommandEvent newevent(wxINSTANT_CHOOSER_CHANGE,GetId()); - _eventHandler->ProcessEvent(newevent); + //this->onChangeInstant(newevent); + ((wxContourEventHandler*)_eventHandler)->onChangeInstant(newevent); + //_eventHandler->ProcessEvent(newevent); } + + void wxInstantChooserPanel :: onChangeInstant( wxCommandEvent& event ){ + + } + //------------------------------------------------------------------------------------------------------------ // Methods for sending events //------------------------------------------------------------------------------------------------------------ diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.h b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.h index 0aceae3..3c46a2e 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.h +++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.h @@ -123,6 +123,8 @@ class wxInstantChooserPanel : public wxPanel { bool getIfConceptCheckedAt( std::string theConceptName, int atChecksPosition ); + void onChangeInstant( wxCommandEvent& event ); + private: //------------------------------------------------------------------------------------------------------------ // Private methods