Merge branch 'ngscopeclient:master' into stream-browser-dialog-update

Author: fredzo

lib

@@ -5,9 +5,10 @@ This is a running list of significant bug fixes and new features since the last
 ## New features since v0.1.1
 
 * Core: Changed rate limiting sleep in InstrumentThread loop from 10ms to 1ms to avoid bogging down high performance instruments like the ThunderScope
+* Core: Scopesession loading now uses multithreaded IO for significant performance gains especially when many channels and deep history are involved
 * Drivers: ThunderScope now overlaps socket IO and GPU processing of waveforms giving a significant increase in WFM/s rate
-* Filters: Added GPU acceleration for several filters including CDR PLL (7.5x speedup), 100baseTX (2.5x speedup), eye pattern (25x speedup), histogram (12x speedup), TIE (5.3x speedup) and more (https://github.com/ngscopeclient/scopehal/issues/977).
-* Filters: CDR PLL now outputs the input signal sampled by the recovered clock in a second data stream.
+* Filters: Added GPU acceleration for several filters including CDR PLL (7.5x speedup), 100baseTX (10x speedup), eye pattern (25x speedup), histogram (12x speedup), TIE (5.3x speedup) and more (https://github.com/ngscopeclient/scopehal/issues/977).
+* Filters: CDR PLL now outputs the input signal sampled by the recovered clock in a second data stream (https://github.com/ngscopeclient/scopehal/issues/991)
 * Filters: Peak detector for FFT etc now does quadratic interpolation for sub-sample peak fitting
 * Filters: Horizontal bathtub curve now works properly with MLT-3 / PAM-3 eyes as well as NRZ. No PAM-4 or higher support yet.
 * Filters: PcapNG export now has an additional mode selector for use with named pipes, allowing live streaming of PcapNG formatted data to WireShark
@@ -21,9 +22,14 @@ We try to maintain compatibility with older versions of ngscopeclient but occasi
 
 ## Bugs fixed since v0.1.1
 
+* Filters: broken CSV import with \r\n line endings (https://github.com/ngscopeclient/scopehal-apps/issues/939)
 * Filters: PcapNG export did not handle named pipes correctly (no github ticket)
 * Filters: FFT waveforms were shifted one bin to the right of the correct position
 * Filters: Frequency and period measurement had a rounding error during integer-to-floating-point conversion causing half a cycle of the waveform to be dropped under some circumstances leading to an incorrect result, with worse error at low frequencies and short memory depths. This only affected the "summary" output not the trend plot.
+* GUI: Crash when closing a session (https://github.com/ngscopeclient/scopehal-apps/issues/934)
 * GUI: Pressing middle mouse on the Y axis to autoscale would fail, setting the full scale range to zero volts, if the waveform was resident in GPU memory and the CPU-side copy of the buffer was stale
+* GUI: History dialog allowed zero or negative values for history depth (https://github.com/ngscopeclient/scopehal-apps/issues/940)
 
 ## Other changes since v0.1.1
+
+* General UI overhaul of stream browser to make things more intuitive and reduce the number of clicks needed to perform common tasks

release-notes/CHANGELOG.md

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -142,6 +142,10 @@ bool HistoryDialog::DoRender()
 		"Adjust the cap on total history depth, in waveforms.\n"
 		"Large history depths can use significant amounts of RAM with deep memory.");
 
+	//Clamp depth so it can't go below 1
+	if(m_mgr.m_maxDepth < 1)
+		m_mgr.m_maxDepth = 1;
+
 	if(ImGui::BeginTable("history", 3, flags))
 	{
 		ImGui::TableSetupScrollFreeze(0, 1); //Header row does not scroll

src/ngscopeclient/HistoryDialog.cpp

@@ -214,6 +214,33 @@ void HistoryManager::LoadEmptyHistoryToSession(Session& session)
 	}
 }
 
+/**
+	@brief Retroactively modify history for an instrument
+
+	This is used during session loading if we find waveforms in certain legacy formats that need to be converted
+	ex post facto
+ */
+void HistoryManager::Retcon(shared_ptr<Oscilloscope> scope, size_t chan, size_t stream, WaveformBase* wfm)
+{
+	TimePoint tp(wfm->m_startTimestamp, wfm->m_startFemtoseconds);
+
+	for(auto& point : m_history)
+	{
+		if(point->m_time != tp)
+			continue;
+
+		//Make sure we have history for this scope
+		auto jt = point->m_history.find(scope);
+		if(jt == point->m_history.end())
+			return;
+
+		//Overwrite the waveform.
+		//Does not free the old one, it's assumed this is done by SetData() on the scope before calling this function
+		jt->second[StreamDescriptor(scope->GetChannel(chan), stream)] = wfm;
+		break;
+	}
+}
+
 /**
 	@brief Adds new data to the history
 
@@ -262,6 +289,7 @@ void HistoryManager::AddHistory(
 
 	//If we already have a history point for the same exact timestamp, do nothing
 	//Either a bug or we're in append mode
+	//TODO: when loading multiscope scopesessions, do we want to add stuff here??
 	if(HasHistory(tp))
 		return;
 

src/ngscopeclient/HistoryManager.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -77,6 +77,8 @@ class HistoryManager
 
 	bool OnMemoryPressure(MemoryPressureLevel level, MemoryPressureType type, size_t requestedSize);
 
+	void Retcon(std::shared_ptr<Oscilloscope> scope, size_t chan, size_t stream, WaveformBase* wfm);
+
 	void AddHistory(
 		const std::vector<std::shared_ptr<Oscilloscope>>& scopes,
 		bool deleteOld = true,

src/ngscopeclient/HistoryManager.h

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -171,9 +171,7 @@ MainWindow::MainWindow(shared_ptr<QueueHandle> queue)
 	m_toolbarIconSize = 0;
 	LoadToolbarIcons();
 	LoadGradients();
-	m_texmgr.LoadTexture("warning", FindDataFile("icons/48x48/dialog-warning-2.png"));
-	m_texmgr.LoadTexture("visible-spectrum-380nm-750nm",
-		FindDataFile("icons/gradients/visible-spectrum-380nm-750nm.png"));
+	LoadMiscIcons();
 	LoadFilterIcons();
 	LoadStatusBarIcons();
 	LoadWaveformShapeIcons();
@@ -1317,6 +1315,9 @@ void MainWindow::DockingArea()
 		{
 			LogTrace("Docking initial workspace\n");
 
+			//Undock anything that might already be there
+			ImGui::DockBuilderRemoveNodeChildNodes(topNode->ID);
+
 			//Split the top into two sub nodes (unless imgui already did it for us during a session reset)
 			ImGuiID leftPanelID;
 			ImGuiID rightPanelID;
@@ -1331,10 +1332,10 @@ void MainWindow::DockingArea()
 			ImGui::DockBuilderDockWindow(m_streamBrowser->GetTitleAndID().c_str(), leftPanelID);
 			ImGui::DockBuilderDockWindow(m_initialWorkspaceDockRequest->GetTitleAndID().c_str(), rightPanelID);
 
-			m_initialWorkspaceDockRequest = nullptr;
-
 			//Finish up
 			ImGui::DockBuilderFinish(dockspace_id);
+
+			m_initialWorkspaceDockRequest = nullptr;
 		}
 	}
 	else

src/ngscopeclient/MainWindow.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -130,7 +130,7 @@ class MainWindow : public VulkanWindow
 	{ m_splitRequests.push_back(SplitGroupRequest(group, direction, stream)); }
 
 	void ShowChannelProperties(OscilloscopeChannel* channel);
-	void ShowInstrumentProperties(std::shared_ptr<Instrument> instrumet);
+	void ShowInstrumentProperties(std::shared_ptr<Instrument> instrument);
 	void ShowTriggerProperties();
 	void ShowManageInstruments();
 	void ShowSyncWizard(std::shared_ptr<TriggerGroup> group, std::shared_ptr<Oscilloscope> secondary);
@@ -275,6 +275,7 @@ class MainWindow : public VulkanWindow
 	std::vector<std::string> m_eyeGradients;
 
 	void LoadFilterIcons();
+	void LoadMiscIcons();
 	void LoadStatusBarIcons();
 	void LoadWaveformShapeIcons();
 	void LoadAppIcon();

src/ngscopeclient/MainWindow.h

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -793,6 +793,17 @@ string MainWindow::GetIconForWaveformShape(FunctionGenerator::WaveShape shape)
 	return "shape-default";
 }
 
+/**
+	@brief Load various miscellaneous icons and textures
+ */
+void MainWindow::LoadMiscIcons()
+{
+	m_texmgr.LoadTexture("warning", FindDataFile("icons/48x48/dialog-warning-2.png"));
+	m_texmgr.LoadTexture("info", FindDataFile("icons/48x48/dialog-information-3.png"));
+	m_texmgr.LoadTexture("visible-spectrum-380nm-750nm",
+		FindDataFile("icons/gradients/visible-spectrum-380nm-750nm.png"));
+}
+
 /**
 	@brief Load toolbar icons from disk if preferences changed
  */