From b54b9c3f0866045c78d1af15bbaaf10a7a06d70d Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 29 Oct 2018 13:21:52 +0100 Subject: ivigenerator: Fix the control_panel template to work with zone lists instead of maps Change-Id: Idd7dd5132ee1c2e12f133054973ad37a45206492 Reviewed-by: Robert Griebl --- src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl b/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl index 237ab8d..a6ee8b4 100644 --- a/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl +++ b/src/tools/ivigenerator/templates_control_panel/interface.cpp.tpl @@ -70,12 +70,12 @@ QT_BEGIN_NAMESPACE m_zoneMap.insert(INITIAL_MAIN_ZONE, QVariant::fromValue(this)); {% set zones = interface.tags.config_simulator.zones if interface.tags.config_simulator else {} %} - {% for zone_name, zone_id in zones.items() %} + {% for zone_id in zones %} addZone(QLatin1String("{{zone_id}}")); {% for property in interface.properties %} {% if not property.type.is_model %} {% if property.tags.config_simulator and property.tags.config_simulator.zoned %} - m_zoneHash[QLatin1String("{{zone_id}}")]->m_{{property}} = {{property|default_value(zone_name)}}; + m_zoneHash[QLatin1String("{{zone_id}}")]->m_{{property}} = {{property|default_value(zone_id)}}; {% endif %} {% endif %} {% endfor %} -- cgit v1.2.3