1.加入 JavaLocatable.ini 文件(是我认为的 Java 代码中的最佳日志 Pattern ) <== Console: Locate in Idea + File: locate in LogViewer

2.Tools => Statistics 时可以输入统计时的最大长度,方便统计只想要前缀相同时的场景;
3.右键菜单证件按文件过滤;
4.支持 json 和 ndjson 格式;
5.更改 fullLog 支持方式, 由编译时到运行时(ENABLE_FULL_LOG=1)
6.更改部分 Bug:
  a.CLogFilterView 显示位置不正确
  b.源码路径选择父目录或多个目录时的问题;

Author: fishjam

LogViewer/DialogSourceHistory.cpp

@@ -116,12 +116,26 @@ void CDialogSourceHistory::OnBnClickedBtnAddSrcPath()
     FTL::CFDirBrowser dirBrowser(TEXT("Choose Project Source Root Path"), m_hWnd, strSelectPath);
     if (dirBrowser.DoModal())
     {
+        BOOL needAdd = FALSE;
         CString strFolderPath = dirBrowser.GetSelectPath();
 
         int matchIndex = m_listSourcePaths.FindString(0, strFolderPath);
         if (-1 == matchIndex)
         {
-            //没有才插入
+            //没有就插入
+            needAdd = TRUE;
+        } else {
+            // 有可能找到部分路径(比如:已有子目录, 尝试加入父目录), 因此这里比较完整路径
+            CString strFoundFolderPath;
+            m_listSourcePaths.GetText(matchIndex, strFoundFolderPath);
+            if (0 != strFoundFolderPath.CompareNoCase(strFolderPath)) {
+                //不一样,也需要加入
+                needAdd = TRUE;
+            }
+        }
+
+        if (needAdd)
+        {
             int nIndex = m_listSourcePaths.AddString(strFolderPath);
             m_listSourcePaths.SetCheck(nIndex, 1);
         }

LogViewer/DialogTextLength.cpp

@@ -0,0 +1,54 @@
+// DialogTextLength.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "LogViewer.h"
+#include "DialogTextLength.h"
+#include "afxdialogex.h"
+
+
+// CDialogTextLength dialog
+
+IMPLEMENT_DYNAMIC(CDialogTextLength, CDialog)
+
+CDialogTextLength::CDialogTextLength(INT nInitTextLength, CWnd* pParent /*=NULL*/)
+	: CDialog(IDD_DIALOG_LENGTH, pParent)
+    , m_nInitTextLength(nInitTextLength)
+{
+}
+
+CDialogTextLength::~CDialogTextLength()
+{
+}
+
+void CDialogTextLength::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+    DDX_Text(pDX, IDC_EDIT_TEXT_LENGTH, m_nInitTextLength);
+    DDX_Control(pDX, IDC_EDIT_TEXT_LENGTH, m_editTextLength);
+}
+
+
+BEGIN_MESSAGE_MAP(CDialogTextLength, CDialog)
+END_MESSAGE_MAP()
+
+
+// CDialogTextLength message handlers
+
+BOOL CDialogTextLength::OnInitDialog()
+{
+    UpdateData(FALSE);
+
+    m_editTextLength.SetFocus();
+    m_editTextLength.SetSel(0, -1);
+    
+    return FALSE; // return TRUE unless you set the focus to a control
+}
+
+void CDialogTextLength::OnOK()
+{
+    if (UpdateData(TRUE))
+    {
+        __super::OnOK();
+    }
+}

LogViewer/DialogTextLength.h

@@ -0,0 +1,31 @@
+#pragma once
+
+
+// CCDialogTextLength dialog
+
+class CDialogTextLength : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogTextLength)
+
+public:
+	CDialogTextLength(INT nInitTextLength, CWnd* pParent = NULL);   // standard constructor
+	virtual ~CDialogTextLength();
+
+    INT GetTextLength() const {
+        return m_nInitTextLength;
+    }
+
+// Dialog Data
+
+#ifdef AFX_DESIGN_TIME
+  enum { IDD = IDD_DIALOG_LENGTH };
+#endif
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+    virtual void OnOK();
+    virtual BOOL OnInitDialog();
+    INT m_nInitTextLength;
+    CEdit m_editTextLength;
+	DECLARE_MESSAGE_MAP()
+};

LogViewer/LogFilterView.cpp

@@ -65,7 +65,11 @@ void CLogFilterView::Dump(CDumpContext& dc) const
 
 void CLogFilterView::OnInitialUpdate()
 {
-	FTLTRACE(TEXT("Enter OnInitialUpdate"));
+    CRect rcClient;
+    GetClientRect(&rcClient);
+
+	FTLTRACE(TEXT("Enter OnInitialUpdate, x=%d, y=%d, width=%d, height=%d"), 
+        rcClient.left, rcClient.top, rcClient.Width(), rcClient.Height());
 
 	if (FALSE == m_bInited)
 	{
@@ -76,6 +80,30 @@ void CLogFilterView::OnInitialUpdate()
 			CheckDlgButton(nId, BST_CHECKED);
 		}
 		m_comboBoxFilter.SetCurSel(ftAll);
+
+        CWnd* pEditFullTraceInfo =  GetDlgItem(IDC_EDIT_FULL_TRACEINFO);
+
+        CRect rcFullTraceWin;
+        pEditFullTraceInfo->GetWindowRect(&rcFullTraceWin);
+        this->ScreenToClient(rcFullTraceWin);
+
+        int Margin = rcFullTraceWin.left;
+
+        rcFullTraceWin.right = rcClient.Width() - Margin * 2;
+        rcFullTraceWin.bottom = rcClient.Height() - Margin;
+        FTLTRACE(TEXT("move edit full trace to {%d, %d}, {%d x %d}"), 
+            rcFullTraceWin.left, rcFullTraceWin.top, rcFullTraceWin.Width(), rcFullTraceWin.Height());
+        pEditFullTraceInfo->MoveWindow(rcFullTraceWin, TRUE);
+
+        CRect rcFilterStringWin;
+        CWnd* pEditFilterString = GetDlgItem(IDC_EDIT_FILTER_STRING);
+        pEditFilterString->GetWindowRect(rcFilterStringWin);
+        this->ScreenToClient(rcFilterStringWin);
+        rcFilterStringWin.right = rcFullTraceWin.right;
+        pEditFilterString->MoveWindow(rcFilterStringWin, TRUE);
+        FTLTRACE(TEXT("move edit filter to {%d, %d}, {%d x %d}"),
+            rcFilterStringWin.left, rcFilterStringWin.top, rcFilterStringWin.Width(), rcFilterStringWin.Height());
+
 		this->InitAutoSizeInfo();
 		m_bInited = TRUE;
 	}
@@ -84,7 +112,12 @@ void CLogFilterView::OnInitialUpdate()
 void CLogFilterView::OnSize(UINT nType, int cx, int cy)
 {
     CFormView::OnSize(nType, cx, cy);
-    this->AutoResizeUpdateLayout(cx,cy);
+    FTLTRACE(TEXT("CLogFilterView::OnSize, nTYpe=%d, cx=%d, cy=%d"), nType, cx, cy)
+    if (cx > 0 && cy > 0)
+    {
+        this->AutoResizeUpdateLayout(cx, cy);
+    }
+    
     //if (::IsWindow(m_AllLogItemsList.GetSafeHwnd()))
     //{
     //    if (-1 == m_LogItemListWidthMargin)

LogViewer/LogItemView.cpp

@@ -79,6 +79,9 @@ BEGIN_MESSAGE_MAP(CLogItemView, CListView)
     ON_COMMAND(ID_DETAILS_DELETE_SELECT_ITEMS, &CLogItemView::OnDetailDeleteSelectItems)
     ON_COMMAND(ID_DETAILS_SELECT_CURRENT_PID, &CLogItemView::OnDetailSelectCurrentPid)
     ON_COMMAND(ID_DETAILS_SELECT_CURRENT_TID, &CLogItemView::OnDetailSelectCurrentTid)
+    ON_COMMAND(ID_DETAILS_SELECT_CURRENT_FILE, &CLogItemView::OnDetailSelectCurrentFile)
+    ON_COMMAND(ID_DETAILS_CLEAR_FILTER_BY_FILES, &CLogItemView::OnDetailClearFilterByFiles)
+    
     ON_WM_CONTEXTMENU()
     ON_WM_ERASEBKGND()
     ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, &CLogItemView::OnLvnItemchanged)
@@ -468,25 +471,7 @@ void CLogItemView::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
         else
         {
             CString strTraceInfo(pLogItem->pszTraceInfo);
-
-            int leftBraPos = strTraceInfo.Find(TEXT('(')); //左括号
-            int rightBraPos = strTraceInfo.Find(TEXT(')'));//右括号
-            if (rightBraPos != -1)
-            {
-                int semPos = strTraceInfo.Find(TEXT(':'),rightBraPos);
-                if (-1 != semPos)  //找到分号，可能带有文件名和路径
-                {
-                    strTraceInfo.SetAt(semPos,TEXT('\0'));
-                    if (-1 != leftBraPos && -1 != rightBraPos && rightBraPos > leftBraPos)  
-                    {
-                        CString strLine = strTraceInfo.Mid(leftBraPos + 1, rightBraPos - leftBraPos - 1);
-                        line = _ttoi(strLine);
-
-                        strFileName = strTraceInfo.Left(leftBraPos);
-                        rLogManager.TryReparseRealFileName(strFileName);
-                    }
-                }
-            }
+            rLogManager.ParseFileNameAndPos(strTraceInfo, strFileName, line);
         }
 
         //如果找到文件名和行号,可以尝试通过源码定位
@@ -533,7 +518,7 @@ void CLogItemView::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
 						}
 						if (szPathFull[0] == TEXT('\0'))
 						{
-							StringCchCopy(szPathFull, _countof(szPathFull), spFilePathList->front());
+							StringCchCopy(szPathFull, _countof(szPathFull), *spFilePathList->begin());
 						}
 						//TODO: if there are more than one file with same name, then prompt user choose
                     }
@@ -573,11 +558,14 @@ void CLogItemView::OnContextMenu(CWnd* pWnd, CPoint point)
         CMenu* pDetailMenu = menuDetails.GetSubMenu(0);
         FTLASSERT(pDetailMenu);
         m_ptContextMenuClick = point;
-#if ENABLE_COPY_FULL_LOG
-        pDetailMenu->EnableMenuItem(ID_DETAILS_COPY_FULL_LOG, MF_ENABLED | MF_BYCOMMAND);
-#else 
-        pDetailMenu->EnableMenuItem(ID_DETAILS_COPY_FULL_LOG, MF_DISABLED | MF_GRAYED | MF_BYCOMMAND);
-#endif
+
+        CLogManager& logManager = GetDocument()->m_FTLogManager;
+        if (logManager.m_logConfig.m_nEnableFullLog)
+        {
+            pDetailMenu->EnableMenuItem(ID_DETAILS_COPY_FULL_LOG, MF_ENABLED | MF_BYCOMMAND);
+        } else {
+            pDetailMenu->EnableMenuItem(ID_DETAILS_COPY_FULL_LOG, MF_DISABLED | MF_GRAYED | MF_BYCOMMAND);
+        }
         API_VERIFY(pDetailMenu->TrackPopupMenu(TPM_TOPALIGN|TPM_LEFTBUTTON,point.x,point.y,pWnd));
     }
 }
@@ -726,7 +714,6 @@ void CLogItemView::OnDetailsCopyLineText()
 
 void CLogItemView::OnDetailsCopyFullLog()
 {
-#if ENABLE_COPY_FULL_LOG
     BOOL bRet = FALSE;
     CString strText;
 
@@ -746,7 +733,6 @@ void CLogItemView::OnDetailsCopyFullLog()
             TEXT("pos=[%d,%d], text=%s, Last Error=%d"), 
             lvHistTestInfo.iItem, lvHistTestInfo.iSubItem, strText, GetLastError());
     }
-#endif
 }
 
 void CLogItemView::OnDetailDeleteSelectItems() {
@@ -820,6 +806,24 @@ void CLogItemView::_HighlightSameThread(LogItemPointer pCompareLogItem)
 }
 
 int CLogItemView::_GetSelectedIdTypeValue(MachinePIdTIdTypeList& idTypeList) {
+    LogItemsContainer selectedLogItems;
+    INT nSelectedSubItem = _GetSelectedIdLogItems(selectedLogItems);
+
+    for (LogItemsContainerIter iter = selectedLogItems.begin(); iter != selectedLogItems.end(); ++iter)
+    {
+        const LogItemPointer pLogItem = *iter;
+        MachinePIdTIdType idType;
+        idType.machine = pLogItem->machine;
+        idType.pid = pLogItem->processId;
+        idType.tid = pLogItem->threadId;
+        idTypeList.push_back(idType);
+        FTLTRACE(TEXT("Filter machine=%s, pid=%s, tid=%s"),
+            idType.machine.c_str(), idType.pid.c_str(), idType.tid.c_str());
+    }
+    return nSelectedSubItem;
+}
+
+int CLogItemView::_GetSelectedIdLogItems(LogItemsContainer& selectedLogItems){
     CLogManager& logManager = GetDocument()->m_FTLogManager;
 
     LogIndexContainer selectedItemList;
@@ -830,14 +834,8 @@ int CLogItemView::_GetSelectedIdTypeValue(MachinePIdTIdTypeList& idTypeList) {
         for (LogIndexContainerIter iter = selectedItemList.begin(); iter != selectedItemList.end(); ++iter)
         {
             const LogItemPointer pLogItem = logManager.GetDisplayLogItem(*iter);
-            if(pLogItem){
-                MachinePIdTIdType idType;
-                idType.machine = pLogItem->machine;
-                idType.pid = pLogItem->processId;
-                idType.tid = pLogItem->threadId;
-                idTypeList.push_back(idType);
-                FTLTRACE(TEXT("Filter machine=%s, pid=%s, tid=%s"), 
-                    idType.machine.c_str(), idType.pid.c_str(), idType.tid.c_str());
+            if (pLogItem) {
+                selectedLogItems.push_back(pLogItem);
             }
         }
     }
@@ -874,6 +872,46 @@ void CLogItemView::OnDetailSelectCurrentTid() {
     }
 }
 
+void CLogItemView::OnDetailSelectCurrentFile() {
+    int oldSelectIndex = 0;
+    LogItemsContainer selectedLogItems;
+    if (-1 != (oldSelectIndex = _GetSelectedIdLogItems(selectedLogItems))){ 
+        CLogManager& logManager = GetDocument()->m_FTLogManager;
+
+        // 获取所有用户选择的有效文件名
+        std::set<CString> selectFileNames;
+        for(LogItemsContainerIter iter = selectedLogItems.begin(); iter != selectedLogItems.end(); ++iter){
+            const LogItemPointer pLogItem = *iter;
+            if (pLogItem->pszSrcFileName)
+            {
+                CString strFileName(pLogItem->pszSrcFileName);
+                if (!strFileName.IsEmpty())
+                {
+                    selectFileNames.insert(pLogItem->pszSrcFileName);
+                }
+            }
+        }
+        if (!selectFileNames.empty())
+        {
+            UINT nCurSelectLine = _GetCurrentFirstSelectLine();
+            logManager.SetFilterFileNames(selectFileNames);
+
+            OnUpdate(this, VIEW_UPDATE_HINT_FILTER_BY_FILENAME, NULL);
+            _GotoSpecialLine(nCurSelectLine);
+        }
+    }
+}
+
+void CLogItemView::OnDetailClearFilterByFiles() {
+    UINT nCurSelectLine = _GetCurrentFirstSelectLine();
+    CLogManager& logManager = GetDocument()->m_FTLogManager;
+
+    if(logManager.ClearFilterFileNames()){
+        OnUpdate(this, VIEW_UPDATE_HINT_FILTER_BY_FILENAME, NULL);
+        _GotoSpecialLine(nCurSelectLine);
+    }
+}
+
 
 BOOL CLogItemView::OnEraseBkgnd(CDC* pDC)
 {

LogViewer/LogItemView.h

@@ -64,6 +64,8 @@ class CLogItemView : public CListView
     afx_msg void OnDetailDeleteSelectItems();
     afx_msg void OnDetailSelectCurrentPid();
     afx_msg void OnDetailSelectCurrentTid();
+    afx_msg void OnDetailSelectCurrentFile();
+    afx_msg void OnDetailClearFilterByFiles();
     afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 	afx_msg BOOL OnEditGoTo(UINT nID);
     afx_msg BOOL OnEditClearCache(UINT nID);
@@ -73,6 +75,7 @@ class CLogItemView : public CListView
     afx_msg void OnUpdateIndicatorSelectedLogItem(CCmdUI *pCmdUI);
 private:
     int _GetSelectedIdTypeValue(MachinePIdTIdTypeList& idTypeList);
+    int _GetSelectedIdLogItems(LogItemsContainer& selectedLogItem);
     UINT _GetCurrentFirstSelectLine();
     BOOL _GotoSpecialLine(UINT nGotoLineNumber);
 };