piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Horus] Simulator graphics

Browse Source
This commit is contained in:
Bertrand Songis
2015-11-11 10:02:12 +01:00
parent 312c370162
commit c4d7feaa9b
7 changed files with 164 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/companion.qrc
+2
View File
@@ -10,6 +10,8 @@
<file>images/simulator/Horus/right.png</file> <file>images/simulator/Horus/right.png</file>
<file>images/simulator/Horus/top.png</file> <file>images/simulator/Horus/top.png</file>
<file>images/simulator/Horus/bottom.png</file> <file>images/simulator/Horus/bottom.png</file>
<file>images/simulator/Horus/led.png</file>
<file>images/simulator/Horus/border-right.png</file>
<file>images/simulator/9X/9xdb.png</file> <file>images/simulator/9X/9xdb.png</file>
<file>images/simulator/9X/9xdl.png</file> <file>images/simulator/9X/9xdl.png</file>
<file>images/simulator/9X/9xdr.png</file> <file>images/simulator/9X/9xdr.png</file>
companion/src/images/simulator/Horus/border-right.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

companion/src/images/simulator/Horus/bottom.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 B

After

Width:  |  Height:  |  Size: 5.0 KiB

companion/src/images/simulator/Horus/led.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

companion/src/images/simulator/Horus/top.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 B

After

Width:  |  Height:  |  Size: 4.3 KiB

companion/src/simulation/simulatordialog-horus.ui
+157 -79
View File
@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>808</width> <width>960</width>
<height>738</height> <height>850</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -18,8 +18,14 @@
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>808</width> <width>960</width>
<height>16777215</height> <height>850</height>
</size>
</property>
<property name="minimumSize">
<size>
<width>960</width>
<height>850</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -96,7 +102,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_3" columnminimumwidth="147,480,147"> <layout class="QGridLayout" name="gridLayout_3">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum> <enum>QLayout::SetFixedSize</enum>
</property> </property>
@@ -131,7 +137,145 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" rowspan="3"> <item row="0" column="2">
<widget class="QWidget" name="top" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>9</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>9</height>
</size>
</property>
<property name="font">
<font>
<pointsize>5</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/Horus/top.png)</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="LcdWidget" name="lcd" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>275</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>272</height>
</size>
</property>
<property name="font">
<font>
<pointsize>5</pointsize>
</font>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QWidget" name="bottom" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>11</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>11</height>
</size>
</property>
<property name="font">
<font>
<pointsize>5</pointsize>
<kerning>false</kerning>
</font>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/Horus/bottom.png)</string>
</property>
</widget>
</item>
<item row="0" column="1" rowspan="3">
<widget class="ButtonsWidget" name="led" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>292</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>292</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/Horus/led.png)</string>
</property>
</widget>
</item>
<item row="0" column="3" rowspan="3">
<widget class="ButtonsWidget" name="borderRight" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>27</width>
<height>292</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>27</width>
<height>292</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/Horus/border-right.png)</string>
</property>
</widget>
</item>
<item row="0" column="4" rowspan="3">
<widget class="ButtonsWidget" name="rightbuttons" native="true"> <widget class="ButtonsWidget" name="rightbuttons" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -156,76 +300,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QWidget" name="top" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/Horus/top.png)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="bottom" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/Horus/bottom.png)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="LcdWidget" name="lcd" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>272</height>
</size>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="0"> <item row="0" column="2">
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -237,8 +315,8 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="2"> <item row="0" column="0">
<spacer name="horizontalSpacer_5"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -254,7 +332,7 @@
</widget> </widget>
<widget class="QWidget" name="outputs"> <widget class="QWidget" name="outputs">
<attribute name="title"> <attribute name="title">
<string>Outputs</string> <string>O&amp;utputs</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0"> <item row="0" column="0">
@@ -267,7 +345,7 @@
</widget> </widget>
<widget class="QWidget" name="outputs2"> <widget class="QWidget" name="outputs2">
<attribute name="title"> <attribute name="title">
<string>Outputs2</string> <string>Ou&amp;tputs2</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
@@ -280,7 +358,7 @@
</widget> </widget>
<widget class="QWidget" name="misc"> <widget class="QWidget" name="misc">
<attribute name="title"> <attribute name="title">
<string>Gvars</string> <string>&amp;Gvars</string>
</attribute> </attribute>
<widget class="QWidget" name="gridLayoutWidget"> <widget class="QWidget" name="gridLayoutWidget">
<property name="geometry"> <property name="geometry">
radio/src/debug.h
+5
View File
@@ -78,8 +78,13 @@ void debugPrintf(const char * format, ...);
#define TRACE_WARNING_WP(...) debugPrintf(__VA_ARGS__) #define TRACE_WARNING_WP(...) debugPrintf(__VA_ARGS__)
#define TRACE_ERROR(...) debugPrintf("-E- " __VA_ARGS__) #define TRACE_ERROR(...) debugPrintf("-E- " __VA_ARGS__)
#if defined(DEBUG) && !defined(SIMU)
#define TIME_MEASURE_START(id) uint16_t t0 ## id = getTmr2MHz() #define TIME_MEASURE_START(id) uint16_t t0 ## id = getTmr2MHz()
#define TIME_MEASURE_STOP(id) TRACE("Measure(" # id ") = %.1fus", float((uint16_t)(getTmr2MHz() - t0 ## id))/2) #define TIME_MEASURE_STOP(id) TRACE("Measure(" # id ") = %.1fus", float((uint16_t)(getTmr2MHz() - t0 ## id))/2)
#else
#define TIME_MEASURE_START(id)
#define TIME_MEASURE_STOP(id)
#endif
#if defined(DEBUG_TRACE_BUFFER) #if defined(DEBUG_TRACE_BUFFER)