prepare for Crop to selection feature

janwilmans · janwilmans · commit 38209b76a521 · 2017-08-23T22:32:15.000+02:00
some non-functional changes
diff --git a/DebugView++/DebugView++.rc b/DebugView++/DebugView++.rc
diff --git a/DebugView++/LogView.cpp b/DebugView++/LogView.cpp
@@ -1003,15 +1003,9 @@ LRESULT CLogView::OnBeginDrag(NMHDR* pnmh)
 	return 0;
 }
 
-void CLogView::ClearView()
-{
-	m_firstLine = m_logFile.Count();
-	Clear();
-}
-
 void CLogView::OnViewClear(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wndCtl*/)
 {
-	ClearView();
+	Clear();
 }
 
 void CLogView::OnViewReset(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wndCtl*/)
@@ -1302,6 +1296,7 @@ void CLogView::SetAutoScrollStop(bool enable)
 
 void CLogView::Clear()
 {
+	m_firstLine = m_logFile.Count();
 	SetItemCount(0);
 	m_dirty = false;
 	m_logLines.clear();
@@ -1330,7 +1325,7 @@ void CLogView::SetFocusLine(int line)
 void CLogView::Add(int beginIndex, int line, const Message& msg)
 {
 	if (IsClearMessage(msg))
-		ClearView();
+		Clear();
 
 	if (!IsIncluded(msg))
 		return;
diff --git a/DebugView++/LogView.h b/DebugView++/LogView.h
@@ -236,7 +236,6 @@ class CLogView :
 
 	std::vector<std::string> GetSelectedMessages() const;
 	void ResetToLine(int line);
-	void ClearView();
 	void UpdateColumnInfo();
 	void UpdateColumns();
 	int ColumnToSubItem(Column::type column) const;
diff --git a/DebugView++/MainFrame.cpp b/DebugView++/MainFrame.cpp
@@ -184,6 +184,7 @@ BEGIN_MSG_MAP2(CMainFrame)
 	COMMAND_ID_HANDLER_EX(ID_FILE_LOAD_CONFIGURATION, OnFileLoadConfiguration)
 	COMMAND_ID_HANDLER_EX(ID_FILE_SAVE_CONFIGURATION, OnFileSaveConfiguration)
 	COMMAND_ID_HANDLER_EX(ID_LOG_CLEAR, OnLogClear)
+	COMMAND_ID_HANDLER_EX(ID_LOG_CROP, OnLogCrop)
 	COMMAND_ID_HANDLER_EX(ID_LOG_PAUSE, OnLogPause)
 	COMMAND_ID_HANDLER_EX(ID_LOG_GLOBAL, OnLogGlobal)
 	COMMAND_ID_HANDLER_EX(ID_LOG_HISTORY, OnLogHistory)
@@ -1031,8 +1032,6 @@ void CMainFrame::OnFileRun(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wndCtl*/
 void CMainFrame::Load(const std::wstring& filename, bool keeptailing)
 {
 	SetTitle(filename);
-	if (!IsPaused())
-		Pause();
 	ClearLog();
 	m_logSources.AddAnyFileReader(WStr(std::experimental::filesystem::path(filename).filename().string()), keeptailing);
 }
@@ -1054,8 +1053,6 @@ void CMainFrame::Load(std::istream& file, const std::string& name, FILETIME file
 {
 	Win32::ScopedCursor cursor(::LoadCursor(nullptr, IDC_WAIT));
 
-	if (!IsPaused())
-		Pause();
 	ClearLog();
 
 	Line line;
@@ -1131,9 +1128,8 @@ void CMainFrame::OnFileSaveConfiguration(UINT /*uNotifyCode*/, int /*nID*/, CWin
 
 void CMainFrame::ClearLog()
 {
-	// First Clear LogFile so views reset their m_firstLine:
 	m_logFile.Clear();
-	m_logSources.Reset();
+	m_logSources.ResetTimer();
 	int views = GetViewCount();
 	for (int i = 0; i < views; ++i)
 	{
@@ -1150,6 +1146,26 @@ void CMainFrame::OnLogClear(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wndCtl*
 	ClearLog();
 }
 
+void CMainFrame::OnLogCrop(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wndCtl*/)
+{
+	auto selection = GetView().GetSelectedRange();
+	if (selection.count < 2) return;
+
+	//LogFile temp = m_logFile.Copy(selection.beginLine, selection.endLine);
+	//m_logFile.Swap(temp);
+	//
+	//m_logSources.ResetTimer();
+	//int views = GetViewCount();
+	//for (int i = 0; i < views; ++i)
+	//{
+	//	GetView(i).Clear();
+	//	SetModifiedMark(i, false);
+	//	GetTabCtrl().UpdateLayout();
+	//	GetTabCtrl().Invalidate();
+	//}
+	//UpdateStatusBar();
+}
+
 void CMainFrame::OnLinkViews(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wndCtl*/)
 {
 	m_linkViews = !m_linkViews;
diff --git a/DebugView++/MainFrame.h b/DebugView++/MainFrame.h
@@ -198,6 +198,7 @@ class CMainFrame : public CTabbedFrameImpl<CMainFrame, CDotNetTabCtrl<SelectedTa
 	void OnHide(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnAlwaysOnTop(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnLogClear(UINT uNotifyCode, int nID, CWindow wndCtl);
+	void OnLogCrop(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnLogPause(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnLogGlobal(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnLogHistory(UINT uNotifyCode, int nID, CWindow wndCtl);
diff --git a/DebugView++/resource.h b/DebugView++/resource.h
diff --git a/DebugView++Lib/LogFile.cpp b/DebugView++Lib/LogFile.cpp
@@ -38,9 +38,9 @@ void LogFile::Clear()
 {
 	m_messages.clear();
 	m_messages.shrink_to_fit();
-    m_storage.Clear();
-    m_storage.shrink_to_fit();
-    m_processInfo.Clear();
+	m_storage.Clear();
+	m_storage.shrink_to_fit();
+	m_processInfo.Clear();
 }
 
 void LogFile::Add(const Message& msg)
diff --git a/DebugView++Lib/LogSources.cpp b/DebugView++Lib/LogSources.cpp
@@ -128,7 +128,7 @@ void LogSources::Abort()
 	m_listenThread.Synchronize();
 }
 
-void LogSources::Reset()
+void LogSources::ResetTimer()
 {
 	m_timer.Reset();
 }
diff --git a/IndexedStorageLib/IndexedStorage.cpp b/IndexedStorageLib/IndexedStorage.cpp
@@ -1,6 +1,6 @@
 // (C) Copyright Gert-Jan de Vos and Jan Wilmans 2013.
 // Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at 
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 // Repository at: https://github.com/djeedjay/DebugViewPP/
@@ -12,7 +12,7 @@
 
 namespace fusion {
 namespace indexedstorage {
-	
+
 const int blockSize = 400;
 
 bool VectorStorage::Empty() const
@@ -106,7 +106,7 @@ std::string SnappyStorage::GetString(size_t index)
 {
 	auto blockId = GetBlockIndex(index);
 	auto id = GetRelativeIndex(index);
-		
+
 	if (blockId == m_writeBlockIndex)
 	{
 		return m_writeList[id];
@@ -155,10 +155,10 @@ std::vector<std::string> SnappyStorage::Decompress(const std::string& value)
 
 void SnappyStorage::shrink_to_fit()
 {
-    m_readList.shrink_to_fit();
-    m_writeList.shrink_to_fit();
-    m_storage.shrink_to_fit();
+	m_readList.shrink_to_fit();
+	m_writeList.shrink_to_fit();
+	m_storage.shrink_to_fit();
 }
 
-} // namespace indexedstorage 
+} // namespace indexedstorage
 } // namespace fusion
diff --git a/include/DebugView++Lib/LogSources.h b/include/DebugView++Lib/LogSources.h
@@ -63,7 +63,7 @@ class LogSources
 	void SetAutoNewLine(bool value);
 	bool GetAutoNewLine() const;
 
-	void Reset();
+	void ResetTimer();
 	void Listen();
 	void ListenUntilUpdateEvent();
 	void Abort();
diff --git a/include/IndexedStorageLib/IndexedStorage.h b/include/IndexedStorageLib/IndexedStorage.h
@@ -40,11 +40,12 @@ class SnappyStorage
 	std::string operator[](size_t i);
 
 	std::string Compress(const std::vector<std::string>& value) const;
-    static std::vector<std::string> Decompress(const std::string& value);
-    void shrink_to_fit();
+	static std::vector<std::string> Decompress(const std::string& value);
+	void shrink_to_fit();
+
 private:
-    static size_t GetBlockIndex(size_t index);
-    static size_t GetRelativeIndex(size_t index);
+	static size_t GetBlockIndex(size_t index);
+	static size_t GetRelativeIndex(size_t index);
 	std::string GetString(size_t index);
 
 	size_t m_writeBlockIndex;

Original file line number	Diff line number	Diff line change
`@@ -1003,15 +1003,9 @@ LRESULT CLogView::OnBeginDrag(NMHDR* pnmh)`
`1003`	`1003`	`return 0;`
`1004`	`1004`	`}`
`1005`	`1005`
`1006`		`-void CLogView::ClearView()`
`1007`		`-{`
`1008`		`- m_firstLine = m_logFile.Count();`
`1009`		`- Clear();`
`1010`		`-}`
`1011`		`-`
`1012`	`1006`	`void CLogView::OnViewClear(UINT /uNotifyCode/, int /nID/, CWindow /wndCtl/)`
`1013`	`1007`	`{`
`1014`		`- ClearView();`
	`1008`	`+ Clear();`
`1015`	`1009`	`}`
`1016`	`1010`
`1017`	`1011`	`void CLogView::OnViewReset(UINT /uNotifyCode/, int /nID/, CWindow /wndCtl/)`
`@@ -1302,6 +1296,7 @@ void CLogView::SetAutoScrollStop(bool enable)`
`1302`	`1296`
`1303`	`1297`	`void CLogView::Clear()`
`1304`	`1298`	`{`
	`1299`	`+ m_firstLine = m_logFile.Count();`
`1305`	`1300`	`SetItemCount(0);`
`1306`	`1301`	`m_dirty = false;`
`1307`	`1302`	`m_logLines.clear();`
`@@ -1330,7 +1325,7 @@ void CLogView::SetFocusLine(int line)`
`1330`	`1325`	`void CLogView::Add(int beginIndex, int line, const Message& msg)`
`1331`	`1326`	`{`
`1332`	`1327`	`if (IsClearMessage(msg))`
`1333`		`- ClearView();`
	`1328`	`+ Clear();`
`1334`	`1329`
`1335`	`1330`	`if (!IsIncluded(msg))`
`1336`	`1331`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ void LogFile::Clear()`
`38`	`38`	`{`
`39`	`39`	`m_messages.clear();`
`40`	`40`	`m_messages.shrink_to_fit();`
`41`		`- m_storage.Clear();`
`42`		`- m_storage.shrink_to_fit();`
`43`		`- m_processInfo.Clear();`
	`41`	`+ m_storage.Clear();`
	`42`	`+ m_storage.shrink_to_fit();`
	`43`	`+ m_processInfo.Clear();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void LogFile::Add(const Message& msg)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void LogSources::Abort()`
`128`	`128`	`m_listenThread.Synchronize();`
`129`	`129`	`}`
`130`	`130`
`131`		`-void LogSources::Reset()`
	`131`	`+void LogSources::ResetTimer()`
`132`	`132`	`{`
`133`	`133`	`m_timer.Reset();`
`134`	`134`	`}`