ngscopeclient · Aug 5, 2020
Showing with 87 additions and 4 deletions.

+1 −1 lib

+2 −1 src/glscopeclient/WaveformArea.h

+39 −2 src/glscopeclient/WaveformArea_cairo.cpp

+45 −0 src/glscopeclient/masks/xfi.yml
diff --git a/lib b/lib
diff --git a/src/glscopeclient/WaveformArea.h b/src/glscopeclient/WaveformArea.h
@@ -277,7 +277,7 @@ class WaveformArea : public Gtk::GLArea
 	//Display options
 	bool m_persistence;
 	bool m_persistenceClear;
-	
+
 	// Whether GLEW is already initialized
 	static bool m_isGlewInitialized;
 
@@ -332,6 +332,7 @@ class WaveformArea : public Gtk::GLArea
 	void DoRenderCairoOverlays(Cairo::RefPtr< Cairo::Context > cr);
 	void RenderCursors(Cairo::RefPtr< Cairo::Context > cr);
 	void RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr);
+	void RenderEyeMask(Cairo::RefPtr< Cairo::Context > cr);
 	void RenderDecodeOverlays(Cairo::RefPtr< Cairo::Context > cr);
 	void InitializeCairoPass();
 	Texture m_cairoTexture;

diff --git a/src/glscopeclient/WaveformArea_cairo.cpp b/src/glscopeclient/WaveformArea_cairo.cpp
@@ -251,9 +251,37 @@ void WaveformArea::RenderGrid(Cairo::RefPtr< Cairo::Context > cr)
 
 void WaveformArea::DoRenderCairoOverlays(Cairo::RefPtr< Cairo::Context > cr)
 {
+	//Eye mask should be under channel infobox and other stuff
+	if(IsEye())
+		RenderEyeMask(cr);
+
 	RenderDecodeOverlays(cr);
-	RenderChannelLabel(cr);
 	RenderCursors(cr);
+	RenderChannelLabel(cr);
+}
+
+void WaveformArea::RenderEyeMask(Cairo::RefPtr< Cairo::Context > cr)
+{
+	//Make sure it's really an eye
+	auto eye = dynamic_cast<EyeDecoder2*>(m_channel);
+	if(!eye)
+		return;
+	auto waveform = dynamic_cast<EyeWaveform*>(eye->GetData());
+
+	//If no mask is selected, we have nothing to draw
+	auto& mask = eye->GetMask();
+	if(mask.GetMaskName() == "")
+		return;
+
+	//Do the actual drawing
+	mask.RenderForDisplay(
+		cr,
+		waveform,
+		m_group->m_pixelsPerXUnit,
+		m_group->m_xAxisOffset,
+		m_pixelsPerVolt,
+		m_channel->GetOffset(),
+		m_height);
 }
 
 void WaveformArea::RenderDecodeOverlays(Cairo::RefPtr< Cairo::Context > cr)
@@ -426,6 +454,7 @@ void WaveformArea::RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr)
 	auto data = m_channel->GetData();
 
 	auto eye = dynamic_cast<EyeWaveform*>(data);
+	auto ed = dynamic_cast<EyeDecoder2*>(m_channel);
 
 	//Add RBW to frequency domain channels
 	char tmp[256];
@@ -437,8 +466,9 @@ void WaveformArea::RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr)
 	}
 
 	//Add count info to eye channels
-	else if(eye != NULL)
+	else if( (eye != NULL) && (ed != NULL) )
 	{
+
 		size_t uis = eye->GetTotalUIs();
 		float gbps = 1e3f / eye->GetUIWidth();
 
@@ -449,6 +479,13 @@ void WaveformArea::RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr)
 		else
 			snprintf(tmp, sizeof(tmp), "\n%.2fG UI    %.4f Gbps", uis * 1e-6f, gbps);
 		label += tmp;
+
+		auto maskname = ed->GetMask().GetMaskName();
+		if(maskname != "")
+		{
+			snprintf(tmp, sizeof(tmp), "\nMask: %s", maskname.c_str());
+			label += tmp;
+		}
 	}
 
 	//Add sample rate info to physical analog channels

diff --git a/src/glscopeclient/masks/xfi.yml b/src/glscopeclient/masks/xfi.yml
@@ -0,0 +1,45 @@
+protocol:
+    name:       XFI
+    reference:  SFF-8431 table 12
+displaylimits:
+    ymin:       -400
+    ymax:        400
+units:
+    xscale:     ui
+    yscale:     mv
+mask:
+    - points:
+        -   x:   -0.38
+            y:    0
+        -   x:   -0.17
+            y:  -95
+        -   x:    0.17
+            y:  -95
+        -   x:    0.38
+            y:    0
+        -   x:    0.17
+            y:   95
+        -   x:   -0.17
+            y:   95
+
+    - points:
+        -   x:   -2
+            y: -350
+        -   x:    2
+            y: -350
+        -   x:    2
+            y: -500
+        -   x:   -2
+            y: -500
+
+    - points:
+        -   x:   -2
+            y:  350
+        -   x:    2
+            y:  350
+        -   x:    2
+            y:  500
+        -   x:   -2
+            y:  500
+conditions:
+    hitrate: 5.0e-5