Changeset 653 in dev for trunk

Timestamp:

Jun 17, 2008, 10:14:51 PM (16 years ago)

Author:

dai_9181

Message:

FileTreeView周りをリファクタリング

Location:

trunk/ab5.0/abdev/abdev

Files:

• CFileInfo.cpp (modified) (1 diff)
• Common.h (modified) (1 diff)
• FileTree.cpp (modified) (1 diff)
• FileTree.h (modified) (2 diffs)
• ProjectControl.cpp (modified) (2 diffs)
• include/ProjectManager/FileManager.h (modified) (1 diff)

trunk/ab5.0/abdev/abdev/CFileInfo.cpp

@@ -64 +64 @@
     return 0;
 }
-void CDBFileInfo::SetTreeItem(int index,HTREEITEM hTreeItem){
-    ppobj_FileInfo[index]->m_hTreeItem=hTreeItem;
-}
-void CDBFileInfo::ResetTree(void){
-    TV_INSERTSTRUCT tv;
-
-    pobj_FileTree->DeleteAllItems();
-
-    tv.hInsertAfter=TVI_SORT;
-    tv.item.mask=TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
-
-    tv.hParent=TVI_ROOT;
-    tv.item.iImage=0;
-    tv.item.iSelectedImage=0;
-    tv.item.pszText="Source Files";
-    tv.hParent = pobj_FileTree->InsertItem( &tv );
-
-    int i;
-    char temporary[MAX_PATH],temp2[MAX_PATH];
-    for(i=0;i<iNum;i++){
-        _splitpath(ppobj_FileInfo[i]->GetPath().c_str(),0,0,temporary,temp2);
-        lstrcat(temporary,temp2);
-        tv.item.iImage=2;
-        tv.item.iSelectedImage=2;
-        tv.item.pszText=temporary;
-        ppobj_FileInfo[i]->m_hTreeItem = pobj_FileTree->InsertItem( &tv );
-    }
-}
 BOOL CDBFileInfo::dupli_check(char *path){
     //重複チェック

trunk/ab5.0/abdev/abdev/Common.h

@@ -431 +431 @@
     const std::string &GetPath(HTREEITEM hTreeItem);
     BOOL IsMainFile(HTREEITEM hTreeItem);
-
-    void SetTreeItem(int index,HTREEITEM hTreeItem);
-    void ResetTree(void);
 
     BOOL dupli_check(char *path);

trunk/ab5.0/abdev/abdev/FileTree.cpp

@@ -189 +189 @@
 }
 
-HTREEITEM FileListTreeViewCtrl::insert(char *str){
-    //////////////////////
-    //ツリービューに追加
-
+HTREEITEM FileListTreeViewCtrl::Insert( const std::string &str )
+{
+    return this->InsertItem( str.c_str(), 2, 2, this->GetRootItem(), TVI_SORT );
+}
+
+void FileListTreeViewCtrl::Reset( CDBFileInfo *pFileInfos )
+{
     TV_INSERTSTRUCT tv;
+
+    this->DeleteAllItems();
+
     tv.hInsertAfter=TVI_SORT;
     tv.item.mask=TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
-    tv.item.iImage=2;
-    tv.item.iSelectedImage=2;
-    tv.hParent=this->GetRootItem();
-    tv.item.pszText=str;
-
-    return this->InsertItem(&tv);
-}
+
+    tv.hParent=TVI_ROOT;
+    tv.item.iImage=0;
+    tv.item.iSelectedImage=0;
+    tv.item.pszText="Source Files";
+    tv.hParent = this->InsertItem( &tv );
+
+    int i;
+    char temporary[MAX_PATH],temp2[MAX_PATH];
+    for(i=0;i<pFileInfos->iNum;i++){
+        _splitpath(pFileInfos->ppobj_FileInfo[i]->GetPath().c_str(),0,0,temporary,temp2);
+        lstrcat(temporary,temp2);
+        tv.item.iImage=2;
+        tv.item.iSelectedImage=2;
+        tv.item.pszText=temporary;
+        pFileInfos->ppobj_FileInfo[i]->m_hTreeItem = this->InsertItem( &tv );
+    }
+}

trunk/ab5.0/abdev/abdev/FileTree.h

@@ -1 +1 @@
 
+class CDBFileInfo;
 
 class FileListTreeViewCtrl
@@ -11 +12 @@
     void ContextMenu(POINT *pPos);
 
-    HTREEITEM insert(char *str);
+    HTREEITEM Insert( const std::string &str );
+    void Reset( CDBFileInfo *pFileInfos );
 };
 

trunk/ab5.0/abdev/abdev/ProjectControl.cpp

@@ -665 +665 @@
     _splitpath(path,0,0,temporary,temp2);
     lstrcat(temporary,temp2);
-    hTreeItem=pobj_FileTree->insert(temporary);
+    hTreeItem=pobj_FileTree->Insert( temporary );
 
 
@@ -1127 +1127 @@
 
     //ファイル ツリー
-    projectInfo.pobj_DBFileInfo->ResetTree();
+    pobj_FileTree->Reset( projectInfo.pobj_DBFileInfo );
 
     //関数ツリー

trunk/ab5.0/abdev/abdev/include/ProjectManager/FileManager.h

@@ -28 +28 @@
 {
     Files files;
-    Folders folders;
+    //Folders folders;
 };