Commit 228e9598 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix is_aggregation test

parent cadb6378
......@@ -142,6 +142,9 @@ The background pattern was downloaded from www.subtlepatterns.com
Changelog
=========
1.3.16 (03/2016)
- Bugfix in testing aggregation states in the GUI
1.3.15 (03/2016)
- Bugfix in Ada backend when a state aggregation contained only empty
states (directly returning states).
......
......@@ -343,6 +343,7 @@ def _state(symbol, recursive=True, nextstate=True, composite=False, cpy=False,
# Generate code for a nested state
result = Indent()
agg = ' AGGREGATION' if symbol.nested_scene.is_aggregation() else ''#if not list(symbol.nested_scene.start) else ''
print agg, unicode(symbol)
result.append('STATE{} {};'.format(agg, unicode(symbol).split()[0]))
result.append('SUBSTRUCTURE')
Indent.indent += 1
......
......@@ -117,7 +117,7 @@ except ImportError:
__all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
__version__ = '1.3.15'
__version__ = '1.3.16'
if hasattr(sys, 'frozen'):
# Detect if we are running on Windows (py2exe-generated)
......@@ -381,7 +381,7 @@ class SDL_Scene(QtGui.QGraphicsScene, object):
if not isinstance(each, State):
# At the moment do not support Text Areas
return False
if(child for child in each.childSymbols()
if any(child for child in each.childSymbols()
if isinstance(child, (Input, ContinuousSignal))):
return False
return True
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment