X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxTreeView.h;h=6683a13f5d07a5a3a5d44243947065c262f3175a;hb=3579beef5bd466705bc0431d7347d1150cdffe97;hp=3b850d05f3f38efc18476107cab03e1fab2dea1d;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git diff --git a/src/creaImageIOWxTreeView.h b/src/creaImageIOWxTreeView.h index 3b850d0..6683a13 100644 --- a/src/creaImageIOWxTreeView.h +++ b/src/creaImageIOWxTreeView.h @@ -141,21 +141,21 @@ namespace creaImageIO /// such as the vector of attribute keys corresponding to the columns struct LevelType { - // The List Control - wxListCtrl* wxCtrl; - wxSplitterWindow* wxSplitter; - std::vector key; - // The vector of currently selected nodes of the level - std::vector Selected; - // True iff the vector Selected is up to date - bool SelectedUpToDate; - // The column used for sorting - unsigned int SortColumn; - ///Boolean that defines the direction of the sort - ///True is ascending order and false is descending - bool SortAscending; - //The vector of not shown attributes - std::vector notShownAtts; + // The List Control + wxListCtrl *wxCtrl; + wxSplitterWindow *wxSplitter; + std::vector key; + // The vector of currently selected nodes of the level + std::vector Selected; + // True iff the vector Selected is up to date + bool SelectedUpToDate; + // The column used for sorting + unsigned int SortColumn; + ///Boolean that defines the direction of the sort + ///True is ascending order and false is descending + bool SortAscending; + //The vector of not shown attributes + std::vector notShownAtts; }; /// The vector of levels : one for each level of the tree std::vector mLevelList; @@ -165,7 +165,7 @@ namespace creaImageIO /// return the wxSplitter of one level wxSplitterWindow* GetSplitter(int l) { return mLevelList[l].wxSplitter; } //Returns the maximum number of levels - int GetNumberOfLevels(){ return mLevelList.size(); } + int GetNumberOfLevels(){ return (int)mLevelList.size(); } /// Gets the user selected data from the level passed as a parameter /// Updates the vector if necessary const std::vector& GetSelected(int level); @@ -210,16 +210,16 @@ namespace creaImageIO ///Initial color palette std::vector mColorPalette; - wxMenu* menu; + wxMenu *menu; - wxObject* senderCtrl; + wxObject *senderCtrl; int mAscendingID; int mDescendingID; int mFilterID; unsigned int mLastLevel; - wxMenu* menuItem; - wxMenu *subExportMenu; + wxMenu *menuItem; + wxMenu *subExportMenu; int mAnonymizingID; int mLocalCopyID; int mEditFieldID; @@ -244,7 +244,6 @@ namespace creaImageIO wxString title, const wxSize& size); ~RemoveAlertDlg(); - bool isChecked(); private :