Merge https://github.com/esa/opengeode

README.md

@@ -141,6 +141,9 @@ The background pattern was downloaded from www.subtlepatterns.com
 Changelog
 =========
 
+1.5.35 (05/2017)
+    - Fix FOR LOOPS code generation
+
 1.5.34 (05/2017)
     - Fix statechart message selection box
 

opengeode/Helper.py

@@ -475,9 +475,11 @@ def _rename_forloop(ast, from_name, to_name):
     ''' List of FOR loops '''
     for each in ast.elems:
         rename_everything(each['list'], from_name, to_name)
-        rename_everything(each['range']['start'], from_name, to_name)
-        rename_everything(each['range']['stop'], from_name, to_name)
-        rename_everything(each['transition'], from_name, to_name)
+        if each['range'] is not None:
+            rename_everything(each['range']['start'], from_name, to_name)
+            rename_everything(each['range']['stop'], from_name, to_name)
+        if each['transition'] is not None:
+            rename_everything(each['transition'], from_name, to_name)
 
 
 @rename_everything.register(ogAST.ExprPlus)

opengeode/opengeode.py

@@ -139,7 +139,7 @@ except ImportError:
 
 
 __all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
-__version__ = '1.5.34'
+__version__ = '1.5.35'
 
 if hasattr(sys, 'frozen'):
     # Detect if we are running on Windows (py2exe-generated)
@@ -1912,9 +1912,9 @@ class SDL_View(QtGui.QGraphicsView, object):
             msg_box.setText("We recommend to make a semantic check of the "
                             "model now.\n\n"
                             "Choose Apply to perform this check "
-                            "and Discard otherwise.")
+                            "and Cancel otherwise.")
             msg_box.setStandardButtons(QtGui.QMessageBox.Apply
-                                       | QtGui.QMessageBox.Discard)
+                                       | QtGui.QMessageBox.Cancel)
             msg_box.setDefaultButton(QtGui.QMessageBox.Apply)
             res = msg_box.exec_()
             if res == QtGui.QMessageBox.Apply: