ngscopeclient · May 13, 2021
diff --git a/lib b/lib
diff --git a/src/glscopeclient/ProtocolAnalyzerWindow.cpp b/src/glscopeclient/ProtocolAnalyzerWindow.cpp
@@ -366,6 +366,7 @@ ProtocolAnalyzerColumns::ProtocolAnalyzerColumns(PacketDecoder* decoder)
 	add(m_timestamp);
 	add(m_capturekey);
 	add(m_offset);
+	add(m_len);
 
 	auto headers = decoder->GetHeaders();
 	for(size_t i=0; i<headers.size(); i++)
@@ -615,6 +616,7 @@ void ProtocolAnalyzerWindow::FillOutRow(
 	row[m_columns.m_timestamp] = stime;
 	row[m_columns.m_capturekey] = TimePoint(data->m_startTimestamp, data->m_startFemtoseconds);
 	row[m_columns.m_offset] = p->m_offset;
+	row[m_columns.m_len] = p->m_len;
 
 	//Just copy headers without any processing
 	for(size_t i=0; i<headers.size(); i++)
@@ -708,7 +710,7 @@ void ProtocolAnalyzerWindow::OnSelectionChanged()
 	m_parent->JumpToHistory(row[m_columns.m_capturekey]);
 
 	//Set the offset of the decoder's group
-	m_area->CenterTimestamp(row[m_columns.m_offset]);
+	m_area->CenterPacket(row[m_columns.m_offset], row[m_columns.m_len]);
 	m_area->m_group->m_frame.queue_draw();
 }
 

diff --git a/src/glscopeclient/ProtocolAnalyzerWindow.h b/src/glscopeclient/ProtocolAnalyzerWindow.h
@@ -47,6 +47,7 @@ class ProtocolTreeRow
 	std::string m_timestamp;
 	TimePoint m_capturekey;
 	int64_t m_offset;
+	int64_t m_len;
 	std::vector<std::string> m_headers;
 	std::string m_data;
 	Glib::RefPtr<Gdk::Pixbuf> m_image;
@@ -117,6 +118,7 @@ class ProtocolAnalyzerColumns : public Gtk::TreeModel::ColumnRecord
 	Gtk::TreeModelColumn<Glib::ustring>					m_timestamp;
 	Gtk::TreeModelColumn<TimePoint>						m_capturekey;
 	Gtk::TreeModelColumn<int64_t>						m_offset;
+	Gtk::TreeModelColumn<int64_t>						m_len;
 	std::vector< Gtk::TreeModelColumn<Glib::ustring> >	m_headers;
 	Gtk::TreeModelColumn<Glib::ustring>					m_data;
 	Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>>		m_image;

diff --git a/src/glscopeclient/ProtocolTreeModel.cpp b/src/glscopeclient/ProtocolTreeModel.cpp
@@ -42,7 +42,7 @@ ProtocolTreeModel::ProtocolTreeModel(const Gtk::TreeModelColumnRecord& columns)
 	 , Gtk::TreeModel()
 	 , m_columns(columns)
 {
-	m_nheaders = columns.size() - 9;
+	m_nheaders = columns.size() - 10;
 }
 
 Glib::RefPtr<ProtocolTreeModel> ProtocolTreeModel::create(const Gtk::TreeModelColumnRecord& columns)
@@ -341,10 +341,14 @@ void ProtocolTreeModel::set_value_impl(const iterator& row, int column, const Gl
 			p->m_offset = reinterpret_cast<const Gtk::TreeModelColumn<int64_t>::ValueType&>(value).get();
 			break;
 
+		case 7:
+			p->m_len = reinterpret_cast<const Gtk::TreeModelColumn<int64_t>::ValueType&>(value).get();
+			break;
+
 		//header, image, or data
 		default:
 			{
-				int ihead = column - 7;
+				int ihead = column - 8;
 				if(ihead < m_nheaders)
 				{
 					p->m_headers.resize(m_nheaders);
@@ -397,10 +401,14 @@ void ProtocolTreeModel::get_value_vfunc(const TreeModel::iterator& iter, int col
 			reinterpret_cast<Gtk::TreeModelColumn<int64_t>::ValueType&>(value).set(p->m_offset);
 			break;
 
+		case 7:
+			reinterpret_cast<Gtk::TreeModelColumn<int64_t>::ValueType&>(value).set(p->m_len);
+			break;
+
 		//header, image, or data
 		default:
 			{
-				int ihead = column - 7;
+				int ihead = column - 8;
 				if(ihead < m_nheaders)
 					reinterpret_cast<Gtk::TreeModelColumn<std::string>::ValueType&>(value).set(p->m_headers[ihead]);
 				else if(ihead == m_nheaders)

diff --git a/src/glscopeclient/WaveformArea.h b/src/glscopeclient/WaveformArea.h
@@ -197,7 +197,7 @@ class WaveformArea : public Gtk::GLArea
 	void UnmapAllBuffers(bool update_y);
 	void CalculateOverlayPositions();
 
-	void CenterTimestamp(int64_t time);
+	void CenterPacket(int64_t time, int64_t len);
 
 	static bool IsGLInitComplete()
 	{ return m_isGlewInitialized; }

diff --git a/src/glscopeclient/WaveformArea_events.cpp b/src/glscopeclient/WaveformArea_events.cpp
@@ -1586,11 +1586,20 @@ void WaveformArea::OnStatistics()
 		m_group->ToggleOff(m_selectedChannel.m_channel);
 }
 
-void WaveformArea::CenterTimestamp(int64_t time)
+void WaveformArea::CenterPacket(int64_t time, int64_t len)
 {
-	//Figure out how wide our view is, then offset the point by half that
+	//Figure out the width of the view, in time units
 	int64_t width = PixelsToXAxisUnits(m_width);
-	m_group->m_xAxisOffset = time - width/2;
+
+	//If the packet is too long to fit on screen at the current zoom, have it start 10% of the way across
+	if(len > width)
+		m_group->m_xAxisOffset = time - width*0.1;
+
+	//If the entire packet fits, center it
+	else
+		m_group->m_xAxisOffset = time - width/2 + len/2;
+
+	//Redraw everything
 	m_parent->ClearPersistence(m_group, false, true);
 
 	//If we have a single X cursor, move it to this point too
+117 −44		scopeprotocols/MilStd1553Decoder.cpp
+3 −1		scopeprotocols/MilStd1553Decoder.h