diff --git a/global.h b/global.h index d84d6ce..3910812 100644 --- a/global.h +++ b/global.h @@ -31,7 +31,7 @@ #define PROGRAM_NAME "DSRemote" -#define PROGRAM_VERSION "0.11_1506131008" +#define PROGRAM_VERSION "0.11_1506131150" #define MAX_PATHLEN 4096 diff --git a/mainwindow.cpp b/mainwindow.cpp index 85f97b6..a82398e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -296,6 +296,8 @@ void UI_Mainwindow::close_connection() setWindowTitle(PROGRAM_NAME " " PROGRAM_VERSION); + strcpy(devparms.modelname, "-----"); + disconnect(adjDial, SIGNAL(valueChanged(int)), this, SLOT(adjDialChanged(int))); disconnect(trigAdjustDial, SIGNAL(valueChanged(int)), this, SLOT(trigAdjustDialChanged(int))); disconnect(horScaleDial, SIGNAL(valueChanged(int)), this, SLOT(horScaleDialChanged(int))); diff --git a/mainwindow.h b/mainwindow.h index 777b4fa..2675649 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -126,10 +126,7 @@ private: QStatusBar *statusBar; - QVBoxLayout *vlayout1; - - QLabel *mainLabel, - *adjDialLabel, + QLabel *adjDialLabel, *horScaleLabel, *horPosLabel, *vertScaleLabel, diff --git a/mainwindow_constr.cpp b/mainwindow_constr.cpp index 0cf68f5..df8bfc7 100644 --- a/mainwindow_constr.cpp +++ b/mainwindow_constr.cpp @@ -63,19 +63,23 @@ UI_Mainwindow::UI_Mainwindow() for(i=0; i< MAX_CHNS; i++) { devparms.wavebuf[i] = (short *)malloc(WAVFRM_MAX_BUFSZ); + + devparms.chanscale[i] = 1; } devparms.displaygrid = 2; devparms.channel_cnt = 4; - devparms.timebasescale = 1; + devparms.timebasescale = 0.001; devparms.hordivisions = 14; + strcpy(devparms.modelname, "-----"); + menubar = menuBar(); - devicemenu = new QMenu; + devicemenu = new QMenu(this); devicemenu->setTitle("Device"); devicemenu->addAction("Connect", this, SLOT(open_connection())); devicemenu->addAction("Disconnect", this, SLOT(close_connection())); @@ -84,7 +88,7 @@ UI_Mainwindow::UI_Mainwindow() menubar->addAction("Settings", this, SLOT(open_settings_dialog())); - helpmenu = new QMenu; + helpmenu = new QMenu(this); helpmenu->setTitle("Help"); helpmenu->addAction("How to operate", this, SLOT(helpButtonClicked())); helpmenu->addAction("About", this, SLOT(show_about_dialog())); @@ -92,11 +96,6 @@ UI_Mainwindow::UI_Mainwindow() statusLabel = new QLabel; - mainLabel = new QLabel(); - - vlayout1 = new QVBoxLayout; - vlayout1->addWidget(mainLabel); - waveForm = new SignalCurve(this); waveForm->setBackgroundColor(Qt::black); waveForm->setSignalColor1(Qt::yellow);