1.add selected information on status bar;

fishjam · fishjam · commit 28f128268616 · 2019-07-13T09:18:37.000+08:00
2.add delete selected items function in context menu;
3.adjust UI
diff --git a/LogViewer/LogFilterView.cpp b/LogViewer/LogFilterView.cpp
@@ -13,7 +13,7 @@ CLogFilterView::CLogFilterView()
 	: CFormView(CLogFilterView::IDD)
 {
     m_nStartSeqNumber = 0;
-    m_nEndSeqNumber = -1;
+    m_nEndSeqNumber = INT_MAX;
     m_lastFilterStringChangeTick = 0;
     m_bFilterStringChanged = FALSE;
     m_UpdateFilterStringTimerID = 0;
@@ -162,7 +162,7 @@ void CLogFilterView::OnTimer(UINT_PTR nIDEvent)
             CLogViewerDoc* pDoc = GetDocument();
             pDoc->m_FTLogManager.SetFilterSeqNumber(m_nStartSeqNumber, m_nEndSeqNumber);
             pDoc->m_FTLogManager.SetLogInfoFilterString(m_strFilterString,
-				(FilterType)m_comboBoxFilter.GetCurSel());
+                (FilterType)m_comboBoxFilter.GetCurSel());
             pDoc->UpdateAllViews(this);
         }
     }
diff --git a/LogViewer/LogItemView.cpp b/LogViewer/LogItemView.cpp
@@ -63,9 +63,11 @@ BEGIN_MESSAGE_MAP(CLogItemView, CListView)
     ON_COMMAND(ID_DETAILS_COPY_ITEM_TEXT, &CLogItemView::OnDetailsCopyItemText)
     ON_COMMAND(ID_DETAILS_COPY_LINE_TEXT, &CLogItemView::OnDetailsCopyLineText)
     ON_COMMAND(ID_DETAILS_COPY_FULL_LOG, &CLogItemView::OnDetailsCopyFullLog)
+    ON_COMMAND(ID_DETAILS_DELETE_SELECT_ITEMS, &CLogItemView::OnDetailDeleteSelectItems)
     ON_WM_CONTEXTMENU()
     ON_WM_ERASEBKGND()
     ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, &CLogItemView::OnLvnItemchanged)
+    ON_UPDATE_COMMAND_UI(ID_INDICATOR_SELECTED_LOGITEM, &CLogItemView::OnUpdateIndicatorSelectedLogItem)
 END_MESSAGE_MAP()
 
 
@@ -615,6 +617,55 @@ void CLogItemView::OnDetailsCopyFullLog()
     }
 }
 
+void CLogItemView::OnDetailDeleteSelectItems() {
+    CLogManager& logManager = GetDocument()->m_FTLogManager;
+    CListCtrl& ListCtrl = GetListCtrl();
+
+    int nSelectedCount = ListCtrl.GetSelectedCount();
+    if (nSelectedCount <= 0)
+    {
+        return;
+    }
+
+    if (nSelectedCount > 1)
+    {
+        if (FTL::FormatMessageBox(m_hWnd, TEXT("Confirm"), MB_OKCANCEL
+            , TEXT("Do you want delete %d log items"), nSelectedCount) != IDOK)
+        {
+            return;
+        }
+    }
+
+    int nSelectItem = -1;
+    std::set<LONG> delItemsSeqNum;
+    std::list<INT> delItemsIndex;
+    POSITION pos = ListCtrl.GetFirstSelectedItemPosition();
+    while (pos != NULL)
+    {
+        nSelectItem = ListCtrl.GetNextSelectedItem(pos);
+        LogItemPointer pLogItem = logManager.GetDisplayLogItem(nSelectItem);
+        if (pLogItem)
+        {
+            delItemsSeqNum.insert(pLogItem->seqNum);
+            delItemsIndex.push_back(nSelectItem);
+            //TRACE("will delete seq: %ld\n", pLogItem->seqNum);
+        }
+    }
+    if (!delItemsSeqNum.empty())
+    {
+        logManager.DeleteItems(delItemsSeqNum);
+        
+        //clear select(is there better way?)
+        std::list<INT>::iterator iter = delItemsIndex.begin();
+        for ( iter++;  //skip the first select
+            iter != delItemsIndex.end(); ++iter)
+        {
+            ListCtrl.SetItemState(*iter, 0, LVIS_SELECTED | LVIS_FOCUSED);
+        }
+        GetDocument()->UpdateAllViews(NULL);
+    }
+}
+
 void CLogItemView::_HighlightSameThread(LogItemPointer pCompareLogItem)
 {
     CLogManager& logManager = GetDocument()->m_FTLogManager;
@@ -684,3 +735,27 @@ void CLogItemView::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
         GetDocument()->UpdateAllViews(this);
     }
 }
+
+void CLogItemView::OnUpdateIndicatorSelectedLogItem(CCmdUI *pCmdUI)
+{
+    CLogManager& logManager = GetDocument()->m_FTLogManager;
+    CListCtrl& ListCtrl = GetListCtrl();
+
+    int nFirstSeqNum = 0;
+    int nSelectedCount = 0;
+    POSITION pos = ListCtrl.GetFirstSelectedItemPosition();
+    if (pos != NULL)
+    {
+        int nItem = ListCtrl.GetNextSelectedItem(pos);
+        LogItemPointer pLogItem = logManager.GetDisplayLogItem(nItem);
+        if (pLogItem)
+        {
+            nFirstSeqNum = pLogItem->seqNum;
+        }
+    }
+    nSelectedCount = ListCtrl.GetSelectedCount();
+
+    CString strFormat;
+    strFormat.Format(ID_INDICATOR_SELECTED_LOGITEM, nFirstSeqNum, nSelectedCount);
+    pCmdUI->SetText(strFormat);
+}
diff --git a/LogViewer/LogItemView.h b/LogViewer/LogItemView.h
@@ -55,9 +55,11 @@ class CLogItemView : public CListView
     afx_msg void OnDetailsCopyItemText();
     afx_msg void OnDetailsCopyLineText();
     afx_msg void OnDetailsCopyFullLog();
+    afx_msg void OnDetailDeleteSelectItems();
     afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 
     afx_msg void OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult);
+    afx_msg void OnUpdateIndicatorSelectedLogItem(CCmdUI *pCmdUI);
 };
 
 
diff --git a/LogViewer/LogManager.cpp b/LogViewer/LogManager.cpp
@@ -197,7 +197,6 @@ BOOL CLogManager::ClearAllLogItems()
     CFAutoLock<CFLockObject>  locker(&m_CsLockObj);
     m_activeItemIndex = -1;
     m_threadExecuteTimes.clear();
-    m_allInitLogItems.clear();
     m_AllLogItems.clear();
     m_allInitLogItems.clear();
     m_DisplayLogItems.clear();
@@ -401,6 +400,30 @@ void CLogManager::setActiveItemIndex(LONG index){
     m_activeItemIndex = index;
 }
 
+BOOL CLogManager::DeleteItems(std::set<LONG> delItems) {
+    //std::sort(items.begin(), items.end());
+    BOOL bDeleted = FALSE;
+    for (LogItemArrayType::iterator iter = m_AllLogItems.begin();
+        iter != m_AllLogItems.end(); )
+    {
+        if (delItems.find((*iter)->seqNum) != delItems.end())
+        {
+            iter = m_AllLogItems.erase(iter);
+            bDeleted = TRUE;
+        }
+        else 
+        {
+            ++iter;
+        }
+    }
+
+    if (bDeleted)
+    {
+        DoFilterLogItems();
+    }
+    return bDeleted;
+}
+
 CString CLogManager::getActiveItemTraceInfo(){
     if (m_activeItemIndex >= 0 && m_activeItemIndex < (LONG)m_DisplayLogItems.size()){
         return m_DisplayLogItems.at(m_activeItemIndex)->pszTraceInfo;
diff --git a/LogViewer/LogManager.h b/LogViewer/LogManager.h
@@ -57,6 +57,7 @@ class CLogManager
 
     LONG GetDisplayLogItemCount() const;
     const LogItemPointer GetDisplayLogItem(LONG index) const;
+    BOOL DeleteItems(std::set<LONG> delItems);
     void setActiveItemIndex(LONG index);
     CString getActiveItemTraceInfo();
 
diff --git a/LogViewer/LogViewer.rc b/LogViewer/LogViewer.rc
@@ -155,6 +155,7 @@ BEGIN
         MENUITEM "Copy Full Log",               ID_DETAILS_COPY_FULL_LOG
         MENUITEM SEPARATOR
         MENUITEM "Highlight Same Thread",       ID_DETAILS_HIGHLIGHT_SAME_THREAD
+        MENUITEM "Delete Select Items",         ID_DETAILS_DELETE_SELECT_ITEMS
     END
 END
 
@@ -203,19 +204,19 @@ IDD_LOG_FILTER_VIEW DIALOGEX 0, 0, 537, 108
 STYLE DS_SETFONT | WS_CHILD
 FONT 9, "Microsoft Sans Serif", 400, 0, 0x0
 BEGIN
-    GROUPBOX        "LogLevel",IDC_STATIC,84,7,159,27
-    CONTROL         "Detail",IDC_CHECK_DETAIL,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,89,19,28,10
-    CONTROL         "Info",IDC_CHECK_INFO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,19,22,10
-    CONTROL         "Trace",IDC_CHECK_TRACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,19,27,10
-    CONTROL         "Warn",IDC_CHECK_WARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,19,27,10
-    CONTROL         "Error",IDC_CHECK_ERROR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,213,19,24,10
+    GROUPBOX        "LogLevel",IDC_STATIC,111,7,159,27
+    CONTROL         "Detail",IDC_CHECK_DETAIL,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,116,19,28,10
+    CONTROL         "Info",IDC_CHECK_INFO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,19,22,10
+    CONTROL         "Trace",IDC_CHECK_TRACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,19,27,10
+    CONTROL         "Warn",IDC_CHECK_WARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,208,19,27,10
+    CONTROL         "Error",IDC_CHECK_ERROR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,19,24,10
     EDITTEXT        IDC_EDIT_FULL_TRACEINFO,7,35,525,69,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
     EDITTEXT        IDC_EDIT_FILTER_STRING,305,16,211,15,ES_AUTOHSCROLL
-    COMBOBOX        IDC_COMBO_FILTER,250,17,50,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Seq Number",IDC_STATIC,9,7,70,27
-    EDITTEXT        IDC_EDIT_START_SEQ_NUMBER,14,17,22,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_END_SEQ_NUMBER,50,17,22,14,ES_AUTOHSCROLL
-    LTEXT           "~",IDC_STATIC,41,21,8,8
+    COMBOBOX        IDC_COMBO_FILTER,274,17,26,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Seq Number",IDC_STATIC,9,7,98,27
+    EDITTEXT        IDC_EDIT_START_SEQ_NUMBER,14,17,31,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_END_SEQ_NUMBER,59,17,46,14,ES_AUTOHSCROLL
+    LTEXT           "~",IDC_STATIC,49,21,8,8
 END
 
 IDD_DIALOG_STUDIO_LIST DIALOGEX 0, 0, 408, 111
@@ -353,6 +354,7 @@ BEGIN
     ID_INDICATOR_PROCESS_COUNT "Process:%d"
     ID_INDICATOR_THREAD_COUNT "Thread:%d"
     ID_INDICATOR_LOGITEM_COUNT "LogItem:%d        "
+    ID_INDICATOR_SELECTED_LOGITEM "Selected:%d/%d"
 END
 
 STRINGTABLE 
diff --git a/LogViewer/MainFrm.cpp b/LogViewer/MainFrm.cpp
@@ -38,6 +38,7 @@ static UINT indicators[] =
     ID_INDICATOR_PROCESS_COUNT,
     ID_INDICATOR_THREAD_COUNT,
     ID_INDICATOR_LOGITEM_COUNT,
+    ID_INDICATOR_SELECTED_LOGITEM,
     //ID_INDICATOR_CAPS,
     //ID_INDICATOR_NUM,
     //ID_INDICATOR_SCRL,
diff --git a/LogViewer/Resource.h b/LogViewer/Resource.h
@@ -29,6 +29,7 @@
 #define ID_DETAILS_COPY_LINE_TEXT       32784
 #define ID_DETAILS_COPY_ITEM_TEXT       32785
 #define ID_DETAILS_COPY_FULL_LOG        32786
+#define ID_DETAILS_DELETE_SELECT_ITEMS  32787
 #define ID_CODE_PAGE_UTF8               32790
 #define ID_CODE_PAGE_GB2312             32791
 #define ID_CODE_PAGE_JAPANESE           32792
@@ -38,13 +39,14 @@
 #define ID_INDICATOR_PROCESS_COUNT      59143
 #define ID_INDICATOR_THREAD_COUNT       59144
 #define ID_INDICATOR_LOGITEM_COUNT      59145
+#define ID_INDICATOR_SELECTED_LOGITEM   59146
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        133
-#define _APS_NEXT_COMMAND_VALUE         32797
+#define _APS_NEXT_COMMAND_VALUE         32799
 #define _APS_NEXT_CONTROL_VALUE         1013
 #define _APS_NEXT_SYMED_VALUE           104
 #endif
diff --git a/x64/Release/LogViewer.exe b/x64/Release/LogViewer.exe

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ CLogFilterView::CLogFilterView()`
`13`	`13`	`: CFormView(CLogFilterView::IDD)`
`14`	`14`	`{`
`15`	`15`	`m_nStartSeqNumber = 0;`
`16`		`- m_nEndSeqNumber = -1;`
	`16`	`+ m_nEndSeqNumber = INT_MAX;`
`17`	`17`	`m_lastFilterStringChangeTick = 0;`
`18`	`18`	`m_bFilterStringChanged = FALSE;`
`19`	`19`	`m_UpdateFilterStringTimerID = 0;`
`@@ -162,7 +162,7 @@ void CLogFilterView::OnTimer(UINT_PTR nIDEvent)`
`162`	`162`	`CLogViewerDoc* pDoc = GetDocument();`
`163`	`163`	`pDoc->m_FTLogManager.SetFilterSeqNumber(m_nStartSeqNumber, m_nEndSeqNumber);`
`164`	`164`	`pDoc->m_FTLogManager.SetLogInfoFilterString(m_strFilterString,`
`165`		`- (FilterType)m_comboBoxFilter.GetCurSel());`
	`165`	`+ (FilterType)m_comboBoxFilter.GetCurSel());`
`166`	`166`	`pDoc->UpdateAllViews(this);`
`167`	`167`	`}`
`168`	`168`	`}`