ProtocolAnalyzerDialog: display improvements for marker text when no data column is visible. Fixes #926.

Author: azonenberg

lib

@@ -6,6 +6,7 @@ This is a running list of significant bug fixes and new features since the last
 
 * ThunderScope: updates for SCPI / binary waveform format API changes in TS.NET
 * SiniLink: Added driver for ModBus control of XYS3580 and related PSUs (https://github.com/ngscopeclient/scopehal/pull/1003)
+* 8B/10B decode now tries more aggressively to recover comma sync after bitslipping when decoding jittery or noisy data, rather than giving decode errors for the remainder of the waveform (https://github.com/ngscopeclient/scopehal/issues/1025)
 
 ## Bugs fixed since v0.1
 
@@ -18,8 +19,10 @@ This is a running list of significant bug fixes and new features since the last
 * ThunderScope: trigger position would occasionally be corrupted and get stuck at -9223 seconds (no github ticket)
 * Typing a new trigger position into the text box in the trigger properties dialog does not actually change the trigger position in hardware (no github ticket)
 * Protocol analyzer dialogs still show the old title if a filter is renamed (https://github.com/ngscopeclient/scopehal-apps/issues/923)
+* PCIe link training decode got confused if the waveform started with the link in L0 then it dropped (https://github.com/ngscopeclient/scopehal/issues/1024)
 
 ## Other changes since v0.1
 
 * Updated to latest upstream imgui (1.92.4 WIP)
 * Unit tests now use FFTW instead of FFTS because FFTS had portability issues and a GPL dependency is fine for unit tests we don't redistribute (https://github.com/ngscopeclient/scopehal/issues/757)
+* Protocol analyzer now displays marker text in the rightmost column if there is no hexdump column, and stretches the column width to leave room for text (https://github.com/ngscopeclient/scopehal/issues/926) rather than defaulting to the leftmost which might be too small to read clearly

release-notes/CHANGELOG.md

@@ -188,14 +188,26 @@ bool ProtocolAnalyzerDialog::DoRender()
 	auto& rows = m_mgr->GetRows();
 
 	m_firstDataBlockOfFrame = true;
+	int lastTextColumn = 0;
 	if(!rows.empty() && ImGui::BeginTable("table", ncols, flags))
 	{
 		ImGui::TableSetupScrollFreeze(0, 1); //Header row does not scroll
 		ImGui::TableSetupColumn("Timestamp", ImGuiTableColumnFlags_WidthFixed, 12*width);
-		for(auto c : cols)
-			ImGui::TableSetupColumn(c.c_str(), ImGuiTableColumnFlags_WidthFixed, 0.0f);
+		for(size_t i=0; i<cols.size(); i++)
+		{
+			//Stretch the last text column if we have no data column
+			if( (i == (cols.size() - 1)) && !m_filter->GetShowDataColumn() )
+				ImGui::TableSetupColumn(cols[i].c_str(), ImGuiTableColumnFlags_WidthStretch, 0.0f);
+			else
+				ImGui::TableSetupColumn(cols[i].c_str(), ImGuiTableColumnFlags_WidthFixed, 0.0f);
+
+			lastTextColumn ++;
+		}
 		if(m_filter->GetShowDataColumn())
+		{
 			ImGui::TableSetupColumn("Data", ImGuiTableColumnFlags_WidthStretch, 0.0f);
+			lastTextColumn ++;
+		}
 		if(m_filter->GetShowImageColumn())
 			ImGui::TableSetupColumn("Image", ImGuiTableColumnFlags_WidthFixed, 0.0f);
 		ImGui::TableHeadersRow();
@@ -381,26 +393,12 @@ bool ProtocolAnalyzerDialog::DoRender()
 				//Marker name
 				else
 				{
-					//TODO: which column to use for marker text??)
-					if(m_filter->GetShowDataColumn())
+					//Use the rightmost text column (not the image column, if present) for marker text
+					if(ImGui::TableSetColumnIndex(lastTextColumn))
 					{
-						if(ImGui::TableSetColumnIndex(datacol))
-						{
-							if(firstRow)
-								ImGui::SetCursorPosY(ImGui::GetCursorPosY() - (ImGui::GetScrollY() - rowStart));
-							ImGui::TextUnformatted(row.m_marker.m_name.c_str());
-						}
-					}
-
-					//if no data column, use first column whatever it is
-					else
-					{
-						if(ImGui::TableSetColumnIndex(1))
-						{
-							if(firstRow)
-								ImGui::SetCursorPosY(ImGui::GetCursorPosY() - (ImGui::GetScrollY() - rowStart));
-							ImGui::TextUnformatted(row.m_marker.m_name.c_str());
-						}
+						if(firstRow)
+							ImGui::SetCursorPosY(ImGui::GetCursorPosY() - (ImGui::GetScrollY() - rowStart));
+						ImGui::TextUnformatted(row.m_marker.m_name.c_str());
 					}
 				}