From 806b955110b1fe97f5e9d7b3af0e7d0ba898e2a3 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 8 Mar 2017 01:35:18 +0100
Subject: [PATCH] ATV Modulator: added image file dialog

---
 plugins/channeltx/modatv/atvmod.cpp    |   8 +++++
 plugins/channeltx/modatv/atvmod.h      |  25 ++++++++++++++-
 plugins/channeltx/modatv/atvmodgui.cpp |  20 ++++++++++++
 plugins/channeltx/modatv/atvmodgui.h   |   4 ++-
 plugins/channeltx/modatv/atvmodgui.ui  |  41 ++++++++++++++++++++++---
 sdrbase/resources/film.png             | Bin 0 -> 378 bytes
 sdrbase/resources/film_reel.png        | Bin 0 -> 888 bytes
 sdrbase/resources/picture.png          | Bin 0 -> 408 bytes
 sdrbase/resources/res.qrc              |   3 ++
 9 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 sdrbase/resources/film.png
 create mode 100644 sdrbase/resources/film_reel.png
 create mode 100644 sdrbase/resources/picture.png

diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp
index 088ae8b6f..75e8847d4 100644
--- a/plugins/channeltx/modatv/atvmod.cpp
+++ b/plugins/channeltx/modatv/atvmod.cpp
@@ -20,6 +20,7 @@
 #include "atvmod.h"
 
 MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureATVMod, Message)
+MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureImageFileName, Message)
 
 const float ATVMod::m_blackLevel = 0.3f;
 const float ATVMod::m_spanLevel = 0.7f;
@@ -242,6 +243,13 @@ bool ATVMod::handleMessage(const Message& cmd)
 
         return true;
     }
+    else if (MsgConfigureImageFileName::match(cmd))
+    {
+        MsgConfigureImageFileName& conf = (MsgConfigureImageFileName&) cmd;
+//        m_fileName = conf.getFileName(); // TODO
+//        openFileStream();
+        return true;
+    }
     else
     {
         return false;
diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h
index b7b8c8e99..27a23063e 100644
--- a/plugins/channeltx/modatv/atvmod.h
+++ b/plugins/channeltx/modatv/atvmod.h
@@ -45,7 +45,9 @@ public:
         ATVModInputVBars,
         ATVModInputCheckbox,
         ATVModInputHGradient,
-        ATVModInputVGradient
+        ATVModInputVGradient,
+        ATVModInputImage,
+        ATVModInputVideo
     } ATVModInput;
 
     typedef enum
@@ -54,6 +56,27 @@ public:
 		ATVModulationFM
     } ATVModulation;
 
+    class MsgConfigureImageFileName : public Message
+    {
+        MESSAGE_CLASS_DECLARATION
+
+    public:
+        const QString& getFileName() const { return m_fileName; }
+
+        static MsgConfigureImageFileName* create(const QString& fileName)
+        {
+            return new MsgConfigureImageFileName(fileName);
+        }
+
+    private:
+        QString m_fileName;
+
+        MsgConfigureImageFileName(const QString& fileName) :
+            Message(),
+            m_fileName(fileName)
+        { }
+    };
+
     ATVMod();
     ~ATVMod();
 
diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp
index db304b742..42b963d64 100644
--- a/plugins/channeltx/modatv/atvmodgui.cpp
+++ b/plugins/channeltx/modatv/atvmodgui.cpp
@@ -227,6 +227,26 @@ void ATVModGUI::on_channelMute_toggled(bool checked)
 	applySettings();
 }
 
+void ATVModGUI::on_imageFileDialog_clicked(bool checked)
+{
+    QString fileName = QFileDialog::getOpenFileName(this,
+        tr("Open image file"), ".", tr("Image Files (*.png *.jpg *.bmp)"));
+
+    if (fileName != "")
+    {
+        m_imageFileName = fileName;
+        ui->recordFileText->setText(m_imageFileName);
+        configureImageFileName();
+    }
+}
+
+void ATVModGUI::configureImageFileName()
+{
+    qDebug() << "ATVModGUI::configureImageFileName: " << m_imageFileName.toStdString().c_str();
+    ATVMod::MsgConfigureImageFileName* message = ATVMod::MsgConfigureImageFileName::create(m_imageFileName);
+    m_atvMod->getInputMessageQueue()->push(message);
+}
+
 void ATVModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 {
 }
diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h
index 57d3beae0..48138becc 100644
--- a/plugins/channeltx/modatv/atvmodgui.h
+++ b/plugins/channeltx/modatv/atvmodgui.h
@@ -66,10 +66,12 @@ private slots:
     void on_inputSelect_currentIndexChanged(int index);
     void on_volume_valueChanged(int value);
     void on_channelMute_toggled(bool checked);
+    void on_imageFileDialog_clicked(bool checked);
 
     void onWidgetRolled(QWidget* widget, bool rollDown);
     void onMenuDoubleClicked();
 
+    void configureImageFileName();
     void tick();
 
 private:
@@ -85,7 +87,7 @@ private:
     ATVMod* m_atvMod;
     MovingAverage<Real> m_channelPowerDbAvg;
 
-    QString m_fileName;
+    QString m_imageFileName;
     quint32 m_recordLength;
     int m_recordSampleRate;
     int m_samplesCount;
diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui
index b595d9e01..643b2274e 100644
--- a/plugins/channeltx/modatv/atvmodgui.ui
+++ b/plugins/channeltx/modatv/atvmodgui.ui
@@ -372,7 +372,7 @@
         </item>
         <item>
          <property name="text">
-          <string>Chekbox</string>
+          <string>Chekbd</string>
          </property>
         </item>
         <item>
@@ -474,7 +474,7 @@
     <item>
      <layout class="QHBoxLayout" name="playControllLayout">
       <item>
-       <widget class="QPushButton" name="showFileDialog">
+       <widget class="QPushButton" name="imageFileDialog">
         <property name="minimumSize">
          <size>
           <width>24</width>
@@ -488,14 +488,47 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Open record file (48 kHz 32 bit float LE mono)</string>
+         <string>Open still image file</string>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../../sdrbase/resources/res.qrc">
-          <normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
+          <normaloff>:/picture.png</normaloff>:/picture.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="Line" name="line_5">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="videoFileDialog">
+        <property name="minimumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Open video file</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../sdrbase/resources/res.qrc">
+          <normaloff>:/film_reel.png</normaloff>:/film_reel.png</iconset>
         </property>
        </widget>
       </item>
diff --git a/sdrbase/resources/film.png b/sdrbase/resources/film.png
new file mode 100644
index 0000000000000000000000000000000000000000..3621a68daf0d469914c82315b8584a6693627ada
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBixcc5xY{hetaXF)%Q)d%8G=cpSew)zI&7fPl+=77x)#
z8HU2fEhU!DdJQql9;%#lbvkG(#MwDZ?g-<Asair(T>CB_KQb**Inv;&*FWps#`XWD
z{_*C#4yd_OQ=c&P=-!D%VWlz2S5_2q=P<eD2pv~1iuCxk=$ZPNQ<I9<1(q?~j=r7x
zK+gO2?L8Nlxr#doZdl<Vb6?j>)~8|blE3*nn{3&RO)AUf@=A~jFz}Tr>3wNru<Z1*
zPs?1VA6UKQ)Hl%&*EW9^_T=Bj{UGL2@!yAAlwZDSXkE+ttMBGT-7KvgjPIDI*Rb30
zS}p58ptK-iqD55vC++}Nu8_{;9jV*5+4Ae`-ubrl`lj7%X^h=zoyiO0pUppFeL~pk
V%cI`jZ@^Gu@O1TaS?83{1ONz!myZAd

literal 0
HcmV?d00001

diff --git a/sdrbase/resources/film_reel.png b/sdrbase/resources/film_reel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f50ab7fc57125261b11e85af0d8121b062adbb
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;R6R3Edm_&uGjzo0|iM$
zK~zY`jg~=(l~okSf9Lt0W0@v3I%r`=CRQ*5B_-<0MVkUq!a>mxX;JQ6gzL5~S{N-7
zK{rK<76l<eBN0wS5{b4dv%+ySBO<k?bl!Wv7M*YA&hwkc9Jsvu{`cH-&-tHw&iz7d
z0WvGm^S=&TuugLU8;ywe96$qTq<&uqnthCSB0}|E^>N@qpao0;lM(S#9@f{%W*rz2
zZFP-03Ty$^0jq!|zzyK4`aN(eB0kQD7S%GKw$x@d65FkgtA9HySJW}}uL8TOzNZe=
z*-~577(c9DD~xp2Z`HNxpn5=^>{&mrK3Y*$8CRS17~iK}cdpz~-zXv;Qa|%<Ij`QQ
zHp)mE1?Nu!uO-))fX{(Wa{ENV>S|yx=RX6dfob3=;Alj2=j5UA{z!WAq542#n-aUN
z9#;>lXA=8FU6FdjMNT#qRJF*E)~TmbX^$Gk!QWXg`wG58{VMbEW|{CthV(EnoIyR8
zG=;hmSX<UcG2fh21+W2lEay+>dbg~D6~LOD9|D$U9$o^L18ra&I1B6o)&s8s1Hg~K
z4q#>Ozh8YQA|@*qP<Pp1ZmKV*?y-4vy7_xfU0>y)ir`LWK7iZ6iS%qY@GNi-@QOMN
zY|lMy;CSlo1hytV4NPTqM-{;~bs{}@OI@ihQa7l77G8FW`B8OMq4!(jV`afL@}vpi
zLV9o(`2GL#h#!E<MPeJp{A=Kk#4cvey1+NRy{Nj5ucrqe6?L#Vv47Qf)cxugiG5n=
zjTCk8Oc?>iJ>HlNPW6{8s7{U#3Wr9rH>qCE1KaAfdaSn}%@jl~>{WkVKrb4rxkcyH
zWodY^I-s^@9t*V@5$~&mz>%UZn!pbABybCOA^Q%+ZMp=!4LqNZQkAdqyW8t*U7YFZ
z{nwI?sREl&zf|9yr#42bo>TXt4FRLTHsFzL9|OQm;0ka($8z9B;Gdpnb1`r*YQ8Ee
zg?7HlOR_Z#CS6l`zztvoSeAv_D-GbnOxNu5_!|+Ony-q;MmevjjsE~Z#Pzz#3vA~A
O0000<MNUMnLSTYyj*hGV

literal 0
HcmV?d00001

diff --git a/sdrbase/resources/picture.png b/sdrbase/resources/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..a84d4d572854f7f64cedadcc72392450df62d4e5
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;R6R3Cm!+`8XW)t0VzpDK~y-)
zwUbXPL}3)hfA4jZVd4V}+p$or*x6W-tbGAR)0B;sQkoSz7G|M*1|=(MEZDFjD;u9c
zCMhN9XW?FErkS~8;cVXC(|OLH=jnle5C2~6v@iA&Z_YvtEHca?&xEe6^ORZQGENeu
z@R_+z86ir39m*Z|K|L@|Plz(wo=^lztfYx7Krwj>Z2<xXM;-a0y9&S)wX`N~1O$LJ
zs@ymq>H@5DPk~yvXzaVKseCT@s_JbU0(7T!r7^1H0hsd2oD<gFH*Q5H6U=$tr0kvV
zs#e-e2mq(dG<BM!AAl`)f0GHoV1>Dk<Zigy%F;5MUDSx!^RZcnBl@}uIKXi;U@+4P
zL*J)H>BT)o0yyWRN4uRtkN_Amy&8h4MgPhFNqhlmQlXgi@!RbH0000<MNUMnLSTZC
Cp{Cye

literal 0
HcmV?d00001

diff --git a/sdrbase/resources/res.qrc b/sdrbase/resources/res.qrc
index 50d65a8b5..1d0437d80 100644
--- a/sdrbase/resources/res.qrc
+++ b/sdrbase/resources/res.qrc
@@ -71,5 +71,8 @@
         <file>txon.png</file>
         <file>arrow_down.png</file>
         <file>arrow_up.png</file>
+        <file>film_reel.png</file>
+        <file>film.png</file>
+        <file>picture.png</file>
     </qresource>
 </RCC>