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: 6bbaf39a733b
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: 15ff6dba3212
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 28, 2020

  1. Fixes to legacy file format loading

    @azonenberg
    azonenberg committed Nov 28, 2020
    Copy the full SHA
    15ff6db View commit details
Showing with 5 additions and 17 deletions.
  1. +1 −1 lib
  2. +3 −14 src/glscopeclient/OscilloscopeWindow.cpp
  3. +0 −1 src/glscopeclient/OscilloscopeWindow.h
  4. +1 −1 src/glscopeclient/WaveformGroup.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 1 files
+4 −1 scopeprotocols/JitterSpectrumFilter.cpp
17 changes: 3 additions & 14 deletions src/glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -1019,7 +1019,6 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
datadir,
scope_id,
waveform_id,
timebase_is_ps,
channel_progress + i,
channel_done + i
));
@@ -1089,7 +1088,6 @@ void OscilloscopeWindow::DoLoadWaveformDataForScope(
string datadir,
int scope_id,
int waveform_id,
bool timebase_is_ps,
volatile float* progress,
volatile int* done
)
@@ -1168,17 +1166,8 @@ void OscilloscopeWindow::DoLoadWaveformDataForScope(
//Read start time and duration
int64_t* stime = reinterpret_cast<int64_t*>(buf+offset);
offset += 2*sizeof(int64_t);

if(timebase_is_ps)
{
cap->m_offsets[j] = stime[0] * 1000;
cap->m_durations[j] = stime[1] * 1000;
}
else
{
cap->m_offsets[j] = stime[0];
cap->m_durations[j] = stime[1];
}
cap->m_offsets[j] = stime[0];
cap->m_durations[j] = stime[1];

//Read sample data
if(acap)
@@ -1420,7 +1409,7 @@ void OscilloscopeWindow::LoadUIConfiguration(const YAML::Node& node, IDTable& ta

if(timestamps_are_ps)
{
group->m_pixelsPerXUnit *= 1000;
group->m_pixelsPerXUnit /= 1000;
group->m_xAxisOffset *= 1000;
group->m_xCursorPos[0] *= 1000;
group->m_xCursorPos[1] *= 1000;
1 change: 0 additions & 1 deletion src/glscopeclient/OscilloscopeWindow.h
View file
Original file line number Diff line number Diff line change
@@ -255,7 +255,6 @@ class OscilloscopeWindow : public Gtk::Window
std::string datadir,
int scope_id,
int waveform_id,
bool timebase_is_ps,
volatile float* progress,
volatile int* done
);
2 changes: 1 addition & 1 deletion src/glscopeclient/WaveformGroup.cpp
View file
Original file line number Diff line number Diff line change
@@ -252,7 +252,7 @@ string WaveformGroup::SerializeConfiguration(IDTable& table)

snprintf(tmp, sizeof(tmp), " timebaseResolution: fs\n");
config += tmp;
snprintf(tmp, sizeof(tmp), " pixelsPerXUnit: %f\n", m_pixelsPerXUnit);
snprintf(tmp, sizeof(tmp), " pixelsPerXUnit: %e\n", m_pixelsPerXUnit);
config += tmp;
snprintf(tmp, sizeof(tmp), " xAxisOffset: %ld\n", m_xAxisOffset);
config += tmp;