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: 4c52a5e5cad2
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: 66eda6f91a4f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 10, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    66eda6f View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 glscopeclient/InstrumentConnectionDialog.cpp
5 changes: 5 additions & 0 deletions glscopeclient/InstrumentConnectionDialog.cpp
Original file line number Diff line number Diff line change
@@ -56,6 +56,7 @@ InstrumentConnectionDialog::InstrumentConnectionDialog()
m_grid.attach(m_nicknameLabel, 0, 0, 1, 1);
m_nicknameLabel.set_text("Nickname");
m_grid.attach_next_to(m_nicknameEntry, m_nicknameLabel, Gtk::POS_RIGHT, 1, 1);
m_nicknameEntry.set_text("scope");

m_grid.attach_next_to(m_driverLabel, m_nicknameLabel, Gtk::POS_BOTTOM, 1, 1);
m_driverLabel.set_text("Driver");
@@ -94,6 +95,10 @@ InstrumentConnectionDialog::~InstrumentConnectionDialog()

string InstrumentConnectionDialog::GetConnectionString()
{
//If no nickname is specified, assign a default
if(m_nicknameEntry.get_text() == "")
m_nicknameEntry.set_text("scope");

char tmp[256];
snprintf(tmp, sizeof(tmp), "%s:%s:%s:%s",
m_nicknameEntry.get_text().c_str(),