ngscopeclient · May 23, 2020 · May 23, 2020 · May 23, 2020 · May 23, 2020 · May 23, 2020
Showing with 22 additions and 26 deletions.

+4 −4 glscopeclient/Timeline.cpp

+12 −16 glscopeclient/WaveformArea_cairo.cpp

+4 −5 glscopeclient/WaveformArea_rendering.cpp

+1 −1 glscopeclient/WaveformGroup.cpp

+1 −0 glscopeclient/styles/glscopeclient.css
diff --git a/glscopeclient/Timeline.cpp b/glscopeclient/Timeline.cpp
@@ -234,7 +234,7 @@ void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr, Unit xAxisUnit)
 		round_divisor = 1E12;
 
 	//Figure out about how much time per graduation to use
-	const double min_label_grad_width = 100;		//Minimum distance between text labels, in pixels
+	const double min_label_grad_width = 75;		//Minimum distance between text labels, in pixels
 	double grad_ps_nominal = min_label_grad_width / m_group->m_pixelsPerXUnit;
 
 	//Round so the division sizes are sane
@@ -243,7 +243,7 @@ void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr, Unit xAxisUnit)
 	double log_units = log(units_per_grad) / log(base);
 	double log_units_rounded = ceil(log_units);
 	double units_rounded = pow(base, log_units_rounded);
-	int64_t grad_ps_rounded = units_rounded * round_divisor;
+	int64_t grad_ps_rounded = round(units_rounded * round_divisor);
 
 	//avoid divide-by-zero in weird cases with no waveform etc
 	if(grad_ps_rounded == 0)
@@ -253,8 +253,8 @@ void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr, Unit xAxisUnit)
 	double nsubticks = 5;
 	double subtick = grad_ps_rounded / nsubticks;
 
-	//Find the start time (rounded down as needed)
-	double tstart = floor(m_group->m_xAxisOffset / grad_ps_rounded) * grad_ps_rounded;
+	//Find the start time (rounded as needed)
+	double tstart = round(m_group->m_xAxisOffset / grad_ps_rounded) * grad_ps_rounded;
 
 	//Print tick marks and labels
 	Glib::RefPtr<Pango::Layout> tlayout = Pango::Layout::create (cr);

diff --git a/glscopeclient/WaveformArea_cairo.cpp b/glscopeclient/WaveformArea_cairo.cpp
@@ -134,22 +134,27 @@ void WaveformArea::RenderGrid(Cairo::RefPtr< Cairo::Context > cr)
 		float top_edge = (ytop - theight/2);
 
 		//Calculate grid positions
-		//TODO: make this more efficient if we have large offsets
+		float vbot = YPositionToVolts(ybot);
+		float vtop = YPositionToVolts(ytop);
+		float vmid = (vbot + vtop)/2;
 		for(float dv=0; ; dv += selected_step)
 		{
-			float yt = VoltsToYPosition(dv);
-			float yb = VoltsToYPosition(-dv);
+			float vp = vmid + dv;
+			float vn = vmid - dv;
+
+			float yt = VoltsToYPosition(vp);
+			float yb = VoltsToYPosition(vn);
 
 			if(dv != 0)
 			{
 				if( (yb >= bottom_edge) && (yb <= top_edge ) )
-					gridmap[-dv] = yb;
+					gridmap[vn] = yb;
 
 				if( (yt >= bottom_edge ) && (yt <= top_edge) )
-					gridmap[dv] = yt;
+					gridmap[vp] = yt;
 			}
 			else
-				gridmap[dv] = yt;
+				gridmap[vp] = yt;
 
 			//Stop if we're off the edge
 			if( (yb > ytop) && (yt < ybot) )
@@ -188,16 +193,7 @@ void WaveformArea::RenderGrid(Cairo::RefPtr< Cairo::Context > cr)
 	for(auto it : gridmap)
 	{
 		float v = it.first;
-
-		if(IsFFT())
-		{
-			char tmp[32];
-			snprintf(tmp, sizeof(tmp), "%.0f dB", v);
-			tlayout->set_text(tmp);
-		}
-		else
-			tlayout->set_text(m_channel->GetYAxisUnits().PrettyPrint(v));
-
+		tlayout->set_text(m_channel->GetYAxisUnits().PrettyPrint(v));
 		float y = it.second;
 		if(!IsFFT())
 			y -= theight/2;

diff --git a/glscopeclient/WaveformArea_rendering.cpp b/glscopeclient/WaveformArea_rendering.cpp
@@ -359,19 +359,18 @@ void WaveformArea::RenderOverlayTraces()
 
 void WaveformArea::RenderEye()
 {
-	auto peye = dynamic_cast<EyeDecoder2*>(m_channel);
-	auto pcap = dynamic_cast<EyeWaveform*>(m_channel->GetData());
-	if(peye == NULL)
+	if(m_channel->GetType() != OscilloscopeChannel::CHANNEL_TYPE_EYE)
 		return;
+	auto pcap = dynamic_cast<EyeWaveform*>(m_channel->GetData());
 	if(pcap == NULL)
 		return;
 
 	//It's an eye pattern! Just copy it directly into the waveform texture.
 	m_eyeTexture.Bind();
 	ResetTextureFiltering();
 	m_eyeTexture.SetData(
-		peye->GetWidth(),
-		peye->GetHeight(),
+		pcap->GetWidth(),
+		pcap->GetHeight(),
 		pcap->GetData(),
 		GL_RED,
 		GL_FLOAT,

diff --git a/glscopeclient/WaveformGroup.cpp b/glscopeclient/WaveformGroup.cpp
@@ -232,7 +232,7 @@ void WaveformGroup::RefreshMeasurements()
 			if(!stat->Calculate(chan, value))
 				row[m_treeColumns.m_columns[i]] = "(error)";
 			else
-				row[m_treeColumns.m_columns[i]] = chan->GetYAxisUnits().PrettyPrint(value);
+				row[m_treeColumns.m_columns[i]] = stat->GetUnits(chan).PrettyPrint(value);
 		}
 	}
 

diff --git a/glscopeclient/styles/glscopeclient.css b/glscopeclient/styles/glscopeclient.css
@@ -39,6 +39,7 @@ entry:focus
 	background-image:	none;
 	background-color:	@glscopeclient_bg_color;
 	color:				@glscopeclient_text_color;
+	caret-color:		@glscopeclient_text_color;
 }
 
 entry:disabled