Components of shift in visualisation now evaluated dynamically

JdeH · JdeH · commit f3c87d27db2d · 2017-03-29T15:38:00.000+02:00
diff --git a/SimPyLC/__init__.py b/SimPyLC/__init__.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 from .base import *
diff --git a/SimPyLC/base.py b/SimPyLC/base.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 import os
diff --git a/SimPyLC/chart.py b/SimPyLC/chart.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 from time import *
diff --git a/SimPyLC/coder.py b/SimPyLC/coder.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 from sys import *
@@ -155,7 +155,7 @@ def getPrologue (self):
 
 
 
-// ====== BEGIN OF LICENCE COMMENT BLOCK, INCLUDE IN ANY COPY OF THIS GENERATED CODE AND DO NOT REMOVE ======
+// ====== BEGIN OF License COMMENT BLOCK, INCLUDE IN ANY COPY OF THIS GENERATED CODE AND DO NOT REMOVE ======
 //
 // I M P O R T A N T   S A F E T Y   N O T I C E
 //
@@ -165,7 +165,7 @@ def getPrologue (self):
 // USE OF THIS CODE IS GOVERNED BY THE QQUICK LICENSE (WWW.QQUICK.ORG/LICENSE).
 // YOUR LICENSE TO USE THIS GENERATED CODE AUTOMATICALLY ENDS IF YOU REMOVE OR LEAVE OUT THIS LICENSE COMMENT BLOCK OR THE CODE THAT GENERATED IT. 
 //
-// ====== END OF LICENCE COMMENT BLOCK, INCLUDE IN COPY OF THIS GENERATED CODE AND DO NOT REMOVE ======
+// ====== END OF License COMMENT BLOCK, INCLUDE IN COPY OF THIS GENERATED CODE AND DO NOT REMOVE ======
 
 
 
diff --git a/SimPyLC/engine.py b/SimPyLC/engine.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 from datetime import *
diff --git a/SimPyLC/graphics.py b/SimPyLC/graphics.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 from threading import Thread
diff --git a/SimPyLC/gui.py b/SimPyLC/gui.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 import os
diff --git a/SimPyLC/scene.py b/SimPyLC/scene.py
@@ -3,14 +3,14 @@
 # Copyright (C) 2013 GEATEC engineering
 #
 # This program is free software.
-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.
+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the QQuickLicence for details.
+# See the QQuickLicense for details.
 #
-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html
+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html
 #
 # __________________________________________________________________________
 #
@@ -21,7 +21,7 @@
 #
 # It is meant for training purposes only.
 #
-# Removing this header ends your licence.
+# Removing this header ends your license.
 #
 
 from time import *
@@ -142,18 +142,18 @@ def __call__ (self, angle = 0, shift = (0, 0, 0), color = None, parts = lambda:
         if color != None:
             self.color = color
         glPushMatrix ()
-        glTranslate (*tAdd (self.center, self.joint))   # Put joint at correct position
-        glRotate (evaluate (angle), *self.pivot)        # Rotate over varying angle parameter, so NOT fixed self.angle attribute, around self.pivot to move
-        glTranslate (*shift)                            # Put joint at correct position
-        glTranslate (*tNeg (self.joint))                # Put joint in origin
+        glTranslate (*tAdd (self.center, self.joint))                                   # Put joint at correct position
+        glRotate (evaluate (angle), *self.pivot)                                        # Rotate over varying angle parameter, so NOT fixed self.angle attribute, around self.pivot to move
+        glTranslate (evaluate (shift [0]), evaluate (shift [1]), evaluate (shift [2]))  # Put joint at correct position
+        glTranslate (*tNeg (self.joint))                                                # Put joint in origin
         glPushMatrix ()
-        glRotate (self.angle, *self.axis)               # Rotate over fixed self.angle attribute, set by the constructor, around self.axis to achieve initial attitude
+        glRotate (self.angle, *self.axis)                                               # Rotate over fixed self.angle attribute, set by the constructor, around self.axis to achieve initial attitude
         glColor (*self.color)
         self._draw ()
         glPopMatrix ()
         parts ()
         glPopMatrix ()
-        return 0                                        # Make concatenable by e.g. + operator
+        return 0                                                                        # Make concatenable by e.g. + operator
         
 class Beam (_Thing):
     def __init__ (self, **arguments):
diff --git a/SimPyLC/simPyLCHowTo.docx b/SimPyLC/simPyLCHowTo.docx
diff --git a/SimPyLC/simpylchowto.html b/SimPyLC/simpylchowto.html
@@ -248,7 +248,7 @@
 
 <p class=MsoToc1>&nbsp;</p>
 
-<p class=MsoToc1><span lang=NL><a href="#_Toc434054799"><span lang=EN-US>QQuickLicence
+<p class=MsoToc1><span lang=NL><a href="#_Toc434054799"><span lang=EN-US>QQuickLicense
 governing the use of SimPyLC and of its generated code</span><span
 style='color:windowtext;display:none;text-decoration:none'>. </span><span
 style='color:windowtext;display:none;text-decoration:none'>2</span></a></span></p>
@@ -354,7 +354,7 @@
 
 <p class=MsoNormal>&nbsp;</p>
 
-<h1><a name="_Toc434054799">QQuickLicence governing the use of SimPyLC and of
+<h1><a name="_Toc434054799">QQuickLicense governing the use of SimPyLC and of
 its generated code</a></h1>
 
 <p class=MsoNormal>&nbsp;</p>
@@ -400,7 +400,7 @@ <h1><a name="_Toc434054799">QQuickLicence governing the use of SimPyLC and of
 with your</p>
 
 <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-normal'>    distribution in a plain text file named QQuickLicence.txt),</p>
+normal'>    distribution in a plain text file named QQuickLicense.txt),</p>
 
 <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
 normal'>    and if you distribute the Software solely in object form</p>
diff --git a/qQuickLicense.txt b/qQuickLicense.txt
diff --git a/simulations/arduinoTrafficLights/generated/arduinoTrafficLights/arduinoTrafficLights.ino b/simulations/arduinoTrafficLights/generated/arduinoTrafficLights/arduinoTrafficLights.ino
@@ -16,8 +16,8 @@
 
 
 
-// Generator: SimPyLC 3.5.3
-// Generated: 2017-01-27 16:34:56.042887
+// Generator: SimPyLC 3.5.5
+// Generated: 2017-02-10 22:15:41.179688
 // Target platform: Arduino
 
 
diff --git a/simulations/oneArmedRobot/robot.py b/simulations/oneArmedRobot/robot.py
@@ -73,6 +73,7 @@ def __init__ (self):
         self.forAccel = Register ()
         self.forSpeed = Register ()
         self.forAng = Register ()
+        self.forShift = Register ()
         
         self.group ('wrist electronics', True)
         self.wriVolt = Register ()
diff --git a/simulations/oneArmedRobot/visualisation.py b/simulations/oneArmedRobot/visualisation.py
@@ -57,7 +57,7 @@ def display (self):
         self.base (parts = lambda:
             self.torso (angle = world.robot.torAng, parts = lambda:
                 self.upperArm (angle = world.robot.uppAng, parts = lambda:
-                    self.foreArm (angle = world.robot.forAng, parts = lambda:
+                    self.foreArm (angle = world.robot.forAng, shift = (world.robot.forShift, 0, 0), parts = lambda:
                         self.wrist (angle = world.robot.wriAng, parts = lambda:
                             self.handCenter (angle = world.robot.hanAng, parts = lambda:
                                 self.handSide0 () +

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@`
`3`	`3`	`# Copyright (C) 2013 GEATEC engineering`
`4`	`4`	`#`
`5`	`5`	`# This program is free software.`
`6`		`-# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicence.`
	`6`	`+# You can use, redistribute and/or modify it, but only under the terms stated in the QQuickLicense.`
`7`	`7`	`#`
`8`	`8`	`# This program is distributed in the hope that it will be useful,`
`9`	`9`	`# but WITHOUT ANY WARRANTY, without even the implied warranty of`
`10`	`10`	`# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.`
`11`		`-# See the QQuickLicence for details.`
	`11`	`+# See the QQuickLicense for details.`
`12`	`12`	`#`
`13`		`-# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicence.html`
	`13`	`+# The QQuickLicense can be accessed at: http://www.geatec.com/qqLicense.html`
`14`	`14`	`#`
`15`	`15`	`# __________________________________________________________________________`
`16`	`16`	`#`
`@@ -21,7 +21,7 @@`
`21`	`21`	`#`
`22`	`22`	`# It is meant for training purposes only.`
`23`	`23`	`#`
`24`		`-# Removing this header ends your licence.`
	`24`	`+# Removing this header ends your license.`
`25`	`25`	`#`
`26`	`26`
`27`	`27`	`from .base import *`