Created GimmickView.h

Modified class documentation.
Added modules.

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index 126ff09..c351332 100644 (file)
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -5,6 +5,19 @@
 
 namespace creaImageIO
 {
+       /**
+       * \defgroup Controller Controller
+       */
+       /**
+       * \defgroup View View
+       */
+       /**
+       * \defgroup Model Model
+       */
+
+       /**
+       * \ingroup Controller
+       */
 
   //=======================================================================
   /// Central controler of the gimmick application

diff --git a/src2/creaImageIOImageFinder.h b/src2/creaImageIOImageFinder.h
index 8eba703..6e6a9e3 100644 (file)
--- a/src2/creaImageIOImageFinder.h
+++ b/src2/creaImageIOImageFinder.h
@@ -8,10 +8,13 @@
 
 namespace creaImageIO
 {
-
+       /**
+       * \ingroup Model
+       */
 
   //=======================================================================
   /// Parses (recursively) a part of a filesystem to look for known images and load their attributes in order to add the images to a Tree (submission via a TreeHandler::AddBranch)
+
   class ImageFinder
   {
   public:

diff --git a/src2/creaImageIOImageReader.h b/src2/creaImageIOImageReader.h
index f05b6d4..2f3e7d0 100644 (file)
--- a/src2/creaImageIOImageReader.h
+++ b/src2/creaImageIOImageReader.h
@@ -13,6 +13,9 @@ namespace creaImageIO
 {
 
 
+       /**
+       * \ingroup Model
+       */
   //=====================================================================
   /// Image reader of a specific image format
   class SpecificImageReader;

diff --git a/src2/creaImageIOMultiThreadImageReader.h b/src2/creaImageIOMultiThreadImageReader.h
index d72981d..c42d6cf 100644 (file)
--- a/src2/creaImageIOMultiThreadImageReader.h
+++ b/src2/creaImageIOMultiThreadImageReader.h
@@ -11,7 +11,9 @@
 
 namespace creaImageIO
 {
-
+       /**
+       * \ingroup Model
+       */
   //=====================================================================
   class ThreadedImageReader;
   class MultiThreadImageReader;

diff --git a/src2/creaImageIOSQLiteTreeHandler.h b/src2/creaImageIOSQLiteTreeHandler.h
index a1a4f62..341b81b 100644 (file)
--- a/src2/creaImageIOSQLiteTreeHandler.h
+++ b/src2/creaImageIOSQLiteTreeHandler.h
@@ -8,7 +8,9 @@ class CppSQLite3DB;
 namespace creaImageIO
 {
 
-
+/**
+       * \ingroup Model
+       */
   //=======================================================================
   /// Concrete TreeHandler which manages a tree stored in a sqlite database
   class SQLiteTreeHandler : virtual public TreeHandler

diff --git a/src2/creaImageIOTree.h b/src2/creaImageIOTree.h
index 3a4ba05..fe928ac 100644 (file)
--- a/src2/creaImageIOTree.h
+++ b/src2/creaImageIOTree.h
@@ -8,7 +8,9 @@ namespace creaImageIO
 
   namespace tree
   {
-    
+    /**
+       * \ingroup Model
+       */
     //=====================================================================
     /// Abstract class to store user data on a tree
     struct TreeData

diff --git a/src2/creaImageIOTreeAttributeDescriptor.h b/src2/creaImageIOTreeAttributeDescriptor.h
index 1a68bfa..f48a4c0 100644 (file)
--- a/src2/creaImageIOTreeAttributeDescriptor.h
+++ b/src2/creaImageIOTreeAttributeDescriptor.h
@@ -9,6 +9,9 @@ namespace creaImageIO
 
   namespace tree
   {
+         /**
+       * \ingroup Model
+       */
     //=====================================================================
     /// Descriptor of an attribute of a node of a tree (name, dicom group/element)
     class AttributeDescriptor

diff --git a/src2/creaImageIOTreeComparators.h b/src2/creaImageIOTreeComparators.h
index d86bd24..dbaf347 100644 (file)
--- a/src2/creaImageIOTreeComparators.h
+++ b/src2/creaImageIOTreeComparators.h
@@ -14,7 +14,9 @@ namespace creaImageIO
     class Node;
     
     
-
+       /**
+       * \ingroup Model
+       */
   //=====================================================================
     /// Abstract definition of a comparator of Node
   struct Comparator

diff --git a/src2/creaImageIOTreeDescriptor.h b/src2/creaImageIOTreeDescriptor.h
index e1812d3..29f0ba8 100644 (file)
--- a/src2/creaImageIOTreeDescriptor.h
+++ b/src2/creaImageIOTreeDescriptor.h
@@ -9,6 +9,10 @@ namespace creaImageIO
 
   namespace tree
   {
+
+         /**
+       * \ingroup Model
+       */
     //=====================================================================
     /// Descriptor of the structure a tree 
 /// (number of levels, descriptors of each level, ...).

diff --git a/src2/creaImageIOTreeHandler.h b/src2/creaImageIOTreeHandler.h
index 368c519..2986ab4 100644 (file)
--- a/src2/creaImageIOTreeHandler.h
+++ b/src2/creaImageIOTreeHandler.h
@@ -6,7 +6,9 @@
 namespace creaImageIO
 {
 
-
+/**
+       * \ingroup Model
+       */
   //=======================================================================
   /// Abstract class which 'handles' a Tree structure 
   class TreeHandler

diff --git a/src2/creaImageIOTreeLevelDescriptor.h b/src2/creaImageIOTreeLevelDescriptor.h
index 95b284b..905a7e4 100644 (file)
--- a/src2/creaImageIOTreeLevelDescriptor.h
+++ b/src2/creaImageIOTreeLevelDescriptor.h
@@ -9,6 +9,9 @@ namespace creaImageIO
 
   namespace tree
   {
+         /**
+       * \ingroup Model
+       */
     //=====================================================================
     /// Descriptor of a level of a tree (name, attributes, ...)
     class LevelDescriptor

diff --git a/src2/creaImageIOTreeNode.h b/src2/creaImageIOTreeNode.h
index a97925e..2b18acd 100644 (file)
--- a/src2/creaImageIOTreeNode.h
+++ b/src2/creaImageIOTreeNode.h
@@ -11,6 +11,9 @@ namespace creaImageIO
 
   namespace tree
   {
+         /**
+       * \ingroup Model
+       */
     //=====================================================================
     /// Forward declaration of Tree
     class Tree;

diff --git a/src2/doxygen/DoxyMainPage.txt.in b/src2/doxygen/DoxyMainPage.txt.in
index b52ee6f..5938ec8 100644 (file)
--- a/src2/doxygen/DoxyMainPage.txt.in
+++ b/src2/doxygen/DoxyMainPage.txt.in
@@ -3,6 +3,9 @@
 
 \htmlonly 
 
+<H2>Diagrams of the architecture (v2)</H2>
+<a href="http://sites.google.com/site/gimmickdiagrams/Home/home"> Diagrams </a>
+
 
 \endhtmlonly