Changeset 81 in dev

Timestamp:

Mar 26, 2007, 7:33:18 AM (18 years ago)

Author:

dai_9181

Message:

プロジェクトを開いていないときでもクラスビューの機能を有効にした。

Location:

ProjectEditor

Files:

• CClassInfo.cpp (modified) (2 diffs)
• ClassTree.cpp (modified) (4 diffs)
• ProjectControl.cpp (modified) (3 diffs)
• ProjectEditor.cpp (modified) (1 diff)
• Replace.cpp (modified) (2 diffs)

ProjectEditor/CClassInfo.cpp

@@ -84 +84 @@
         }
 
+        // Static/Constを飛ばす
+        if( memicmp(pBuf+i,"Static",6)==0 ){
+            // Static
+            i+=6;
+            while(pBuf[i]==' '||pBuf[i]=='\t') i++;
+        }
+        if(pBuf[i]=='c'||pBuf[i]=='C'){
+            // Const
+            i+=5;
+            while(pBuf[i]==' '||pBuf[i]=='\t') i++;
+        }
+
         DWORD dwProc;
         if(memicmp(pBuf+i,"Abstract",8)==0&&(pBuf[i+8]==' '||pBuf[i+8]=='\t')||
@@ -91 +103 @@
             memicmp(pBuf+i,"Sub",3)==0&&(pBuf[i+3]==' '||pBuf[i+3]=='\t')){
             //メンバ関数のとき
+
             if(pBuf[i]=='a'||pBuf[i]=='A'){
                 i+=9;

ProjectEditor/ClassTree.cpp

@@ -315 +315 @@
 
 
-
-void SetClassTreeFromOneFile(char *lpszFilePath,int iFileNum){
-    extern PROJECTINFO ProjectInfo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
-    int i2,i3,i4,WndNum;
-    char *pBuf;
-    HWND hChild;
+void SetClassTreeFromOneFile_Buf( char *pBuf, int iFileNum ){
+    int i2,i3,i4;
     char temporary[GENERAL_SIZE];
 
-    hChild=GetWindow(hClient,GW_CHILD);
-    while(hChild){
-        WndNum=GetWndNum(hChild);
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-            if(lstrcmpi(MdiInfo[WndNum].path,lpszFilePath)==0) break;
-        }
-        hChild=GetNextWindow(hChild,GW_HWNDNEXT);
-    }
-
-    if(hChild){
-        //すでに指定されたファイルが開かれている場合
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
-    }
-    else{
-        //開かれていない場合
-        pBuf=ReadBuffer(lpszFilePath);
-        if(!pBuf) pBuf=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
-    }
     for(i2=0;;i2++){
         if(pBuf[i2]=='\0') break;
@@ -464 +441 @@
         }
     }
+}
+void SetClassTreeFromOneFile(char *lpszFilePath,int iFileNum){
+    extern MDIINFO MdiInfo[MAX_WNDNUM];
+    int WndNum;
+    HWND hChild=GetWindow(hClient,GW_CHILD);
+    while(hChild){
+        WndNum=GetWndNum(hChild);
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+            if(lstrcmpi(MdiInfo[WndNum].path,lpszFilePath)==0) break;
+        }
+        hChild=GetNextWindow(hChild,GW_HWNDNEXT);
+    }
+
+    char *pBuf;
+    if(hChild){
+        //すでに指定されたファイルが開かれている場合
+        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    }
+    else{
+        //開かれていない場合
+        pBuf=ReadBuffer(lpszFilePath);
+        if(!pBuf) pBuf=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
+    }
+
+    SetClassTreeFromOneFile_Buf( pBuf, iFileNum );
 
     if(!hChild) HeapDefaultFree(pBuf);
@@ -469 +471 @@
 
 void SetProcedureTreeData(void *temp_iFileNum){
-    extern PROJECTINFO ProjectInfo;
     int i;
     char temporary[MAX_PATH];
@@ -547 +548 @@
     LockWindowUpdate(hProcedureTreeView);
 
-    if(iFileNum==-1){
-        //プロジェクトのすべてのファイルを解析
-        for(i=0;i<ProjectInfo.pobj_DBFileInfo->iNum;i++){
-            ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-
-            SetClassTreeFromOneFile(temporary,i);
-        }
-
-        //不要になったアイテムを除去
-        pobj_ClassTreeView->finish();
+    extern PROJECTINFO ProjectInfo;
+    if(ProjectInfo.name[0]){
+        // プロジェクトが開かれているとき
+        if(iFileNum==-1){
+            //プロジェクトのすべてのファイルを解析
+            for(i=0;i<ProjectInfo.pobj_DBFileInfo->iNum;i++){
+                ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
+
+                SetClassTreeFromOneFile(temporary,i);
+            }
+
+            //不要になったアイテムを除去
+            //pobj_ClassTreeView->finish();
+        }
+        else{
+            /////////////////////////////////
+            // 編集中のファイルのみを解析
+            /////////////////////////////////
+
+            ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[iFileNum]->GetFullPath(temporary);
+
+            SetClassTreeFromOneFile(temporary,iFileNum);
+        }
     }
     else{
-        /////////////////////////////////
-        // 編集中のファイルのみを解析
-        /////////////////////////////////
-
-        ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[iFileNum]->GetFullPath(temporary);
-
-        SetClassTreeFromOneFile(temporary,iFileNum);
+        // 編集中の単体ファイルを解析
+
+        HWND hChild=GetWindow(hClient,GW_CHILD);
+        int WndNum=GetWndNum(hChild);
+        char *pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        SetClassTreeFromOneFile_Buf( pBuf, -1 );
+
     }
 

ProjectEditor/ProjectControl.cpp

@@ -129 +129 @@
                     for(i=0;i<pobj_ClassTreeView->NumberOfProcedures;i++){
                         if(pobj_ClassTreeView->pProcInfo[i].hTreeItem==hTreeItem){
-                            lstrcpy(temporary,
-                                ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[pobj_ClassTreeView->pProcInfo[i].FileNum]->m_path);
-                            GetFullPath(temporary,ProjectInfo.dir);
-                            hChild=OpenFileWithExtension(temporary);
+
+                            if( ProjectInfo.name[0] ){
+                                // 対象ファイルを開く
+                                lstrcpy(temporary,
+                                    ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[pobj_ClassTreeView->pProcInfo[i].FileNum]->m_path);
+                                GetFullPath(temporary,ProjectInfo.dir);
+                                hChild=OpenFileWithExtension(temporary);
+                            }
+                            else{
+                                hChild = GetWindow(hClient,GW_CHILD);
+                            }
 
                             //プロシージャの行を選択する
@@ -149 +156 @@
                         }
                     }
+
                     break;
 
@@ -537 +545 @@
 
             hOldFont=(HFONT)SelectObject(hdc,hStatusFont);
-            sprintf(temporary,"%s \'%s\'",STRING_PROJECT,ProjectInfo.name);
+            if( ProjectInfo.name[0] ){
+                sprintf(temporary,"%s \'%s\'",STRING_PROJECT,ProjectInfo.name);
+            }
+            else{
+                lstrcpy( temporary, "現在のドキュメント" );
+            }
 
             GetTextExtentPoint32(hdc,temporary,lstrlen(temporary),&size);

ProjectEditor/ProjectEditor.cpp

@@ -107 +107 @@
 }
 int GetFileNum(int WndNum){
+    if( !ProjectInfo.name[0] ){
+        return -1;
+    }
+
     int i;
     char temporary[MAX_PATH];

ProjectEditor/Replace.cpp

@@ -178 +178 @@
 
 
-    if(ProjectInfo.name[0]){
+    //if(ProjectInfo.name[0]){
         //プロジェクトが開かれているとき
         if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
@@ -184 +184 @@
             ResetClassTree(GetFileNum(WndNum));
         }
-    }
+    //}
 }
 void TextEdit_ReplaceUpdateUndoData(int WndNum,char *str,BOOL bPaste,BOOL bRedraw){