Skip to content

Commit

Permalink
Add GUI for higher order modulations (jopohl#666)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jopohl
jopohl authored Oct 11, 2019
1 parent 5d9bc74 commit 794fbc1
Show file tree
Hide file tree
Showing 70 changed files with 3,268 additions and 2,652 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# Pycharm
.idea/

venv/

src/__pycache__/
src/urh/__pycache__/
__pycache__/
Expand Down
131 changes: 68 additions & 63 deletions data/ui/generator.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Drag&amp;amp;Drop Protocols to the table on the right to fill the generation table.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<attribute name="headerDefaultSectionSize">
<number>0</number>
<number>57</number>
</attribute>
</widget>
</item>
Expand Down Expand Up @@ -307,15 +307,6 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<property name="rightMargin">
<number>0</number>
</property>
<item row="2" column="1">
<widget class="QComboBox" name="cBoxModulations">
<item>
<property name="text">
<string>MyModulation</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0" colspan="3">
<layout class="QGridLayout" name="modulationLayout_2">
<item row="1" column="1">
Expand Down Expand Up @@ -353,24 +344,10 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="lParamForZero">
<property name="text">
<string>Amplitude for 0:</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLabel" name="lParamForZeroValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lBitLength">
<property name="text">
<string>Bit Length:</string>
<string>Symbol Length:</string>
</property>
</widget>
</item>
Expand All @@ -381,20 +358,6 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="lParamForOne">
<property name="text">
<string>Amplitude for 1:</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLabel" name="lParamForOneValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lEncoding">
<property name="text">
Expand Down Expand Up @@ -436,12 +399,65 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="ElidedLabel" name="labelParameterValues">
<property name="text">
<string>0/100</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="lParamCaption">
<property name="text">
<string>Amplitudes:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Bits per Symbol:</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLabel" name="labelBitsPerSymbol">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lModulation">
<property name="text">
<string>Modulation:</string>
<item row="1" column="0" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cBoxModulations">
<item>
<property name="text">
<string>MyModulation</string>
</property>
</item>
</widget>
</item>
<item row="5" column="0">
<widget class="QProgressBar" name="prBarGeneration">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>Modulating %p%</string>
</property>
</widget>
</item>
Expand All @@ -459,33 +475,17 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="btnEditModulation">
<property name="text">
<string>Edit ...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QProgressBar" name="prBarGeneration">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>Modulating %p%</string>
<item row="2" column="0">
<widget class="QLabel" name="lModulation">
<property name="text">
<string>Modulation:</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -736,6 +736,11 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ElidedLabel</class>
<extends>QLabel</extends>
<header>urh.ui.ElidedLabel.h</header>
</customwidget>
<customwidget>
<class>GeneratorTreeView</class>
<extends>QTreeView</extends>
Expand Down
Loading

0 comments on commit 794fbc1

Please sign in to comment.