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: 6c1977a26fe6
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: 909b6280b8b5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 24, 2020

  1. OscilloscopeWindow: added menu items for file load/save (no logic bac… 

    …king them yet). See #3.
    @azonenberg
    azonenberg committed Feb 24, 2020
    Copy the full SHA
    909b628 View commit details
Showing with 19 additions and 9 deletions.
  1. +19 −9 glscopeclient/OscilloscopeWindow.cpp
28 changes: 19 additions & 9 deletions glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -130,7 +130,25 @@ void OscilloscopeWindow::CreateWidgets()
m_menu.append(m_fileMenuItem);
m_fileMenuItem.set_label("File");
m_fileMenuItem.set_submenu(m_fileMenu);
auto item = Gtk::manage(new Gtk::MenuItem("Quit", false));
Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem("Save Layout Only", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Save Layout Only As...", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Save Layout and Waveforms", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Save Layout and Waveforms As...", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::SeparatorMenuItem);
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Load Layout Only...", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Load Waveforms Only...", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Load Layout and Waveforms...", false));
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::SeparatorMenuItem);
m_fileMenu.append(*item);
item = Gtk::manage(new Gtk::MenuItem("Quit", false));
item->signal_activate().connect(
sigc::mem_fun(*this, &OscilloscopeWindow::OnQuit));
m_fileMenu.append(*item);
@@ -635,14 +653,6 @@ void OscilloscopeWindow::OnRemoveChannel(WaveformArea* w)

void OscilloscopeWindow::PollScopes()
{
static double tstamp = 0;
static bool first = true;
if(first)
{
tstamp = GetTime();
first = false;
}

bool pending = true;
while(pending)
{