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: 98dca77775aa
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: 628cbf600822
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 18, 2020

  1. Copy the full SHA
    628cbf6 View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 src/glscopeclient/HistoryWindow.cpp
  2. +1 −1 src/glscopeclient/ProtocolAnalyzerWindow.cpp
  3. +4 −4 src/glscopeclient/TriggerPropertiesDialog.cpp
2 changes: 1 addition & 1 deletion src/glscopeclient/HistoryWindow.cpp
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ void HistoryWindow::OnWaveformDataReady()
//round to nearest 100ps for display
strftime(tmp, sizeof(tmp), "%H:%M:%S.", &ltime);
string stime = tmp;
snprintf(tmp, sizeof(tmp), "%010zd", static_cast<size_t>(data->m_startPicoseconds / 100));
snprintf(tmp, sizeof(tmp), "%010zu", static_cast<size_t>(data->m_startPicoseconds / 100));
stime += tmp;

//Create the row
2 changes: 1 addition & 1 deletion src/glscopeclient/ProtocolAnalyzerWindow.cpp
Original file line number Diff line number Diff line change
@@ -586,7 +586,7 @@ void ProtocolAnalyzerWindow::FillOutRow(
char tmp[128];
strftime(tmp, sizeof(tmp), "%H:%M:%S.", localtime(&capstart));
string stime = tmp;
snprintf(tmp, sizeof(tmp), "%010zu", ps / 100); //round to nearest 100ps for display
snprintf(tmp, sizeof(tmp), "%010zu", static_cast<size_t>(ps / 100)); //round to nearest 100ps for display
stime += tmp;

//Create the row
8 changes: 4 additions & 4 deletions src/glscopeclient/TriggerPropertiesDialog.cpp
Original file line number Diff line number Diff line change
@@ -148,7 +148,10 @@ void TriggerPropertiesDialog::OnTriggerTypeChanged()

//If it's the same trigger type currently set on the scope, load UI with those settings
auto current_trig = m_scope->GetTrigger();
if((current_trig != NULL) && (current_trig->GetTriggerDisplayName() == type) )
if(current_trig == NULL)
return;

if(current_trig->GetTriggerDisplayName() == type)
AddRows(current_trig);

//Nope, create a new trigger
@@ -177,10 +180,7 @@ void TriggerPropertiesDialog::AddRows(Trigger* trig)
if(last_label)
m_contentGrid.attach_next_to(row->m_label, *last_label, Gtk::POS_BOTTOM, 1, 1);
else
{
m_contentGrid.attach(row->m_label, 0, 0, 1, 1);
last_label = &row->m_label;
}
m_contentGrid.attach_next_to(row->m_chans, row->m_label, Gtk::POS_RIGHT, 1, 1);
m_rows.push_back(row);
last_label = &row->m_label;