Commit 19636542 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Start with maximized size window

parent 4e0b052c
......@@ -143,6 +143,9 @@ Changelog
=========
1.5.15 (10/2016)
- Report incomplete startup transitions as errors in nested states
1.5.14 (10/2016)
- Support named integers (requires asn1scc 3.3.04 or more recent)
......
......@@ -999,7 +999,7 @@ def fix_expression_types(expr, context): # type: -> [warnings]
''' Check/ensure type consistency in binary expressions '''
warnings = []
for _ in range(2):
# Check if an raw enumerated value is of a reference type
# Check if a raw enumerated value is of a reference type
warnings.extend(fix_enumerated_and_choice(expr, context))
expr.right, expr.left = expr.left, expr.right
......@@ -2107,6 +2107,9 @@ def composite_state(root, parent=None, context=None):
else:
errors.append(['Only one unnamed START transition is allowed',
[st.pos_x, st.pos_y], []])
if not comp.terminators:
errors.append(['Transition is incomplete',
[st.pos_x, st.pos_y], []])
for each in floatings:
lab, err, warn = floating_label(each, parent=None, context=comp)
errors.extend(err)
......@@ -2134,8 +2137,16 @@ def composite_state(root, parent=None, context=None):
'of substate "{}"'
.format(comp.statename, ns.upper()),
[0, 0], []])
# # Raise an error is there is no NEXTSTATE at all
# for each in comp.terminators:
# if each.kind == 'next_state':
# break
# else:
# if not isinstance(comp, ogAST.StateAggregation):
# errors.append(['In composite state "{}"'
# ': incomplete startup transition'
# .format(comp.statename), [0, 0], []])
for each in chain(errors, warnings):
print each
each[2].insert(0, 'STATE {}'.format(comp.statename))
return comp, errors, warnings
......
......@@ -138,7 +138,7 @@ except ImportError:
__all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
__version__ = '1.5.14'
__version__ = '1.5.15'
if hasattr(sys, 'frozen'):
# Detect if we are running on Windows (py2exe-generated)
......@@ -2150,6 +2150,7 @@ class OG_MainWindow(QtGui.QMainWindow, object):
self.sub_mdi = None
self.statechart_mdi = None
self.datadict = None
self.setWindowState(Qt.WindowMaximized)
def new_scene(self, readonly=False):
''' Create a new, clean SDL scene. This function is necessary because
......
......@@ -2,7 +2,7 @@
PROCESS orchestrator
/* CIF COMMENT (405, 192), (71, 35) */
COMMENT 'Hello';
/* CIF TEXT (0, 94), (398, 293) */
/* CIF TEXT (0, 94), (450, 353) */
dcl seq tastE_Peek_id_list := { 1,2,3,4,5};
dcl fixed FixedString := 'Hello';
......@@ -16,16 +16,17 @@ dcl seqen SeqEnum := { hello2, world2};
dcl seqen2 SeqEnumFix := { hello, world };
dcl myenum MyEnum := a;
dcl turlututu MyEnum := a;
dcl check tasTE_Peek_id := 42;
dcl choice Mychoice := c1:TRUE ;
dcl opt SeqOpt := { A TRUE, b FALSE }; -- test optional fields
dcl somebool boolean := true;
-- dcl opt2 SeqOpt := { a somebool, b false }; SHOULD REPORT AND ERROR
/* CIF ENDTEXT */
/* CIF PROCEDURE (1273, 175), (106, 35) */
PROCEDURE emptyproc;
ENDPROCEDURE;
/* CIF PROCEDURE (1306, 371), (91, 35) */
PROCEDURE numProc;
/* CIF START (161, 82), (70, 35) */
......@@ -43,6 +44,9 @@ dcl opt SeqOpt := { A TRUE, b FALSE }; -- test optional fields
/* CIF RETURN (178, 348), (35, 35) */
RETURN ;
ENDPROCEDURE;
/* CIF PROCEDURE (1273, 175), (106, 35) */
PROCEDURE emptyproc;
ENDPROCEDURE;
/* CIF START (596, 224), (80, 36) */
START;
/* CIF TASK (564, 275), (144, 35) */
......
Supports Markdown
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