ngscopeclient · Feb 13, 2020 · Feb 13, 2020 · Feb 13, 2020
Showing with 44 additions and 7 deletions.

+4 −1 glscopeclient/OscilloscopeWindow.h

+10 −1 glscopeclient/WaveformArea.cpp

+5 −3 glscopeclient/WaveformArea.h

+25 −2 glscopeclient/WaveformArea_events.cpp
diff --git a/glscopeclient/OscilloscopeWindow.h b/glscopeclient/OscilloscopeWindow.h
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ANTIKERNEL v0.1                                                                                                      *
 *                                                                                                                      *
-* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2020 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -76,6 +76,9 @@ class OscilloscopeWindow	: public Gtk::Window
 	void AddDecoder(ProtocolDecoder* decode)
 	{ m_decoders.emplace(decode); }
 
+	void RemoveDecoder(ProtocolDecoder* decode)
+	{ m_decoders.erase(decode); }
+
 	size_t GetScopeCount()
 	{ return m_scopes.size(); }
 

diff --git a/glscopeclient/WaveformArea.cpp b/glscopeclient/WaveformArea.cpp
@@ -109,7 +109,7 @@ WaveformArea::~WaveformArea()
 	CleanupBufferObjects();
 
 	for(auto d : m_overlays)
-		d->Release();
+		OnRemoveOverlay(d);
 	m_overlays.clear();
 
 	for(auto m : m_moveExistingGroupItems)
@@ -120,6 +120,15 @@ WaveformArea::~WaveformArea()
 	m_moveExistingGroupItems.clear();
 }
 
+void WaveformArea::OnRemoveOverlay(ProtocolDecoder* decode)
+{
+	//If we're about to remove the last reference to a decoder, make sure the parent knows
+	if(decode->GetRefCount() == 1)
+		m_parent->RemoveDecoder(decode);
+
+	decode->Release();
+}
+
 void WaveformArea::CleanupBufferObjects()
 {
 	for(auto a : m_traceVAOs)

diff --git a/glscopeclient/WaveformArea.h b/glscopeclient/WaveformArea.h
@@ -251,12 +251,14 @@ class WaveformArea : public Gtk::GLArea
 	float PicosecondsToXPosition(int64_t t);
 	int64_t XPositionToPicoseconds(float pix);
 
+	void OnRemoveOverlay(ProtocolDecoder* decode);
+
 	Oscilloscope* m_scope;
-	OscilloscopeChannel* m_channel;
-	OscilloscopeChannel* m_selectedChannel;
+	OscilloscopeChannel* m_channel;							//The main waveform for this view
+	OscilloscopeChannel* m_selectedChannel;					//The selected channel (either m_channel or an overlay)
 	OscilloscopeWindow* m_parent;
 
-	std::vector<ProtocolDecoder*> m_overlays;
+	std::vector<ProtocolDecoder*> m_overlays;				//List of protocol decoders drawn on top of the signal
 	std::map<ProtocolDecoder*, int> m_overlayPositions;
 
 	double m_lastFrameStart;

diff --git a/glscopeclient/WaveformArea_events.cpp b/glscopeclient/WaveformArea_events.cpp
@@ -426,7 +426,26 @@ void WaveformArea::OnCopyToExistingGroup(WaveformGroup* group)
 
 void WaveformArea::OnHide()
 {
-	m_parent->OnRemoveChannel(this);
+	//Delete the entire waveform area
+	if(m_selectedChannel == m_channel)
+		m_parent->OnRemoveChannel(this);
+
+	//Deleting an overlay
+	else
+	{
+		//LogDebug("Deleting overlay %s\n", m_selectedChannel->m_displayname.c_str());
+
+		//Remove the overlay from the list
+		for(size_t i=0; i<m_overlays.size(); i++)
+		{
+			if(m_overlays[i] == m_selectedChannel)
+			{
+				OnRemoveOverlay(m_overlays[i]);
+				m_overlays.erase(m_overlays.begin() + i);
+				break;
+			}
+		}
+	}
 }
 
 void WaveformArea::OnTogglePersistence()
@@ -438,7 +457,7 @@ void WaveformArea::OnTogglePersistence()
 void WaveformArea::OnProtocolDecode(string name)
 {
 	//Create a new decoder for the incoming signal
-	string color = GetDefaultChannelColor(g_numDecodes ++);
+	string color = GetDefaultChannelColor(g_numDecodes);
 	auto decode = ProtocolDecoder::CreateDecoder(name, color);
 
 	//Only one input with no config required? Do default configuration
@@ -457,6 +476,10 @@ void WaveformArea::OnProtocolDecode(string name)
 		dialog.ConfigureDecoder();
 	}
 
+	//Increment the color chooser only after we've decided to add the decode.
+	//If the dialog is canceled, don't do anything.
+	g_numDecodes ++;
+
 	//Set the name of the decoder based on the input channels etc
 	decode->SetDefaultName();