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

Added keyboard shortcut to toggle FFT.

merge-requests/1/head
Teuniz 2016-02-06 14:15:44 +01:00
rodzic 9f8732bbf6
commit 28c8ca9ec2
6 zmienionych plików z 11 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
global.h
Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.32_1602011306"
#define PROGRAM_VERSION "0.32_1602061414"
#define MAX_PATHLEN 4096

1
interface.cpp
Wyświetl plik

@ -1856,6 +1856,7 @@ void UI_Mainwindow::show_howto_operate()
"Decrease vertical scale: +\n"
"Press '1' to select or deselect channel 1\n"
"Press '2' to select or deselect channel 2, etc.\n"
"Press 'f' to toggle FFT.\n"
);
msgBox.exec();

2
mainwindow.cpp
Wyświetl plik

@ -347,6 +347,7 @@ void UI_Mainwindow::open_connection()
connect(select_chan2_act, SIGNAL(triggered()), this, SLOT(ch2ButtonClicked()));
connect(select_chan3_act, SIGNAL(triggered()), this, SLOT(ch3ButtonClicked()));
connect(select_chan4_act, SIGNAL(triggered()), this, SLOT(ch4ButtonClicked()));
connect(toggle_fft_act, SIGNAL(triggered()), this, SLOT(toggle_fft()));
connect(horPosDial, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(horPosDialClicked(QPoint)));
connect(vertOffsetDial, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(vertOffsetDialClicked(QPoint)));
@ -466,6 +467,7 @@ void UI_Mainwindow::close_connection()
disconnect(select_chan2_act, SIGNAL(triggered()), this, SLOT(ch2ButtonClicked()));
disconnect(select_chan3_act, SIGNAL(triggered()), this, SLOT(ch3ButtonClicked()));
disconnect(select_chan4_act, SIGNAL(triggered()), this, SLOT(ch4ButtonClicked()));
disconnect(toggle_fft_act, SIGNAL(triggered()), this, SLOT(toggle_fft()));
disconnect(horPosDial, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(horPosDialClicked(QPoint)));
disconnect(vertOffsetDial, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(vertOffsetDialClicked(QPoint)));

3
mainwindow.h
Wyświetl plik

@ -214,7 +214,8 @@ private:
*select_chan1_act,
*select_chan2_act,
*select_chan3_act,
*select_chan4_act;
*select_chan4_act,
*toggle_fft_act;
struct tmcdev *device;

4
mainwindow_constr.cpp
Wyświetl plik

@ -462,6 +462,10 @@ UI_Mainwindow::UI_Mainwindow()
select_chan4_act->setShortcut(QKeySequence("4"));
addAction(select_chan4_act);
toggle_fft_act = new QAction(this);
toggle_fft_act->setShortcut(QKeySequence("f"));
addAction(toggle_fft_act);
DPRwidget->setEnabled(false);
recent_dir[0] = 0;

4
signalcurve.cpp
Wyświetl plik

@ -1207,9 +1207,7 @@ void SignalCurve::drawfpsLabel(QPainter *painter, int xpos, int ypos)
painter->drawText(xpos, ypos, str);
tp2.tv_sec = tp1.tv_sec;
tp2.tv_nsec = tp1.tv_nsec;
tp2 = tp1;
}