Changeset 457

Timestamp:

May 23, 2015, 5:39:04 AM (8 years ago)

Author:

roman

Message:

Added media trace item highlighting

Location:

trunk/DirectShowSpy

Files:

• MediaSampleTrace.h (modified) (9 diffs)
• Module.rc (modified) (previous)
• _Bin/DirectShowSpy-Win32.dll (modified) (previous)
• _Bin/DirectShowSpy-x64.dll (modified) (previous)
• resource.h (modified) (2 diffs)

trunk/DirectShowSpy/MediaSampleTrace.h

@@ -127 +127 @@
                         ITEM m_Item;
                         PAGEITEM m_PageItem;
+                        UINT m_nHighlightIndex;
 
                 public:
                 // CItem
+                        CItem() :
+                                m_nHighlightIndex(0)
+                        {
+                        }
+                        static BOOL GetBackgroundColor(UINT nIndex, COLORREF& nColor)
+                        {
+                                static const COLORREF g_pnColors[] = 
+                                {
+                                        RGB(0xFF, 0xCC, 0xCC),
+                                        RGB(0xFF, 0xFF, 0xCC),
+                                        RGB(0xCC, 0xFF, 0xCC),
+                                        RGB(0x88, 0xCC, 0xFF),
+                                        RGB(0xFF, 0x88, 0x88),
+                                        RGB(0xFF, 0xFF, 0x88),
+                                        RGB(0x88, 0xFF, 0x88),
+                                        RGB(0x44, 0x88, 0xFF),
+                                };
+                                if(nIndex - 1 < DIM(g_pnColors))
+                                {
+                                        nColor = g_pnColors[nIndex - 1];
+                                        return TRUE;
+                                }
+                                return FALSE;
+                        }
+                        BOOL GetBackgroundColor(COLORREF& nColor) const
+                        {
+                                return GetBackgroundColor(m_nHighlightIndex, nColor);
+                        }
                         LPCTSTR FormatType() const
                         {
@@ -707 +736 @@
                 public CPropertyPageT<CMediaSamplePropertyPage>,
                 public CPropertyPageWithAcceleratorsT<CMediaSamplePropertyPage>,
-                public CDialogResize<CMediaSamplePropertyPage>
+                public CDialogResize<CMediaSamplePropertyPage>,
+                public CCustomDraw<CMediaSamplePropertyPage>
         {
                 typedef CThreadT<CMediaSamplePropertyPage> CThread;
@@ -718 +748 @@
                 CHAIN_MSG_MAP(CPropertyPageWithAccelerators)
                 CHAIN_MSG_MAP(CDialogResize<CMediaSamplePropertyPage>)
+                CHAIN_MSG_MAP(CCustomDraw<CMediaSamplePropertyPage>)
                 MSG_WM_INITDIALOG(OnInitDialog)
                 MSG_WM_DESTROY(OnDestroy)
@@ -729 +760 @@
                 COMMAND_ID_HANDLER_EX(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_OPENFILTERGRAPHLIST, OnOpenFilterGraphList)
                 COMMAND_ID_HANDLER_EX(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_OPENFILTERGRAPHPROPERTIES, OnOpenFilterGraphProperties)
+                COMMAND_ID_HANDLER_EX(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVEALL, OnHighlightRemoveAll)
+                COMMAND_RANGE_HANDLER_EX(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVE, IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_8, OnHighlight)
                 REFLECT_NOTIFICATIONS()
         END_MSG_MAP()
@@ -1165 +1198 @@
                                 _T("Data Size"),
                                 _T("Comment"),
+                                _T("Highlight"),
                         };
                         sText += _StringHelper::Join(g_ppszHeader, _T("\t")) + _T("\r\n");
@@ -1217 +1251 @@
                                         Array.Add(CString(Item.m_PageItem.pszComment));
                                 }
+                                if(Item.m_nHighlightIndex)
+                                {
+                                        while(Array.GetCount() < 15)
+                                                Array.Add(_T(""));
+                                        Array.Add(AtlFormatString(_T("*%d"), Item.m_nHighlightIndex));
+                                }
                                 sText += _StringHelper::Join(Array, _T("\t"));
                                 sText += _T("\r\n");
@@ -1231 +1271 @@
                                         m_ListView.InsertItem(nItem++, Item);
                         // SUGG: Preserve selection
+                }
+
+        // CCustomDraw
+                DWORD OnPrePaint(INT nIdentifier, NMCUSTOMDRAW*)
+                {
+                        if(nIdentifier == IDC_MEDIASAMPLETRACE_MEDIASAMPLE_LIST)
+                                return CDRF_NOTIFYITEMDRAW;
+                        return CDRF_DODEFAULT;
+                }
+                DWORD OnItemPrePaint(INT, NMCUSTOMDRAW* pHeader)
+                {
+                        NMLVCUSTOMDRAW* pHeaderEx = (NMLVCUSTOMDRAW*) pHeader;
+                        const CData::CItem& Item = m_ListView.DataFromParameter(pHeaderEx->nmcd.lItemlParam);
+                        Item.GetBackgroundColor(pHeaderEx->clrTextBk);
+                        return CDRF_DODEFAULT;
                 }
 
@@ -1430 +1485 @@
                         CMenu ContainerMenu = AtlLoadMenu(IDD);
                         CMenuHandle Menu = ContainerMenu.GetSubMenu(0);
+                        const INT nItemCount = m_ListView.GetItemCount();
+                        const INT nSelectItemCount = m_ListView.GetSelectedCount();
+                        for(INT nIdentifier = IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVE; nIdentifier <= IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_8; nIdentifier++)
+                                Menu.EnableMenuItem(nIdentifier, nSelectItemCount ? MF_ENABLED : MF_GRAYED | MF_DISABLED);
+                        Menu.EnableMenuItem(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVEALL, nItemCount ? MF_ENABLED : MF_GRAYED | MF_DISABLED);
+                        Menu.EnableMenuItem(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_COPYTOCLIPBOARD, nItemCount ? MF_ENABLED : MF_GRAYED | MF_DISABLED);
+                        Menu.EnableMenuItem(IDC_MEDIASAMPLETRACE_MEDIASAMPLE_SAVETOFILE, nItemCount ? MF_ENABLED : MF_GRAYED | MF_DISABLED);
                         Menu.TrackPopupMenu(TPM_RIGHTBUTTON | TPM_LEFTALIGN | TPM_TOPALIGN, Position.x, Position.y, m_hWnd); 
                         return 0;
@@ -1528 +1590 @@
                         return 0;
                 }
+                LRESULT OnHighlightRemoveAll(UINT, INT nIdentifier, HWND)
+                {
+                        const INT nItemCount = m_ListView.GetItemCount();
+                        if(nItemCount > 0)
+                        {
+                                for(INT nItem = 0; nItem < nItemCount; nItem++)
+                                        m_ListView.GetItemData(nItem).m_nHighlightIndex = 0;
+                                m_ListView.RedrawItems(0, nItemCount - 1);
+                        }
+                        return 0;
+                }
+                LRESULT OnHighlight(UINT, INT nIdentifier, HWND)
+                {
+                        for(INT nItem: m_ListView.GetSelectedItems())
+                        {
+                                m_ListView.GetItemData(nItem).m_nHighlightIndex = nIdentifier - IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVE;
+                                m_ListView.RedrawItems(nItem, nItem);
+                        }
+                        return 0;
+                }
         };
 

trunk/DirectShowSpy/resource.h

@@ -141 +141 @@
 #define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_FILTER_STREAM_TITLE 2137
 #define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_FILTER_STREAM 2138
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVEALL 2150
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_REMOVE 2151
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_1 2152
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_2 2153
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_3 2154
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_4 2155
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_5 2156
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_6 2157
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_7 2158
+#define IDC_MEDIASAMPLETRACE_MEDIASAMPLE_HIGHLIGHT_8 2159
 #define IDR_FILTERGRAPHSPY              25000
 #define IDR_NOTHREADFILTERGRAPHSPY      25001
@@ -163 +173 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        214
-#define _APS_NEXT_COMMAND_VALUE         32798
+#define _APS_NEXT_COMMAND_VALUE         32806
 #define _APS_NEXT_CONTROL_VALUE         257
 #define _APS_NEXT_SYMED_VALUE           103