Initial programmer-art icons for various types of FIR filter

ngscopeclient · Aug 25, 2024 · 2cf318a · 2cf318a
1 parent 61fdb98
commit 2cf318a
Show file tree

Hide file tree

Showing 11 changed files with 237 additions and 2 deletions.
diff --git a/doc b/doc
diff --git a/lib b/lib
diff --git a/src/ngscopeclient/FilterGraphEditor.cpp b/src/ngscopeclient/FilterGraphEditor.cpp
@@ -78,6 +78,7 @@
 #include "../scopeprotocols/EthernetSGMIIDecoder.h"
 #include "../scopeprotocols/EyePattern.h"
 #include "../scopeprotocols/FallMeasurement.h"
+#include "../scopeprotocols/FIRFilter.h"
 #include "../scopeprotocols/FFTFilter.h"
 #include "../scopeprotocols/FrequencyMeasurement.h"
 #include "../scopeprotocols/FullWidthHalfMax.h"
@@ -88,6 +89,7 @@
 #include "../scopeprotocols/MemoryFilter.h"
 #include "../scopeprotocols/MinimumFilter.h"
 #include "../scopeprotocols/MultiplyFilter.h"
+#include "../scopeprotocols/NCOFilter.h"
 #include "../scopeprotocols/OvershootMeasurement.h"
 #include "../scopeprotocols/PeriodMeasurement.h"
 #include "../scopeprotocols/PulseWidthMeasurement.h"
@@ -290,6 +292,10 @@ FilterGraphEditor::FilterGraphEditor(Session& session, MainWindow* parent)
 	m_parent->GetTextureManager()->LoadTexture("filter-envelope", FindDataFile("icons/filters/filter-envelope.png"));
 	m_parent->GetTextureManager()->LoadTexture("filter-eyepattern", FindDataFile("icons/filters/filter-eyepattern.png"));
 	m_parent->GetTextureManager()->LoadTexture("filter-fall", FindDataFile("icons/filters/filter-fall.png"));
+	m_parent->GetTextureManager()->LoadTexture("filter-fir-highpass", FindDataFile("icons/filters/filter-fir-highpass.png"));
+	m_parent->GetTextureManager()->LoadTexture("filter-fir-lowpass", FindDataFile("icons/filters/filter-fir-lowpass.png"));
+	m_parent->GetTextureManager()->LoadTexture("filter-fir-bandpass", FindDataFile("icons/filters/filter-fir-bandpass.png"));
+	m_parent->GetTextureManager()->LoadTexture("filter-fir-notch", FindDataFile("icons/filters/filter-fir-notch.png"));
 	m_parent->GetTextureManager()->LoadTexture("filter-fft", FindDataFile("icons/filters/filter-fft.png"));
 	m_parent->GetTextureManager()->LoadTexture("filter-frequency", FindDataFile("icons/filters/filter-frequency.png"));
 	m_parent->GetTextureManager()->LoadTexture("filter-fwhm", FindDataFile("icons/filters/filter-fwhm.png"));
@@ -362,6 +368,7 @@ FilterGraphEditor::FilterGraphEditor(Session& session, MainWindow* parent)
 	m_filterIconMap[type_index(typeid(MemoryFilter))] 							= "filter-memory";
 	m_filterIconMap[type_index(typeid(MinimumFilter))] 							= "filter-min";
 	m_filterIconMap[type_index(typeid(MultiplyFilter))] 						= "filter-multiply";
+	m_filterIconMap[type_index(typeid(NCOFilter))] 								= "filter-sine";
 	m_filterIconMap[type_index(typeid(PeriodMeasurement))] 						= "filter-period";
 	m_filterIconMap[type_index(typeid(PulseWidthMeasurement))] 					= "filter-pulse-width";
 	m_filterIconMap[type_index(typeid(QSGMIIDecoder))]							= "filter-rj45";
@@ -2304,6 +2311,36 @@ void FilterGraphEditor::NodeIcon(InstrumentChannel* chan, ImVec2 pos, ImVec2 ico
 		auto it = m_filterIconMap.find(typeid(*chan));
 		if(it != m_filterIconMap.end())
 			iconname = it->second;
+
+		//Special case for a few filters whose icon changes with configuration
+		else
+		{
+			auto fir = dynamic_cast<FIRFilter*>(chan);
+			if(fir)
+			{
+				switch(fir->GetFilterType())
+				{
+					case FIRFilter::FILTER_TYPE_LOWPASS:
+						iconname = "filter-fir-lowpass";
+						break;
+
+					case FIRFilter::FILTER_TYPE_HIGHPASS:
+						iconname = "filter-fir-highpass";
+						break;
+
+					case FIRFilter::FILTER_TYPE_BANDPASS:
+						iconname = "filter-fir-bandpass";
+						break;
+
+					case FIRFilter::FILTER_TYPE_NOTCH:
+						iconname = "filter-fir-notch";
+						break;
+
+					default:
+						break;
+				}
+			}
+		}
 	}
 
 	if(iconname != "")

diff --git a/src/ngscopeclient/icons/filters/filter-fir-bandpass.png b/src/ngscopeclient/icons/filters/filter-fir-bandpass.png
diff --git a/src/ngscopeclient/icons/filters/filter-fir-highpass.png b/src/ngscopeclient/icons/filters/filter-fir-highpass.png
diff --git a/src/ngscopeclient/icons/filters/filter-fir-lowpass.png b/src/ngscopeclient/icons/filters/filter-fir-lowpass.png
diff --git a/src/ngscopeclient/icons/filters/filter-fir-notch.png b/src/ngscopeclient/icons/filters/filter-fir-notch.png
diff --git a/src/ngscopeclient/icons/scalable/filter-fir-bandpass.svg b/src/ngscopeclient/icons/scalable/filter-fir-bandpass.svg
diff --git a/src/ngscopeclient/icons/scalable/filter-fir-highpass.svg b/src/ngscopeclient/icons/scalable/filter-fir-highpass.svg
diff --git a/src/ngscopeclient/icons/scalable/filter-fir-lowpass.svg b/src/ngscopeclient/icons/scalable/filter-fir-lowpass.svg
diff --git a/src/ngscopeclient/icons/scalable/filter-fir-notch.svg b/src/ngscopeclient/icons/scalable/filter-fir-notch.svg
+1 −0		scopeprotocols/CMakeLists.txt
+3 −0		scopeprotocols/FIRFilter.h
+191 −0		scopeprotocols/NCOFilter.cpp
+62 −0		scopeprotocols/NCOFilter.h
+1 −1		scopeprotocols/SawtoothGeneratorFilter.cpp
+1 −1		scopeprotocols/SawtoothGeneratorFilter.h
+1 −11		scopeprotocols/ToneGeneratorFilter.cpp
+1 −2		scopeprotocols/ToneGeneratorFilter.h
+1 −0		scopeprotocols/scopeprotocols.cpp
+1 −0		scopeprotocols/scopeprotocols.h