From cbb963754c551d74639ea46ebc5faf34405f06d0 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 1 Dec 2019 01:49:39 +0100
Subject: [PATCH] ATV modulator: fixed horizontal and vertical bars

---
 plugins/channeltx/modatv/atvmodgui.ui     | 21 ++++++++++++---------
 plugins/channeltx/modatv/atvmodplugin.cpp |  2 +-
 plugins/channeltx/modatv/atvmodsource.cpp |  2 +-
 plugins/channeltx/modatv/atvmodsource.h   |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui
index ce45e6cdc..49c105777 100644
--- a/plugins/channeltx/modatv/atvmodgui.ui
+++ b/plugins/channeltx/modatv/atvmodgui.ui
@@ -50,7 +50,16 @@
     <property name="spacing">
      <number>3</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>2</number>
+    </property>
+    <property name="topMargin">
+     <number>2</number>
+    </property>
+    <property name="rightMargin">
+     <number>2</number>
+    </property>
+    <property name="bottomMargin">
      <number>2</number>
     </property>
     <item>
@@ -680,12 +689,6 @@
       </item>
       <item>
        <widget class="QComboBox" name="standard">
-        <property name="maximumSize">
-         <size>
-          <width>70</width>
-          <height>16777215</height>
-         </size>
-        </property>
         <property name="toolTip">
          <string>TV standard scheme</string>
         </property>
@@ -706,12 +709,12 @@
         </item>
         <item>
          <property name="text">
-          <string>ShI</string>
+          <string>ShortI</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>ShNI</string>
+          <string>ShortNI</string>
          </property>
         </item>
         <item>
diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp
index 7ff70cf09..1a1b3df86 100644
--- a/plugins/channeltx/modatv/atvmodplugin.cpp
+++ b/plugins/channeltx/modatv/atvmodplugin.cpp
@@ -27,7 +27,7 @@
 
 const PluginDescriptor ATVModPlugin::m_pluginDescriptor = {
     QString("ATV Modulator"),
-    QString("4.12.1"),
+    QString("4.12.2"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,
diff --git a/plugins/channeltx/modatv/atvmodsource.cpp b/plugins/channeltx/modatv/atvmodsource.cpp
index 328fee640..084fc004b 100644
--- a/plugins/channeltx/modatv/atvmodsource.cpp
+++ b/plugins/channeltx/modatv/atvmodsource.cpp
@@ -530,7 +530,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     m_nbHorizPoints    = m_pointsPerLine;
 
     m_pointsPerHBar    = m_pointsPerImgLine / m_nbBars;
-    m_hBarIncrement    = m_spanLevel / (float) m_nbBars;
+    m_hBarIncrement    = m_spanLevel / (float) (m_nbBars-1);
     m_vBarIncrement    = m_spanLevel / (float) m_nbBars;
 
     m_nbLines          = settings.m_nbLines;
diff --git a/plugins/channeltx/modatv/atvmodsource.h b/plugins/channeltx/modatv/atvmodsource.h
index 69aa8d241..c97eb9fd0 100644
--- a/plugins/channeltx/modatv/atvmodsource.h
+++ b/plugins/channeltx/modatv/atvmodsource.h
@@ -263,10 +263,10 @@ private:
             switch(m_settings.m_atvModInput)
             {
             case ATVModSettings::ATVModInputHBars:
-                sample = (((float)pointIndex) / m_pointsPerHBar) * m_hBarIncrement + m_blackLevel;
+                sample = (pointIndex / m_pointsPerHBar) * m_hBarIncrement + m_blackLevel;
                 break;
             case ATVModSettings::ATVModInputVBars:
-                sample = (((float)iLine) / m_linesPerVBar) * m_vBarIncrement + m_blackLevel;
+                sample = (iLine / m_linesPerVBar) * m_vBarIncrement + m_blackLevel;
                 break;
             case ATVModSettings::ATVModInputChessboard:
                 sample = (((iLine / m_linesPerVBar)*5 + (pointIndex / m_pointsPerHBar)) % 2) * m_spanLevel * m_settings.m_uniformLevel + m_blackLevel;