mirror
/
DSRemote
kopia lustrzana https://gitlab.com/Teuniz/DSRemote
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Work in progress.

merge-requests/1/head
Teuniz 2015-06-13 11:51:32 +02:00
rodzic 9d0d0134a5
commit eff500f092
4 zmienionych plików z 11 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
global.h
Wyświetl plik

@ -31,7 +31,7 @@
#define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.11_1506131008"
#define PROGRAM_VERSION "0.11_1506131150"
#define MAX_PATHLEN 4096

2
mainwindow.cpp
Wyświetl plik

@ -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)));

5
mainwindow.h
Wyświetl plik

@ -126,10 +126,7 @@ private:
QStatusBar *statusBar;
QVBoxLayout *vlayout1;
QLabel *mainLabel,
*adjDialLabel,
QLabel *adjDialLabel,
*horScaleLabel,
*horPosLabel,
*vertScaleLabel,

15
mainwindow_constr.cpp
Wyświetl plik

@ -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);