Added Sequence Diagrams and filtered operations in creaImageIOGimmickView.h

diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h
index b044e2fc9fe5d5fb12bcc001ea4d91e6878f2626..3aa98acf92f9a58ff285c71543722b5f53b83808 100644 (file)
--- a/src2/creaImageIOGimmickView.h
+++ b/src2/creaImageIOGimmickView.h
@@ -1,34 +1,5 @@
 namespace creaImageIO
 {
-    /**
-       * \ingroup View
-       */
-
-       //=====================================================================  
-    
-    //=====================================================================
-    /// Abstract class to handle tree item information
-    struct TreeListCtrl
-    { 
-      TreeListCtrl() {}
-      virtual ~TreeListCtrl() {}
-    };
-       // EO class TreeListCtrl
-
-       /**
-       * \ingroup View
-       */
-       //=====================================================================  
-    
-    //=====================================================================
-    /// Abstract class to handle tree item ids
-    struct TreeItemId
-    { 
-      TreeItemId() {}
-      virtual ~TreeItemId() {}
-    };
-       // EO class TreeItemId
-
        /**
        * \ingroup View
        */
@@ -58,9 +29,7 @@ namespace creaImageIO
     virtual void GetSelectedImages(std::vector<vtkImageData*>&){ return; }
     /// Returns the vector of DicomNode corresponding to selection
     virtual void GetSelectedDicomNodes(std::vector<DicomNode*>&){ return; }
-    /// Returns the vector of TreeItemId corresponding to selection
-    virtual void GetSelectedItems(std::vector<TreeItemId>&){ return; }
-       /// Returns the DicomNode corresponding to the tree item
+   /// Returns the DicomNode corresponding to the tree item
     virtual DicomNode* GetDicomNodeOfItem(const TreeItemId& i);
 
        
@@ -73,18 +42,7 @@ namespace creaImageIO
     virtual const DicomDatabaseListType& GetDicomDatabaseList() const 
     { return null; }
 
-       /// Returns the TreeListCtrl of the main view
-    TreeListCtrl* GetTreeListCtrl() { return null; }
-    /// Returns the TreeListCtrl of the main view (const)
-    const TreeListCtrl* GetTreeListCtrl() const { return null; }
-
        protected:
-       ///Inserts a TreeItem in a specified database
-       virtual void InsertDicomDatabase(TreeItemId& id, DicomDatabase* r);
-       ///Deletes a TreeItem from a specified database
-    virtual void DeleteDicomDatabase(TreeItemId& id, DicomDatabase* r);
-       ///Loads the children of the specified TreeItem
-       virtual void LoadChildren( TreeItemId& id );
        ///Opens an existing database, or else, creates a local database.
     virtual void OpenOrNewDatabase(bool open){ return; }
        ///Shows the help
@@ -112,15 +70,6 @@ namespace creaImageIO
 
 
        public:
-       /// Sets a new configuration file
-    virtual void SetConfigurationFile(const std::string& filename){ return; }
-       ///Loads a configuration file with the parameters for the favorites database
-    virtual void LoadConfiguration(){ return; }
-       ///Saves a configuration file with the parameters for the favorites database
-    virtual void SaveConfiguration(){ return; }
-       ///Sets the status for the save configuration on close to the new value 
-       ///specified by the parameter
-    virtual void SetSaveConfigurationOnClose(bool v) { return; }
        ///Loads or creates a favorites database
     virtual void LoadOrCreateFavoritesDatabase(){ return; }
        private:
@@ -155,16 +104,7 @@ namespace creaImageIO
     /// to the DicomNode provided.
     /// parent is its parent in the tree (where to insert / remove it)
        virtual void UpdateDicomNodeView(DicomNode* n, const TreeItemId& parent){ return; }
-    /// Recursively deletes 
-    virtual void DeleteObsoleteChildren(TreeItemId& id){ return; }
-    /// Create the column titles of the children of the item
-    virtual TreeItemId CreateChildrenColumnsTitles(TreeItemId& item,
-                                            DicomNode::Type t){ return null }
-    /// Updates the titles of the columns
-    virtual void UpdateColumnsTitles(TreeItemId& item, DicomNode::Type t){ return; }
-    /// Updates the information on the columns
-    virtual void UpdateColumns(TreeItemId& item, bool only_first = false){ return; }
-
+    
        private:
        ///Type definition of the data regarding the tree
     typedef WxGimmickTreeItemData TreeItemData;
@@ -187,24 +127,15 @@ namespace creaImageIO
     DicomDatabaseListType mDicomDatabaseList;
        ///Favorites database
     DicomDatabase* mFavoriteDatabase;
-       ///The tree list controller
-    TreeListCtrl* mTreeListCtrl;
-       ///Path to the user settings directory
-    std::string mUserSettingsDirectory;
-    ///Path to the configuration file    
-    std::string mConfigurationFile;
+
        ///Path to the database list file
     std::string mDatabaseListFile;
-       ///Boolean to check wether to save on close or not
-    bool mSaveConfigurationOnClose;
        ///Extension of the database
     std::string mDatabaseExtension;
 
     bool mJustStarted;
 
     int  mFirstDicomDatabaseIconIndex;
-    // Id of the item which activated the popup menu 
-    TreeItemId mItemOfMenu;
 
    // Previewer
     vtkImageViewer2* mViewer;
@@ -217,8 +148,9 @@ namespace creaImageIO
     MultiThreadImageReader mReader;
     // map of images name to node
     std::map<std::string,DicomNode*> mImageFileNameToNode;
-    // Cur image item to show
-    TreeItemId mCurImageItemToShow;
+  
+    //Controller which manages the interaction with the model
+       Gimmick* controller;
 
     };
     // EO class GimmickView

diff --git a/src2/doxygen/DoxyMainPage.txt.in b/src2/doxygen/DoxyMainPage.txt.in
index 5938ec80693fb12d733c2944a2c37c86f1d505cb..5a7c15eb79ae688f7e9732f901a174417f863d4f 100644 (file)
--- a/src2/doxygen/DoxyMainPage.txt.in
+++ b/src2/doxygen/DoxyMainPage.txt.in
@@ -5,6 +5,8 @@
 
 <H2>Diagrams of the architecture (v2)</H2>
 <a href="http://sites.google.com/site/gimmickdiagrams/Home/home"> Diagrams </a>
+<br>
+<a href="http://sites.google.com/site/gimmickdiagrams/Home/sequence-diagrams"> Sequence Diagrams </a>
 
 
 \endhtmlonly