From f20d522aa73a1c6da87ba578d67442749347042f Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 8 Mar 2017 23:48:14 +0100 Subject: [PATCH] ATV Modulator: transmit fixed image (1) --- plugins/channeltx/modatv/atvmod.cpp | 3 ++- plugins/channeltx/modatv/atvmod.h | 2 +- plugins/channeltx/modatv/atvmodgui.ui | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index 251b3b2ee..23cde1aaa 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -250,6 +250,7 @@ bool ATVMod::handleMessage(const Message& cmd) else if (MsgConfigureImageFileName::match(cmd)) { MsgConfigureImageFileName& conf = (MsgConfigureImageFileName&) cmd; + openImage(conf.getFileName()); // m_fileName = conf.getFileName(); // TODO // openFileStream(); return true; @@ -366,7 +367,7 @@ void ATVMod::applyStandard() } } -void ATVMod::openImage(QString& fileName) +void ATVMod::openImage(const QString& fileName) { cv::Mat tmpImage = cv::imread(qPrintable(fileName), CV_LOAD_IMAGE_GRAYSCALE); m_imageOK = tmpImage.data != 0; diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index ba95f884f..6f5567ae9 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -227,7 +227,7 @@ private: void calculateLevel(Real& sample); void modulateSample(); void applyStandard(); - void openImage(QString& fileName); + void openImage(const QString& fileName); inline void pullImageLine(Real& sample) { diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui index 1f0dc18db..32ec6d76b 100644 --- a/plugins/channeltx/modatv/atvmodgui.ui +++ b/plugins/channeltx/modatv/atvmodgui.ui @@ -385,6 +385,11 @@ V Grad + + + Image + +