From c6b0d7086b5adbeaa6ea97929068fb80e003091f Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Wed, 8 Apr 2009 09:52:03 +0000 Subject: [PATCH 1/1] Changed D1111_0011 attribute to NumberOfChildren --- src2/creaImageIOGimmickReaderDialog.h | 2 +- src2/creaImageIOSQLiteTreeHandler.cpp | 6 +++--- src2/creaImageIOTreeDescriptor.cpp | 6 ++---- src2/creaImageIOTreeHandlerImageAdder.cpp | 8 ++++++-- src2/creaImageIOWxGimmickFrame.h | 2 +- src2/creaImageIOWxGimmickReaderDialog.h | 2 +- src2/creaImageIOWxGimmickView.cpp | 1 + src2/doxygen/CMakeLists.txt | 5 ++++- src2/doxygen/DoxyMainPage.txt.in | 20 ++++++++++---------- 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h index 7cbacb9..26cb2ad 100644 --- a/src2/creaImageIOGimmickReaderDialog.h +++ b/src2/creaImageIOGimmickReaderDialog.h @@ -12,7 +12,7 @@ namespace creaImageIO * returns true if the user clicked 'Ok', false if 'Cancel' * and fills the vector of images */ - bool GimmickReaderDialog(std::vector& images, + bool __declspec(dllexport) GimmickReaderDialog(std::vector& images, const std::string& title = "Select images", int posx = 0, int posy = 0, int sizex = 1200, int sizey = 800, diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp index aec5155..26a9641 100644 --- a/src2/creaImageIOSQLiteTreeHandler.cpp +++ b/src2/creaImageIOSQLiteTreeHandler.cpp @@ -138,7 +138,7 @@ namespace creaImageIO nC=nC+1; std::stringstream out; out <GetLevel()+1); @@ -163,7 +163,7 @@ namespace creaImageIO { std::stringstream out; out <0) { - std::string query = "SELECT D1111_0011 FROM "; + std::string query = "SELECT NumberOfChildren FROM "; query += GetTree().GetLevelDescriptor(level).GetName(); if (level>0) { diff --git a/src2/creaImageIOTreeDescriptor.cpp b/src2/creaImageIOTreeDescriptor.cpp index 5b2a447..602ffab 100644 --- a/src2/creaImageIOTreeDescriptor.cpp +++ b/src2/creaImageIOTreeDescriptor.cpp @@ -50,8 +50,7 @@ namespace creaImageIO // Patient level Add(LevelDescriptor("Patient")); - Add(AttributeDescriptor(0x1111,0x0011, // Number of Series - AttributeDescriptor::LABEL),1); + Add(AttributeDescriptor("NumberOfChildren","#Series",0),1); // Number of Series Add(AttributeDescriptor(0x0010,0x0010, // Patient name AttributeDescriptor::LABEL),1); Add(AttributeDescriptor(0x0010,0x0040),1); // Patient sex @@ -61,8 +60,7 @@ namespace creaImageIO // Study-series level Add(LevelDescriptor("Series")); - Add(AttributeDescriptor(0x1111,0x0011, // Number of Images - AttributeDescriptor::LABEL),2); + Add(AttributeDescriptor("NumberOfChildren","#Images",0),2); // Number of images Add(AttributeDescriptor(0x0008,0x0060, // Modality AttributeDescriptor::LABEL),2); Add(AttributeDescriptor(0x0008,0x1030),2); // Study Description diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp index ef31c09..d2431aa 100644 --- a/src2/creaImageIOTreeHandlerImageAdder.cpp +++ b/src2/creaImageIOTreeHandlerImageAdder.cpp @@ -113,8 +113,12 @@ namespace creaImageIO AddFile( itr->string() ); } mProgressSignal(mProgress); - if (mProgress.GetStop()) break; - } + if (mProgress.GetStop()) + { + itr = end_itr; +// break; + } + } } } diff --git a/src2/creaImageIOWxGimmickFrame.h b/src2/creaImageIOWxGimmickFrame.h index 0572fcb..ae99a10 100644 --- a/src2/creaImageIOWxGimmickFrame.h +++ b/src2/creaImageIOWxGimmickFrame.h @@ -13,7 +13,7 @@ namespace creaImageIO */ //===================================================================== //===================================================================== - class /*CREAIMAGEIO_EXPORT*/ WxGimmickFrame : public wxFrame + class CREAIMAGEIO_EXPORT WxGimmickFrame : public wxFrame { public: WxGimmickFrame(); diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h index dbd874c..0ed3d4a 100644 --- a/src2/creaImageIOWxGimmickReaderDialog.h +++ b/src2/creaImageIOWxGimmickReaderDialog.h @@ -14,7 +14,7 @@ namespace creaImageIO //===================================================================== //===================================================================== - class /*CREAIMAGEIO_EXPORT*/ WxGimmickReaderDialog : public wxDialog + class CREAIMAGEIO_EXPORT WxGimmickReaderDialog : public wxDialog { public: WxGimmickReaderDialog(); diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index cdda6f2..f70f943 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -548,6 +548,7 @@ namespace creaImageIO //TODO Select current tree handler wxBusyCursor busy; GetTreeViewMap()["Local database"]->RemoveSelected(); + ClearSelection(); } //================================================= diff --git a/src2/doxygen/CMakeLists.txt b/src2/doxygen/CMakeLists.txt index dc7237d..a000c3c 100644 --- a/src2/doxygen/CMakeLists.txt +++ b/src2/doxygen/CMakeLists.txt @@ -73,13 +73,16 @@ ENDMACRO(CREA_BUILD_DOXYGEN_DOC) -FILE(GLOB PAGES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.html") +FILE(GLOB PAGES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.htm") + +MESSAGE("DOXYGEN HTML PAGES = ${PAGES}") FOREACH(PAGE ${PAGES}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${PAGE} ${PROJECT_BINARY_DIR}/doxygen/${PAGE} IMMEDIATE ) + MESSAGE("COPYING ${PAGE} TO ${PROJECT_BINARY_DIR}/doxygen/${PAGE}") ENDFOREACH(PAGE) CONFIGURE_FILE( diff --git a/src2/doxygen/DoxyMainPage.txt.in b/src2/doxygen/DoxyMainPage.txt.in index 0e64729..c85928d 100644 --- a/src2/doxygen/DoxyMainPage.txt.in +++ b/src2/doxygen/DoxyMainPage.txt.in @@ -4,31 +4,31 @@ \htmlonly

Architecture Description (v2)


- Architecture + Architecture

Diagrams of the architecture


- Class Diagram + Class Diagram
- Component Diagram + Component Diagram
- Layer Diagram + Layer Diagram

Sequence Diagrams


- On "Add Files" to a database + On "Add Files" to a database
- On "Add Directories" to a database + On "Add Directories" to a database
- On "Remove Files" from database + On "Remove Files" from database
- On "Create a database" + On "Create a database"
- On "Selection has changed" + On "Selection has changed"
- On "Get Selected Images as VTK structures" + On "Get Selected Images as VTK structures"
\endhtmlonly -- 2.45.1