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

DATV demod: GUI cosmetic changes

pull/326/head
f4exb 2019-03-23 10:51:01 +01:00
rodzic af181914e1
commit 2d9715fbb6
4 zmienionych plików z 17 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
plugins/channelrx/demoddatv/datvdemodgui.cpp
Wyświetl plik

@ -160,7 +160,6 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
m_intLastDecodedData=0; m_intLastDecodedData=0;
m_intLastSpeed=0; m_intLastSpeed=0;
m_intReadyDecodedData=0; m_intReadyDecodedData=0;
m_blnButtonPlayClicked=false;
m_objTimer.setInterval(1000); m_objTimer.setInterval(1000);
connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick())); connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick()));
m_objTimer.start(); m_objTimer.start();
@ -557,7 +556,7 @@ void DATVDemodGUI::on_chkHardMetric_clicked()
applySettings(); applySettings();
} }
void DATVDemodGUI::on_pushButton_2_clicked() void DATVDemodGUI::on_resetDefaults_clicked()
{ {
resetToDefaults(); resetToDefaults();
} }
@ -579,22 +578,9 @@ void DATVDemodGUI::on_chkAllowDrift_clicked()
applySettings(); applySettings();
} }
void DATVDemodGUI::on_pushButton_3_clicked() void DATVDemodGUI::on_fullScreen_clicked()
{
m_blnButtonPlayClicked=true;
if(m_objDATVDemod!=nullptr)
{
m_objDATVDemod->PlayVideo(true);
}
}
void DATVDemodGUI::on_pushButton_4_clicked()
{ {
ui->screenTV_2->SetFullScreen(true); ui->screenTV_2->SetFullScreen(true);
} }
void DATVDemodGUI::on_mouseEvent(QMouseEvent* obj) void DATVDemodGUI::on_mouseEvent(QMouseEvent* obj)
@ -705,8 +691,8 @@ void DATVDemodGUI::displayRRCParameters(bool blnVisible)
{ {
ui->spiRollOff->setVisible(blnVisible); ui->spiRollOff->setVisible(blnVisible);
ui->spiExcursion->setVisible(blnVisible); ui->spiExcursion->setVisible(blnVisible);
ui->label_5->setVisible(blnVisible); ui->rollOffLabel->setVisible(blnVisible);
ui->label_6->setVisible(blnVisible); ui->excursionLabel->setVisible(blnVisible);
} }
void DATVDemodGUI::on_cmbFilter_currentIndexChanged(int index) void DATVDemodGUI::on_cmbFilter_currentIndexChanged(int index)

5
plugins/channelrx/demoddatv/datvdemodgui.h
Wyświetl plik

@ -76,12 +76,11 @@ private slots:
void on_cmbFEC_currentIndexChanged(const QString &arg1); void on_cmbFEC_currentIndexChanged(const QString &arg1);
void on_chkViterbi_clicked(); void on_chkViterbi_clicked();
void on_chkHardMetric_clicked(); void on_chkHardMetric_clicked();
void on_pushButton_2_clicked(); void on_resetDefaults_clicked();
void on_spiSymbolRate_valueChanged(int arg1); void on_spiSymbolRate_valueChanged(int arg1);
void on_spiNotchFilters_valueChanged(int arg1); void on_spiNotchFilters_valueChanged(int arg1);
void on_chkAllowDrift_clicked(); void on_chkAllowDrift_clicked();
void on_pushButton_3_clicked(); void on_fullScreen_clicked();
void on_pushButton_4_clicked();
void on_mouseEvent(QMouseEvent* obj); void on_mouseEvent(QMouseEvent* obj);
void on_StreamDataAvailable(int *intPackets, int *intBytes, int *intPercent, qint64 *intTotalReceived); void on_StreamDataAvailable(int *intPackets, int *intBytes, int *intPercent, qint64 *intTotalReceived);
void on_StreamMetaDataChanged(DataTSMetaData2 *objMetaData); void on_StreamMetaDataChanged(DataTSMetaData2 *objMetaData);

15
plugins/channelrx/demoddatv/datvdemodgui.ui
Wyświetl plik

@ -454,7 +454,7 @@
<string>HARD METRIC</string> <string>HARD METRIC</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label"> <widget class="QLabel" name="sSecLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>100</x> <x>100</x>
@ -499,7 +499,7 @@
<number>32</number> <number>32</number>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="notchFilterLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>100</x> <x>100</x>
@ -544,7 +544,7 @@
<string>Data: 0</string> <string>Data: 0</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="pushButton_2"> <widget class="QPushButton" name="resetDefaults">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>230</x> <x>230</x>
@ -553,6 +553,9 @@
<height>22</height> <height>22</height>
</rect> </rect>
</property> </property>
<property name="toolTip">
<string>Reset to defaults</string>
</property>
<property name="text"> <property name="text">
<string>R</string> <string>R</string>
</property> </property>
@ -595,7 +598,7 @@
<string>Speed: 0b/s</string> <string>Speed: 0b/s</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="bufferLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
@ -658,7 +661,7 @@
<number>35</number> <number>35</number>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="rollOffLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>106</x> <x>106</x>
@ -671,7 +674,7 @@
<string>R.off</string> <string>R.off</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="excursionLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>180</x> <x>180</x>

6
plugins/channelrx/demoddatv/datvideorender.cpp
Wyświetl plik

@ -95,15 +95,13 @@ void DATVideoRender::SetFullScreen(bool fullScreen)
if (fullScreen == true) if (fullScreen == true)
{ {
setWindowFlags(Qt::Window); setWindowFlags(Qt::Window);
setWindowState(Qt::WindowFullScreen); showFullScreen();
show();
m_isFullScreen = true; m_isFullScreen = true;
} }
else else
{ {
setWindowFlags(Qt::Widget); setWindowFlags(Qt::Widget);
setWindowState(Qt::WindowNoState); showNormal();
show();
m_isFullScreen = false; m_isFullScreen = false;
} }
} }