beremiz

Fix non-usable toolbar on wxPython with GTK3+

2018-07-30, Andrey Skvortsov
5927710b5610
Fix non-usable toolbar on wxPython with GTK3+

On GNU/Linux if wxPython uses wxWidget with GTK3+ backend (this is
what most modern distributions do), then size of EditorToolBar was
always to store only one button.
This is because GetBestSize() is updated only after pane is shown and
updated.
The code does work correctly on python-wxgtk3.0 (gtk2 backend) on
GNU/Linux and with wxpython 2.8 on Windows.
<?xml version="1.0"?>
<xsl:stylesheet xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:ppx="http://www.plcopen.org/xml/tc6_0201" xmlns:ns="beremiz" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" extension-element-prefixes="ns" version="1.0" exclude-result-prefixes="ns">
<xsl:output method="xml"/>
<xsl:template match="text()"/>
<xsl:template match="ppx:pou[ppx:body]|ppx:transition[ppx:body]|ppx:action[ppx:body]">
<xsl:apply-templates select="ppx:body/*[self::ppx:FBD or self::ppx:LD or self::ppx:SFC]/*"/>
</xsl:template>
<xsl:template name="add_instance">
<xsl:param name="type"/>
<xsl:value-of select="ns:AddBlockInstance($type, @localId, ppx:position/@x, ppx:position/@y, @width, @height)"/>
</xsl:template>
<xsl:template name="execution_order">
<xsl:choose>
<xsl:when test="@executionOrderId">
<xsl:value-of select="@executionOrderId"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>0</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="ConnectionInfos">
<xsl:param name="type"/>
<xsl:param name="negated"/>
<xsl:param name="edge"/>
<xsl:param name="formalParameter"/>
<xsl:value-of select="ns:AddInstanceConnection($type, $formalParameter, $negated, $edge, ppx:relPosition/@x, ppx:relPosition/@y)"/>
</xsl:template>
<xsl:template match="ppx:position">
<xsl:value-of select="ns:AddLinkPoint(@x, @y)"/>
</xsl:template>
<xsl:template match="ppx:connection">
<xsl:value-of select="ns:AddConnectionLink(@refLocalId, @formalParameter)"/>
<xsl:apply-templates select="ppx:position"/>
</xsl:template>
<xsl:template match="ppx:connectionPointIn">
<xsl:param name="negated"/>
<xsl:param name="edge"/>
<xsl:param name="formalParameter"/>
<xsl:call-template name="ConnectionInfos">
<xsl:with-param name="type">
<xsl:text>input</xsl:text>
</xsl:with-param>
<xsl:with-param name="negated">
<xsl:value-of select="$negated"/>
</xsl:with-param>
<xsl:with-param name="edge">
<xsl:value-of select="$edge"/>
</xsl:with-param>
<xsl:with-param name="formalParameter">
<xsl:value-of select="$formalParameter"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connection"/>
</xsl:template>
<xsl:template match="ppx:connectionPointOut">
<xsl:param name="negated"/>
<xsl:param name="edge"/>
<xsl:param name="formalParameter"/>
<xsl:call-template name="ConnectionInfos">
<xsl:with-param name="type">
<xsl:text>output</xsl:text>
</xsl:with-param>
<xsl:with-param name="negated">
<xsl:value-of select="$negated"/>
</xsl:with-param>
<xsl:with-param name="edge">
<xsl:value-of select="$edge"/>
</xsl:with-param>
<xsl:with-param name="formalParameter">
<xsl:value-of select="$formalParameter"/>
</xsl:with-param>
</xsl:call-template>
</xsl:template>
<xsl:template match="ppx:connectionPointOutAction">
<xsl:call-template name="ConnectionInfos">
<xsl:with-param name="type">
<xsl:text>output</xsl:text>
</xsl:with-param>
</xsl:call-template>
</xsl:template>
<xsl:template match="ppx:comment">
<xsl:value-of select="ns:SetSpecificValues(ppx:content/xhtml:p/text())"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="local-name()"/>
</xsl:with-param>
</xsl:call-template>
</xsl:template>
<xsl:template match="ppx:block">
<xsl:variable name="execution_order">
<xsl:call-template name="execution_order"/>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues(@instanceName, $execution_order)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="@typeName"/>
</xsl:with-param>
</xsl:call-template>
<xsl:for-each select="ppx:inputVariables/ppx:variable">
<xsl:apply-templates select="ppx:connectionPointIn">
<xsl:with-param name="negated" select="@negated"/>
<xsl:with-param name="edge" select="@edge"/>
<xsl:with-param name="formalParameter" select="@formalParameter"/>
</xsl:apply-templates>
</xsl:for-each>
<xsl:for-each select="ppx:outputVariables/ppx:variable">
<xsl:apply-templates select="ppx:connectionPointOut">
<xsl:with-param name="negated" select="@negated"/>
<xsl:with-param name="edge" select="@edge"/>
<xsl:with-param name="formalParameter" select="@formalParameter"/>
</xsl:apply-templates>
</xsl:for-each>
</xsl:template>
<xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/ppx:derived">
<xsl:value-of select="@name"/>
</xsl:template>
<xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/ppx:string">
<xsl:text>STRING</xsl:text>
</xsl:template>
<xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/ppx:wstring">
<xsl:text>WSTRING</xsl:text>
</xsl:template>
<xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/*">
<xsl:value-of select="local-name()"/>
</xsl:template>
<xsl:template name="VariableBlockInfos">
<xsl:param name="type"/>
<xsl:variable name="expression">
<xsl:value-of select="ppx:expression/text()"/>
</xsl:variable>
<xsl:variable name="value_type">
<xsl:choose>
<xsl:when test="ancestor::ppx:transition[@name=$expression]">
<xsl:text>BOOL</xsl:text>
</xsl:when>
<xsl:when test="ancestor::ppx:pou[@name=$expression]">
<xsl:apply-templates select="ancestor::ppx:pou/child::ppx:interface/ppx:returnType"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="ancestor::ppx:pou/child::ppx:interface/*/ppx:variable[@name=$expression]/ppx:type"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="execution_order">
<xsl:call-template name="execution_order"/>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues($expression, $value_type, $execution_order)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="$type"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn">
<xsl:with-param name="negated" select="@negatedIn"/>
<xsl:with-param name="edge" select="@edgeIn"/>
</xsl:apply-templates>
<xsl:apply-templates select="ppx:connectionPointOut">
<xsl:with-param name="negated" select="@negatedOut"/>
<xsl:with-param name="edge" select="@edgeOut"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="ppx:inVariable">
<xsl:call-template name="VariableBlockInfos">
<xsl:with-param name="type" select="'input'"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="ppx:outVariable">
<xsl:call-template name="VariableBlockInfos">
<xsl:with-param name="type" select="'output'"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="ppx:inOutVariable">
<xsl:call-template name="VariableBlockInfos">
<xsl:with-param name="type" select="'inout'"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="ppx:connector|ppx:continuation">
<xsl:value-of select="ns:SetSpecificValues(@name)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="local-name()"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn"/>
<xsl:apply-templates select="ppx:connectionPointOut"/>
</xsl:template>
<xsl:template match="ppx:leftPowerRail|ppx:rightPowerRail">
<xsl:variable name="type" select="local-name()"/>
<xsl:variable name="connectors">
<xsl:choose>
<xsl:when test="$type='leftPowerRail'">
<xsl:value-of select="count(ppx:connectionPointOut)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="count(ppx:connectionPointIn)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues($connectors)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="$type"/>
</xsl:with-param>
</xsl:call-template>
<xsl:choose>
<xsl:when test="$type='leftPowerRail'">
<xsl:apply-templates select="ppx:connectionPointOut"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="ppx:connectionPointIn"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="ppx:contact|ppx:coil">
<xsl:variable name="type" select="local-name()"/>
<xsl:variable name="storage">
<xsl:choose>
<xsl:when test="$type='coil'">
<xsl:value-of select="@storage"/>
</xsl:when>
</xsl:choose>
</xsl:variable>
<xsl:variable name="execution_order">
<xsl:call-template name="execution_order"/>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues(ppx:variable/text(), @negated, @edge, $storage, $execution_order)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="$type"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn"/>
<xsl:apply-templates select="ppx:connectionPointOut"/>
</xsl:template>
<xsl:template match="ppx:step">
<xsl:value-of select="ns:SetSpecificValues(@name, @initialStep)"/>
<xsl:apply-templates select="ppx:connectionPointOutAction">
<xsl:with-param name="negated" select="@negated"/>
</xsl:apply-templates>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="local-name()"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn"/>
<xsl:apply-templates select="ppx:connectionPointOut"/>
</xsl:template>
<xsl:template match="ppx:transition">
<xsl:variable name="priority">
<xsl:choose>
<xsl:when test="@priority">
<xsl:value-of select="@priority"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>0</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="condition_type">
<xsl:choose>
<xsl:when test="ppx:condition/ppx:connectionPointIn">
<xsl:text>connection</xsl:text>
</xsl:when>
<xsl:when test="ppx:condition/ppx:reference">
<xsl:text>reference</xsl:text>
</xsl:when>
<xsl:when test="ppx:condition/ppx:inline">
<xsl:text>inline</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:variable>
<xsl:variable name="condition">
<xsl:choose>
<xsl:when test="ppx:condition/ppx:reference">
<xsl:value-of select="ppx:condition/ppx:reference/@name"/>
</xsl:when>
<xsl:when test="ppx:condition/ppx:inline">
<xsl:value-of select="ppx:condition/ppx:inline/ppx:ST/xhtml:p/text()"/>
</xsl:when>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues($priority, $condition_type, $condition)"/>
<xsl:apply-templates select="ppx:condition/ppx:connectionPointIn">
<xsl:with-param name="negated" select="ppx:condition/@negated"/>
</xsl:apply-templates>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="local-name()"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn"/>
<xsl:apply-templates select="ppx:connectionPointOut"/>
</xsl:template>
<xsl:template match="ppx:selectionDivergence|ppx:selectionConvergence|ppx:simultaneousDivergence|ppx:simultaneousConvergence">
<xsl:variable name="type">
<xsl:value-of select="local-name()"/>
</xsl:variable>
<xsl:variable name="connectors">
<xsl:choose>
<xsl:when test="$type='selectionDivergence' or $type='simultaneousDivergence'">
<xsl:value-of select="count(ppx:connectionPointOut)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="count(ppx:connectionPointIn)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues($connectors)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="$type"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn"/>
<xsl:apply-templates select="ppx:connectionPointOut"/>
</xsl:template>
<xsl:template match="ppx:jumpStep">
<xsl:variable name="type">
<xsl:text>jump</xsl:text>
</xsl:variable>
<xsl:value-of select="ns:SetSpecificValues(@targetName)"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="$type"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn"/>
</xsl:template>
<xsl:template match="ppx:action">
<xsl:variable name="type">
<xsl:choose>
<xsl:when test="ppx:reference">
<xsl:text>reference</xsl:text>
</xsl:when>
<xsl:when test="ppx:inline">
<xsl:text>inline</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:variable>
<xsl:variable name="value">
<xsl:choose>
<xsl:when test="ppx:reference">
<xsl:value-of select="ppx:reference/@name"/>
</xsl:when>
<xsl:when test="ppx:inline">
<xsl:value-of select="ppx:inline/ppx:ST/xhtml:p/text()"/>
</xsl:when>
</xsl:choose>
</xsl:variable>
<xsl:variable name="qualifier">
<xsl:choose>
<xsl:when test="@qualifier">
<xsl:value-of select="@qualifier"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>N</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="ns:AddAction($qualifier, $type, $value, @duration, @indicator)"/>
</xsl:template>
<xsl:template match="ppx:actionBlock">
<xsl:value-of select="ns:SetSpecificValues()"/>
<xsl:apply-templates select="ppx:action"/>
<xsl:call-template name="add_instance">
<xsl:with-param name="type">
<xsl:value-of select="local-name()"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates select="ppx:connectionPointIn">
<xsl:with-param name="negated" select="@negated"/>
</xsl:apply-templates>
</xsl:template>
</xsl:stylesheet>