1.add DialogSameFilesList to handle same name files when try to locate in VS ide.

2.fix some bugs.

Author: fishjam

LogViewer/DialogSameFilesList.cpp

@@ -0,0 +1,65 @@
+// DialogSameFilesList.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "LogViewer.h"
+#include "DialogSameFilesList.h"
+#include "afxdialogex.h"
+
+
+// CDialogSameFilesList dialog
+
+IMPLEMENT_DYNAMIC(CDialogSameFilesList, CDialog)
+
+BEGIN_MESSAGE_MAP(CDialogSameFilesList, CDialog)
+	ON_LBN_SELCHANGE(IDC_LIST_SAME_FILES, &CDialogSameFilesList::OnLbnSelchangeListSameFiles)
+END_MESSAGE_MAP()
+
+
+CDialogSameFilesList::CDialogSameFilesList(SameNameFilePathListPtr spSameNameFilePathList, CWnd* pParent /*=NULL*/)
+	: CDialog(IDD_DIALOG_SAME_FILE_LISTS, pParent)
+	, m_spSameNameFilePathList(spSameNameFilePathList)
+{
+
+}
+
+CDialogSameFilesList::~CDialogSameFilesList()
+{
+}
+
+void CDialogSameFilesList::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_LIST_SAME_FILES, m_SameFilesList);
+}
+
+BOOL CDialogSameFilesList::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+	if (m_spSameNameFilePathList)
+	{
+		for (SameNameFilePathList::iterator iter = m_spSameNameFilePathList->begin();
+			iter != m_spSameNameFilePathList->end();
+			iter++)
+		{
+			CString strFullPath = *iter;
+			int itemIndex = m_SameFilesList.AddString(strFullPath);
+		}
+	}
+	return TRUE;  // return TRUE unless you set the focus to a control
+}
+
+
+
+afx_msg void CDialogSameFilesList::OnLbnSelchangeListSameFiles()
+{
+	int curSel = m_SameFilesList.GetCurSel();
+	if (curSel != LB_ERR)
+	{
+		m_SameFilesList.GetText(curSel, m_strSelectFilePath);
+	}
+	else {
+		m_strSelectFilePath = TEXT("");
+	}
+}
+// CDialogSameFilesList message handlers

LogViewer/DialogSameFilesList.h

@@ -0,0 +1,34 @@
+#pragma once
+
+
+// CDialogSameFilesList dialog
+
+class CDialogSameFilesList : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogSameFilesList)
+
+public:
+	CDialogSameFilesList(SameNameFilePathListPtr spSameNameFilePathList, CWnd* pParent = NULL);   // standard constructor
+
+	virtual ~CDialogSameFilesList();
+
+	const CString& GetSelectFilePath() const {
+		return m_strSelectFilePath;
+	}
+
+// Dialog Data
+#ifdef AFX_DESIGN_TIME
+	enum { IDD = IDD_DIALOG_SAME_FILE_LISTS };
+#endif
+
+protected:
+	SameNameFilePathListPtr m_spSameNameFilePathList;
+	CListBox m_SameFilesList;
+	CString  m_strSelectFilePath;
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual BOOL OnInitDialog();
+
+	DECLARE_MESSAGE_MAP()
+	afx_msg void OnLbnSelchangeListSameFiles();
+
+};

LogViewer/LogItemView.cpp

@@ -7,6 +7,8 @@
 #include "LogManager.h"
 #include "MachinePidTidTreeView.h"
 #include "DialogGoTo.h"
+#include "DialogSameFilesList.h"
+
 #include <ftlShell.h>
 #include <regex>
 
@@ -59,8 +61,9 @@ CLogItemView::~CLogItemView()
 }
 
 BEGIN_MESSAGE_MAP(CLogItemView, CListView)
-    ON_COMMAND_EX(ID_EDIT_GOTO, &CLogItemView::OnEditGoTo)
-    ON_NOTIFY(HDN_ITEMCLICK, 0, &CLogItemView::OnHdnItemclickListAllLogitems)
+	ON_COMMAND_EX(ID_EDIT_GOTO, &CLogItemView::OnEditGoTo)
+	ON_COMMAND_EX(ID_EDIT_CLEAR_CACHE, &CLogItemView::OnEditClearCache)
+	ON_NOTIFY(HDN_ITEMCLICK, 0, &CLogItemView::OnHdnItemclickListAllLogitems)
     //ON_NOTIFY_RANGE(LVN_COLUMNCLICK,0,0xffff,OnColumnClick)
     //ON_NOTIFY_REFLECT(LVN_GETDISPINFO, OnGetdispinfo)
     ON_NOTIFY_REFLECT(NM_CLICK, &CLogItemView::OnNMClick)
@@ -485,39 +488,62 @@ void CLogItemView::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
         }
         if (!strFileName.IsEmpty() && line != 0)
         {
-            TCHAR szPathFull[MAX_PATH] = {0};
-            if (PathIsRelative(strFileName))
-            {
-                if (rLogManager.NeedScanSourceFiles())
-                {
-                    CString strExistSourceDir = AfxGetApp()->GetProfileString(SECTION_CONFIG, ENTRY_SOURCE_DIR);
+			TCHAR szPathFull[MAX_PATH] = { 0 };
+
+			//优先在缓存里面查找(主要是减少 重复文件时的选择问题), 如果有, 则直接使用, 否则再走后面的逻辑
+			CString strFileLineCache;
+			strFileLineCache.Format(TEXT("%s:%d"), strFileName, line);
+			CString strFullPathFromUserCache = rLogManager.GetFullPathFromUserCache(strFileLineCache);
+			if (!strFullPathFromUserCache.IsEmpty())
+			{
+				StringCchCopy(szPathFull, _countof(szPathFull), strFullPathFromUserCache);
+			}
+			else {
+				if (PathIsRelative(strFileName))
+				{
+					if (rLogManager.NeedScanSourceFiles())
+					{
+						CString strExistSourceDir = AfxGetApp()->GetProfileString(SECTION_CONFIG, ENTRY_SOURCE_DIR);
+
+						CFDirBrowser dirBrowser(TEXT("Choose Project Source Root Path"), m_hWnd, strExistSourceDir);
+						if (dirBrowser.DoModal())
+						{
+							CString strFolderPath = dirBrowser.GetSelectPath();
+							AfxGetApp()->WriteProfileString(SECTION_CONFIG, ENTRY_SOURCE_DIR, strFolderPath);
+							rLogManager.ScanSourceFiles(strFolderPath);
+						}
+					}
+
+					SameNameFilePathListPtr spFilePathList = rLogManager.FindFileFullPath(ATLPath::FindFileName(strFileName));
+					if (spFilePathList != nullptr)
+					{
+						int nSameFileNameCount = spFilePathList->size();
+						if (nSameFileNameCount > 1)
+						{
+							FTLTRACEEX(FTL::tlWarn, TEXT("find %d source files with %s"), nSameFileNameCount, strFileName);
+							CDialogSameFilesList dlgSameFilesList(spFilePathList);
+							if (IDOK == dlgSameFilesList.DoModal())
+							{
+								StringCchCopy(szPathFull, _countof(szPathFull), dlgSameFilesList.GetSelectFilePath());
+								rLogManager.SetFullPathForUserCache(strFileLineCache, szPathFull);
+							}
+						}
+						if (szPathFull[0] == TEXT('\0'))
+						{
+							StringCchCopy(szPathFull, _countof(szPathFull), spFilePathList->front());
+						}
+						//TODO: if there are more than one file with same name, then prompt user choose
+
+					}
+				}
+				else
+				{
+					StringCchCopy(szPathFull, _countof(szPathFull), strFileName);
+				}
+			}
 
-                    CFDirBrowser dirBrowser(TEXT("Choose Project Source Root Path"), m_hWnd, strExistSourceDir);
-                    if (dirBrowser.DoModal())
-                    {
-                        CString strFolderPath = dirBrowser.GetSelectPath();
-                        AfxGetApp()->WriteProfileString(SECTION_CONFIG, ENTRY_SOURCE_DIR, strFolderPath);
-                        rLogManager.ScanSourceFiles(strFolderPath);
-                    }
-                }
-
-                SameNameFilePathListPtr spFilePathList = rLogManager.FindFileFullPath(ATLPath::FindFileName(strFileName));
-                if (spFilePathList != nullptr)
-                {
-                    int nSameFileNameCount = spFilePathList->size();
-                    if (nSameFileNameCount > 1)
-                    {
-                        FTLTRACEEX(FTL::tlWarn, TEXT("find %d source files with %s"), nSameFileNameCount, strFileName);
-                    }
-                    //TODO: if there are more than one file with same name, then prompt user choose
-                    StringCchCopy(szPathFull, _countof(szPathFull), spFilePathList->front());
-                }
-            }
-            else
-            {
-                StringCchCopy(szPathFull, _countof(szPathFull), strFileName);
-            }
             CString path(szPathFull);
+            FTLASSERT(!path.IsEmpty());
             if (!path.IsEmpty())
             {
                 path.Replace(_T('/'), _T('\\'));
@@ -910,3 +936,10 @@ BOOL CLogItemView::OnEditGoTo(UINT nID)
     }
     return bRet;
 }
+
+BOOL CLogItemView::OnEditClearCache(UINT nID)
+{
+	CLogManager& logManager = GetDocument()->m_FTLogManager;
+	logManager.ClearUserFullPathCache();
+	return TRUE;
+}

LogViewer/LogItemView.h

@@ -60,7 +60,8 @@ class CLogItemView : public CListView
     afx_msg void OnDetailSelectCurrentPid();
     afx_msg void OnDetailSelectCurrentTid();
     afx_msg BOOL OnEraseBkgnd(CDC* pDC);
-    afx_msg BOOL OnEditGoTo(UINT nID);
+	afx_msg BOOL OnEditGoTo(UINT nID);
+	afx_msg BOOL OnEditClearCache(UINT nID);
 
     afx_msg void OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult);
     afx_msg void OnUpdateIndicatorSelectedLogItem(CCmdUI *pCmdUI);