Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 54748364658d
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19e8b03db98f
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Sep 7, 2020

  1. Copy the full SHA
    19e8b03 View commit details
Showing with 15 additions and 1 deletion.
  1. +1 −1 lib
  2. +13 −0 src/glscopeclient/ProtocolAnalyzerWindow.cpp
  3. +1 −0 src/glscopeclient/ProtocolAnalyzerWindow.h
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 7f6da2 to 6b8456
13 changes: 13 additions & 0 deletions src/glscopeclient/ProtocolAnalyzerWindow.cpp
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ ProtocolAnalyzerColumns::ProtocolAnalyzerColumns(PacketDecoder* decoder)

add(m_image);
add(m_data);
add(m_color);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -97,6 +98,17 @@ ProtocolAnalyzerWindow::ProtocolAnalyzerWindow(
if(decoder->GetShowDataColumn())
m_tree.append_column("Data", m_columns.m_data);

//Set background color
int ncols = headers.size() + 2;
int ncolorcol = m_columns.size() - 1;
for(int col=0; col<ncols; col ++)
{
auto pcol = m_tree.get_column(col);
vector<Gtk::CellRenderer*> cells = pcol->get_cells();
for(auto c : cells)
pcol->add_attribute(*c, "background-gdk", ncolorcol);
}

m_tree.get_selection()->signal_changed().connect(
sigc::mem_fun(*this, &ProtocolAnalyzerWindow::OnSelectionChanged));

@@ -200,6 +212,7 @@ void ProtocolAnalyzerWindow::FillOutRow(
stime += tmp;

//Create the row
row[m_columns.m_color] = p->m_displayBackgroundColor;
row[m_columns.m_timestamp] = stime;
row[m_columns.m_capturekey] = TimePoint(data->m_startTimestamp, data->m_startPicoseconds);
row[m_columns.m_offset] = p->m_offset;
1 change: 1 addition & 0 deletions src/glscopeclient/ProtocolAnalyzerWindow.h
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ class ProtocolAnalyzerColumns : public Gtk::TreeModel::ColumnRecord
std::vector< Gtk::TreeModelColumn<Glib::ustring> > m_headers;
Gtk::TreeModelColumn<Glib::ustring> m_data;
Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> m_image;
Gtk::TreeModelColumn<Gdk::Color> m_color;
};

/**