VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

ATV modulator: fixed horizontal and vertical bars

Browse Source
This commit is contained in:
f4exb 2019-12-01 01:49:39 +01:00
parent 1d2bcf95f5
commit cbb963754c
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/channeltx/modatv/atvmodgui.ui
View File

@ -50,7 +50,16 @@
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </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> <number>2</number>
</property> </property>
<item> <item>
@ -680,12 +689,6 @@
</item> </item>
<item> <item>
<widget class="QComboBox" name="standard"> <widget class="QComboBox" name="standard">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>TV standard scheme</string> <string>TV standard scheme</string>
</property> </property>
@ -706,12 +709,12 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>ShI</string> <string>ShortI</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>ShNI</string> <string>ShortNI</string>
</property> </property>
</item> </item>
<item> <item>

2
plugins/channeltx/modatv/atvmodplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor ATVModPlugin::m_pluginDescriptor = { const PluginDescriptor ATVModPlugin::m_pluginDescriptor = {
QString("ATV Modulator"), QString("ATV Modulator"),
QString("4.12.1"), QString("4.12.2"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

2
plugins/channeltx/modatv/atvmodsource.cpp
View File

@ -530,7 +530,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
m_nbHorizPoints = m_pointsPerLine; m_nbHorizPoints = m_pointsPerLine;
m_pointsPerHBar = m_pointsPerImgLine / m_nbBars; 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_vBarIncrement = m_spanLevel / (float) m_nbBars;
m_nbLines = settings.m_nbLines; m_nbLines = settings.m_nbLines;

4
plugins/channeltx/modatv/atvmodsource.h
View File

@ -263,10 +263,10 @@ private:
switch(m_settings.m_atvModInput) switch(m_settings.m_atvModInput)
{ {
case ATVModSettings::ATVModInputHBars: case ATVModSettings::ATVModInputHBars:
sample = (((float)pointIndex) / m_pointsPerHBar) * m_hBarIncrement + m_blackLevel; sample = (pointIndex / m_pointsPerHBar) * m_hBarIncrement + m_blackLevel;
break; break;
case ATVModSettings::ATVModInputVBars: case ATVModSettings::ATVModInputVBars:
sample = (((float)iLine) / m_linesPerVBar) * m_vBarIncrement + m_blackLevel; sample = (iLine / m_linesPerVBar) * m_vBarIncrement + m_blackLevel;
break; break;
case ATVModSettings::ATVModInputChessboard: case ATVModSettings::ATVModInputChessboard:
sample = (((iLine / m_linesPerVBar)*5 + (pointIndex / m_pointsPerHBar)) % 2) * m_spanLevel * m_settings.m_uniformLevel + m_blackLevel; sample = (((iLine / m_linesPerVBar)*5 + (pointIndex / m_pointsPerHBar)) % 2) * m_spanLevel * m_settings.m_uniformLevel + m_blackLevel;