Changed D1111_0011 attribute to NumberOfChildren

diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h
index 7cbacb9f10bbdce9053277bf7a2ebb7e013d5e73..26cb2ad53253e8f7f1b7c89532b3ec58a58f3d46 100644 (file)
--- 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<vtkImageData*>& images,
+  bool __declspec(dllexport) GimmickReaderDialog(std::vector<vtkImageData*>& 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 aec51554f68406d87bd679cebf989b9770b542cf..26a9641d92247dbe21f04aac67008cc4718f5683 100644 (file)
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -138,7 +138,7 @@ namespace creaImageIO
        nC=nC+1;
        std::stringstream out;
        out <<nC;
-       SetAttribute(parent,"D1111_0011",out.str());
+       SetAttribute(parent,"NumberOfChildren",out.str());
        }
     return (parent->GetLevel()+1);
          
@@ -163,7 +163,7 @@ namespace creaImageIO
        {       
                std::stringstream out;
                out <<nC;
-               SetAttribute(parent,"D1111_0011",out.str());
+               SetAttribute(parent,"NumberOfChildren",out.str());
        }
        else
        {
@@ -897,7 +897,7 @@ namespace creaImageIO
        
        if(level<GetTree().GetNumberOfLevels()&& level>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 5b2a447d78cc6a2b26f9b6948a7fb75b6f6643b6..602ffabac3ce2b536fc3fafc6b8bf165e5f3a308 100644 (file)
--- 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 ef31c09f651f327a5276e9301c21c9e364063782..d2431aa1ad083914bbcd0b8876c980ace9d7778d 100644 (file)
--- 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 0572fcb84daffce1d244954affb4a07b355e701f..ae99a100e4d5f3c4f0ddfa4e1534cbc17531cb1d 100644 (file)
--- 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 dbd874cf2751484dc8cccc925ac1f9a007996a5d..0ed3d4ae521295ca9d4d8c8d0523477e1b570bd9 100644 (file)
--- 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 cdda6f277bb4a8f57d21b0dd5badfb02944621d6..f70f9430ee0259557deeebcc38cdfc4660b5f826 100644 (file)
--- 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 dc7237d759576a0d7de02e1ff34a06f73f30f979..a000c3cb04a47cece32a67cf2f262e3d81c47b28 100644 (file)
--- 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 0e647298d0f169cc5a7568050153bc51b77dd698..c85928d9f72802177cad1189f2121af984e06ea9 100644 (file)
--- a/src2/doxygen/DoxyMainPage.txt.in
+++ b/src2/doxygen/DoxyMainPage.txt.in
@@ -4,31 +4,31 @@
 \htmlonly 
 <H2>Architecture Description (v2)</H2>
 <br>
-<a href="../../Architecture.htm"> Architecture </a>
+<a href="Architecture.htm"> Architecture </a>
 <br>
 
 <H2>Diagrams of the architecture</H2>
 <br>
-<a href="../../ClassDiagram.htm"> Class Diagram </a>
+<a href="ClassDiagram.htm"> Class Diagram </a>
 <br>
-<a href="../../ComponentDiagram.htm"> Component Diagram </a>
+<a href="ComponentDiagram.htm"> Component Diagram </a>
 <br>
-<a href="../../LayerDiagram.htm"> Layer Diagram </a>
+<a href="LayerDiagram.htm"> Layer Diagram </a>
 <br>
 
 <H2>Sequence Diagrams</H2>
 <br>
-<a href="../../SeqAddFile.htm"> On "Add Files" to a database </a>
+<a href="SeqAddFile.htm"> On "Add Files" to a database </a>
 <br>
-<a href="../../SeqAddDir.htm"> On "Add Directories" to a database </a>
+<a href="SeqAddDir.htm"> On "Add Directories" to a database </a>
 <br>
-<a href="../../SeqRemove.htm"> On "Remove Files" from database </a>
+<a href="SeqRemove.htm"> On "Remove Files" from database </a>
 <br>
-<a href="../../SeqCreateDB.htm"> On "Create a database" </a>
+<a href="SeqCreateDB.htm"> On "Create a database" </a>
 <br>
-<a href="../../SeqSelChanged.htm"> On "Selection has changed" </a>
+<a href="SeqSelChanged.htm"> On "Selection has changed" </a>
 <br>
-<a href="../../SeqGetImages.htm"> On "Get Selected Images as VTK structures" </a>
+<a href="SeqGetImages.htm"> On "Get Selected Images as VTK structures" </a>
 <br>
 
 \endhtmlonly