aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-09-14 15:02:57 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2017-09-19 13:05:27 +0000
commit816cdfd76bcbd1e89bec70157d49482cec827250 (patch)
tree30f147f0f5e346ceafa0dc5ec40328883723eafb
parenteabf252bf23a2f54e9c5cf6a5ba64fde6f2df450 (diff)
ivigenerator: Also use the default_values annotation in the control_panel
The generated control_panel now uses the same default values as the simulation backend Change-Id: I07e97284134f998e815fdd09e5bd979753c06fc8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl b/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl
index b21e001..4a77d08 100644
--- a/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl
+++ b/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl
@@ -68,7 +68,12 @@ QT_BEGIN_NAMESPACE
{% set zones = interface.tags.config_simulator.zones if interface.tags.config_simulator else {} %}
{% for zone_name, zone_id in zones.items() %}
- addZone("{{zone_id}}");
+ addZone(QLatin1String("{{zone_id}}"));
+ {% for property in interface.properties %}
+ {% if property.tags.config_simulator and property.tags.config_simulator.zoned %}
+ m_zoneHash[QLatin1String("{{zone_id}}")]->m_{{property}} = {{property|default_value(zone_name)}};
+ {% endif %}
+ {% endfor %}
{% endfor %}
{% else %}
{{class}}::{{class}}(QObject *parent)