mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Renamed Ui::GLScopeNGGUI to Ui::GLScopeGUI

pull/228/head
f4exb 2018-08-12 16:42:38 +02:00
rodzic 3463efc37e
commit b1b79ecc38
3 zmienionych plików z 14 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
sdrgui/gui/glscopenggui.cpp
Wyświetl plik

@ -36,7 +36,7 @@ const double GLScopeNGGUI::amps[27] = {
GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) : GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::GLScopeNGGUI), ui(new Ui::GLScopeGUI),
m_messageQueue(0), m_messageQueue(0),
m_scopeVis(0), m_scopeVis(0),
m_glScope(0), m_glScope(0),
@ -1350,7 +1350,7 @@ bool GLScopeNGGUI::handleMessage(Message* message __attribute__((unused)))
return false; return false;
} }
GLScopeNGGUI::TrigUIBlocker::TrigUIBlocker(Ui::GLScopeNGGUI *ui) : GLScopeNGGUI::TrigUIBlocker::TrigUIBlocker(Ui::GLScopeGUI *ui) :
m_ui(ui) m_ui(ui)
{ {
m_oldStateTrigMode = ui->trigMode->blockSignals(true); m_oldStateTrigMode = ui->trigMode->blockSignals(true);
@ -1382,7 +1382,7 @@ void GLScopeNGGUI::TrigUIBlocker::unBlock()
m_ui->trigDelayFine->blockSignals(m_oldStateTrigDelayFine); m_ui->trigDelayFine->blockSignals(m_oldStateTrigDelayFine);
} }
GLScopeNGGUI::TraceUIBlocker::TraceUIBlocker(Ui::GLScopeNGGUI* ui) : GLScopeNGGUI::TraceUIBlocker::TraceUIBlocker(Ui::GLScopeGUI* ui) :
m_ui(ui) m_ui(ui)
{ {
m_oldStateTrace = m_ui->trace->blockSignals(true); m_oldStateTrace = m_ui->trace->blockSignals(true);
@ -1416,7 +1416,7 @@ void GLScopeNGGUI::TraceUIBlocker::unBlock()
m_ui->traceColor->blockSignals(m_oldStateTraceColor); m_ui->traceColor->blockSignals(m_oldStateTraceColor);
} }
GLScopeNGGUI::MainUIBlocker::MainUIBlocker(Ui::GLScopeNGGUI* ui) : GLScopeNGGUI::MainUIBlocker::MainUIBlocker(Ui::GLScopeGUI* ui) :
m_ui(ui) m_ui(ui)
{ {
m_oldStateOnlyX = m_ui->onlyX->blockSignals(true); m_oldStateOnlyX = m_ui->onlyX->blockSignals(true);

16
sdrgui/gui/glscopenggui.h
Wyświetl plik

@ -28,7 +28,7 @@
#include "settings/serializable.h" #include "settings/serializable.h"
namespace Ui { namespace Ui {
class GLScopeNGGUI; class GLScopeGUI;
} }
class MessageQueue; class MessageQueue;
@ -80,13 +80,13 @@ private:
class TrigUIBlocker class TrigUIBlocker
{ {
public: public:
TrigUIBlocker(Ui::GLScopeNGGUI *ui); TrigUIBlocker(Ui::GLScopeGUI *ui);
~TrigUIBlocker(); ~TrigUIBlocker();
void unBlock(); void unBlock();
private: private:
Ui::GLScopeNGGUI *m_ui; Ui::GLScopeGUI *m_ui;
bool m_oldStateTrigMode; bool m_oldStateTrigMode;
bool m_oldStateTrigCount; bool m_oldStateTrigCount;
bool m_oldStateTrigPos; bool m_oldStateTrigPos;
@ -101,13 +101,13 @@ private:
class TraceUIBlocker class TraceUIBlocker
{ {
public: public:
TraceUIBlocker(Ui::GLScopeNGGUI *ui); TraceUIBlocker(Ui::GLScopeGUI *ui);
~TraceUIBlocker(); ~TraceUIBlocker();
void unBlock(); void unBlock();
private: private:
Ui::GLScopeNGGUI *m_ui; Ui::GLScopeGUI *m_ui;
bool m_oldStateTrace; bool m_oldStateTrace;
bool m_oldStateTraceAdd; bool m_oldStateTraceAdd;
bool m_oldStateTraceDel; bool m_oldStateTraceDel;
@ -123,13 +123,13 @@ private:
class MainUIBlocker class MainUIBlocker
{ {
public: public:
MainUIBlocker(Ui::GLScopeNGGUI *ui); MainUIBlocker(Ui::GLScopeGUI *ui);
~MainUIBlocker(); ~MainUIBlocker();
void unBlock(); void unBlock();
private: private:
Ui::GLScopeNGGUI *m_ui; Ui::GLScopeGUI *m_ui;
bool m_oldStateOnlyX; bool m_oldStateOnlyX;
bool m_oldStateOnlyY; bool m_oldStateOnlyY;
bool m_oldStateHorizontalXY; bool m_oldStateHorizontalXY;
@ -140,7 +140,7 @@ private:
// bool m_oldStateTraceLen; // bool m_oldStateTraceLen;
}; };
Ui::GLScopeNGGUI* ui; Ui::GLScopeGUI* ui;
MessageQueue* m_messageQueue; MessageQueue* m_messageQueue;
ScopeVisNG* m_scopeVis; ScopeVisNG* m_scopeVis;

4
sdrgui/gui/glscopenggui.ui
Wyświetl plik

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>GLScopeNGGUI</class> <class>GLScopeGUI</class>
<widget class="QWidget" name="GLScopeNGGUI"> <widget class="QWidget" name="GLScopeGUI">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>