[python] Turtle module

apps/code/catalog.de.i18n

@@ -47,10 +47,12 @@ PythonImportCmath = "Import cmath module"
 PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
+PythonImportTurtle = "Import turtle module"
 PythonImportFromCmath = "Import cmath module"
 PythonImportFromKandinsky = "Import kandinsky module"
 PythonImportFromRandom = "Import random module"
 PythonImportFromMath = "Import math module"
+PythonImportFromTurtle = "Import turtle module"
 PythonInput = "Prompt a value"
 PythonInt = "Convert x to an integer"
 PythonIsFinite = "Check if x is finite"
@@ -92,4 +94,16 @@ PythonSum = "Sum the items of a list"
 PythonTan = "Tangent"
 PythonTanh = "Hyperbolic tangent"
 PythonTrunc = "x truncated to an integer"
+PythonTurtleFunction = "turtle module function prefix"
+PythonTurtleForward = "Move the turtle forward"
+PythonTurtleBackward = "Move the turtle backward"
+PythonTurtleLeft = "Turn turtle to the left"
+PythonTurtleRight = "Turn turtle to the right"
+PythonTurtlePosition = "Get turtle position"
+PythonTurtleSetposition = "Set turtle position"
+PythonTurtleHeading = "Get turtle angle"
+PythonTurtleSetheading = "Set turtle angle"
+PythonTurtleSpeed = "Set turtle speed"
+PythonTurtlePencolor = "Set pen color"
+PythonTurtlePensize = "Get/Set pen width"
 PythonUniform = "Floating point number in [a,b]"

apps/code/catalog.en.i18n

@@ -47,10 +47,12 @@ PythonImportCmath = "Import cmath module"
 PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
+PythonImportTurtle = "Import turtle module"
 PythonImportFromCmath = "Import cmath module"
 PythonImportFromKandinsky = "Import kandinsky module"
 PythonImportFromRandom = "Import random module"
 PythonImportFromMath = "Import math module"
+PythonImportFromTurtle = "Import turtle module"
 PythonInput = "Prompt a value"
 PythonInt = "Convert x to an integer"
 PythonIsFinite = "Check if x is finite"
@@ -92,4 +94,16 @@ PythonSum = "Sum the items of a list"
 PythonTan = "Tangent"
 PythonTanh = "Hyperbolic tangent"
 PythonTrunc = "x truncated to an integer"
+PythonTurtleFunction = "turtle module function prefix"
+PythonTurtleForward = "Move the turtle forward"
+PythonTurtleBackward = "Move the turtle backward"
+PythonTurtleLeft = "Turn turtle to the left"
+PythonTurtleRight = "Turn turtle to the right"
+PythonTurtlePosition = "Get turtle position"
+PythonTurtleSetposition = "Set turtle position"
+PythonTurtleHeading = "Get turtle angle"
+PythonTurtleSetheading = "Set turtle angle"
+PythonTurtleSpeed = "Set turtle speed"
+PythonTurtlePencolor = "Set pen color"
+PythonTurtlePensize = "Get/Set pen width"
 PythonUniform = "Floating point number in [a,b]"

apps/code/catalog.es.i18n

@@ -47,10 +47,12 @@ PythonImportCmath = "Import cmath module"
 PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
+PythonImportTurtle = "Import turtle module"
 PythonImportFromCmath = "Import cmath module"
 PythonImportFromKandinsky = "Import kandinsky module"
 PythonImportFromRandom = "Import random module"
 PythonImportFromMath = "Import math module"
+PythonImportFromTurtle = "Import turtle module"
 PythonInput = "Prompt a value"
 PythonInt = "Convert x to an integer"
 PythonIsFinite = "Check if x is finite"
@@ -92,4 +94,16 @@ PythonSum = "Sum the items of a list"
 PythonTan = "Tangent"
 PythonTanh = "Hyperbolic tangent"
 PythonTrunc = "x truncated to an integer"
+PythonTurtleFunction = "turtle module function prefix"
+PythonTurtleForward = "Move the turtle forward"
+PythonTurtleBackward = "Move the turtle backward"
+PythonTurtleLeft = "Turn turtle to the left"
+PythonTurtleRight = "Turn turtle to the right"
+PythonTurtlePosition = "Get turtle position"
+PythonTurtleSetposition = "Set turtle position"
+PythonTurtleHeading = "Get turtle angle"
+PythonTurtleSetheading = "Set turtle angle"
+PythonTurtleSpeed = "Set turtle speed"
+PythonTurtlePencolor = "Set pen color"
+PythonTurtlePensize = "Get/Set pen width"
 PythonUniform = "Floating point number in [a,b]"

apps/code/catalog.fr.i18n

@@ -47,10 +47,12 @@ PythonImportCmath = "Importation du module cmath"
 PythonImportKandinsky = "Importation du module kandinsky"
 PythonImportRandom = "Importation du module random"
 PythonImportMath = "Importation du module math"
+PythonImportTurtle = "Importation du module turtle"
 PythonImportFromCmath = "Importation du module cmath"
 PythonImportFromKandinsky = "Importation du module kandinsky"
 PythonImportFromRandom = "Importation du module random"
 PythonImportFromMath = "Importation du module math"
+PythonImportFromTurtle = "Importation du module turtle"
 PythonInput = "Entrer une valeur"
 PythonInt = "Conversion en entier"
 PythonIsFinite = "Teste si x est fini"
@@ -92,4 +94,16 @@ PythonSum = "Somme des éléments d'une liste"
 PythonTan = "Tangente"
 PythonTanh = "Tangente hyperbolique"
 PythonTrunc = "Troncature entière"
+PythonTurtleFunction = "Préfixe fonction du module math"
+PythonTurtleForward = "Avance la tortue"
+PythonTurtleBackward = "Recule la tortue"
+PythonTurtleLeft = "Tourne la tortue à gauche"
+PythonTurtleRight = "Tourne la tortue à droite"
+PythonTurtlePosition = "Position de la tortue"
+PythonTurtleSetposition = "Positionne la tortue"
+PythonTurtleHeading = "Direction de la tortue"
+PythonTurtleSetheading = "Tourne la tortue"
+PythonTurtleSpeed = "Vitesse de la tortue"
+PythonTurtlePencolor = "Couleur du crayon"
+PythonTurtlePensize = "Largeur du crayon"
 PythonUniform = "Nombre décimal dans [a,b]"

apps/code/catalog.pt.i18n

@@ -47,10 +47,12 @@ PythonImportCmath = "Import cmath module"
 PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
+PythonImportTurtle = "Import turtle module"
 PythonImportFromCmath = "Import cmath module"
 PythonImportFromKandinsky = "Import kandinsky module"
 PythonImportFromRandom = "Import random module"
 PythonImportFromMath = "Import math module"
+PythonImportFromTurtle = "Import turtle module"
 PythonInput = "Prompt a value"
 PythonInt = "Convert x to an integer"
 PythonIsFinite = "Check if x is finite"
@@ -92,4 +94,16 @@ PythonSum = "Sum the items of a list"
 PythonTan = "Tangent"
 PythonTanh = "Hyperbolic tangent"
 PythonTrunc = "x truncated to an integer"
+PythonTurtleFunction = "turtle module function prefix"
+PythonTurtleForward = "Move the turtle forward"
+PythonTurtleBackward = "Move the turtle backward"
+PythonTurtleLeft = "Turn turtle to the left"
+PythonTurtleRight = "Turn turtle to the right"
+PythonTurtlePosition = "Get turtle position"
+PythonTurtleSetposition = "Set turtle position"
+PythonTurtleHeading = "Get turtle angle"
+PythonTurtleSetheading = "Set turtle angle"
+PythonTurtleSpeed = "Set turtle speed"
+PythonTurtlePencolor = "Set pen color"
+PythonTurtlePensize = "Get/Set pen width"
 PythonUniform = "Floating point number in [a,b]"

apps/code/catalog.universal.i18n

@@ -47,11 +47,13 @@ PythonCommandImportFromCmath = "from cmath import *"
 PythonCommandImportFromMath = "from math import *"
 PythonCommandImportFromKandinsky = "from kandinsky import *"
 PythonCommandImportFromRandom = "from random import *"
+PythonCommandImportFromTurtle = "from turtle import *"
 PythonCommandHex = "hex(x)"
 PythonCommandImportCmath = "import cmath"
 PythonCommandImportKandinsky = "import kandinsky"
 PythonCommandImportRandom = "import random"
 PythonCommandImportMath = "import math"
+PythonCommandImportTurtle = "import turtle"
 PythonCommandInput = "input(\"text\")"
 PythonCommandInt = "int(x)"
 PythonCommandIsFinite = "isfinite(x)"
@@ -96,6 +98,19 @@ PythonCommandSorted = "sorted(list)"
 PythonCommandSqrt = "sqrt(x)"
 PythonCommandSqrtComplex = "sqrt(z)"
 PythonCommandSum = "sum(list)"
+PythonCommandTurtleFunction = "turtle.function"
+PythonCommandTurtleFunctionWithoutArg = "turtle.ø"
+PythonTurtleCommandForward = "forward(d)"
+PythonTurtleCommandBackward = "backward(d)"
+PythonTurtleCommandLeft = "left(a)"
+PythonTurtleCommandRight = "right(a)"
+PythonTurtleCommandPosition = "position()"
+PythonTurtleCommandSetposition = "setposition(x, [y])"
+PythonTurtleCommandHeading = "heading()"
+PythonTurtleCommandSetheading = "setheading(a)"
+PythonTurtleCommandSpeed = "speed(s)"
+PythonTurtleCommandPencolor = "pencolor(r, g, b)"
+PythonTurtleCommandPensize = "pensize([w])"
 PythonCommandTan = "tan(x)"
 PythonCommandTanh = "tanh(x)"
 PythonCommandTrunc = "trunc(x)"

apps/code/console_controller.cpp

@@ -304,6 +304,13 @@ void ConsoleController::displaySandbox() {
   stackViewController()->push(&m_sandboxController);
 }
 
+void ConsoleController::resetSandbox() {
+  if (!m_sandboxIsDisplayed) {
+    return;
+  }
+  m_sandboxController.reset();
+}
+
 /* printText is called by the Python machine.
  * The text argument is not always null-terminated. */
 void ConsoleController::printText(const char * text, size_t length) {

apps/code/console_controller.h

@@ -64,6 +64,7 @@ class ConsoleController : public ViewController, public ListViewDataSource, publ
 
   // MicroPython::ExecutionEnvironment
   void displaySandbox() override;
+  void resetSandbox() override;
   void printText(const char * text, size_t length) override;
   const char * inputText(const char * prompt) override;
 

apps/code/python_toolbox.cpp

@@ -13,13 +13,15 @@ static constexpr int MathModuleChildrenCount = 43;
 static constexpr int KandinskyModuleChildrenCount = 7;
 static constexpr int CMathModuleChildrenCount = 13;
 static constexpr int RandomModuleChildrenCount = 10;
+static constexpr int TurtleModuleChildrenCount = 14;
+
 static constexpr int conditionsChildrenCount = 9;
 static constexpr int forLoopChildrenCount = 4;
 static constexpr int functionsChildrenCount = 2;
 static constexpr int ifStatementChildrenCount = 5;
 static constexpr int loopsAndTestsChildrenCount = 4;
 static constexpr int menuChildrenCount = 4;
-static constexpr int modulesChildrenCount = 4;
+static constexpr int modulesChildrenCount = 5;
 static constexpr int whileLoopChildrenCount = 1;
 
 
@@ -138,11 +140,29 @@ const ToolboxMessageTree CMathModuleChildren[CMathModuleChildrenCount] = {
   ToolboxMessageTree(I18n::Message::PythonCommandCosComplex, I18n::Message::PythonCos, I18n::Message::PythonCommandCos),
   ToolboxMessageTree(I18n::Message::PythonCommandSinComplex, I18n::Message::PythonSin, I18n::Message::PythonCommandSin)};
 
+const ToolboxMessageTree TurtleModuleChildren[TurtleModuleChildrenCount] = {
+  ToolboxMessageTree(I18n::Message::PythonCommandImportTurtle, I18n::Message::PythonImportTurtle, I18n::Message::PythonCommandImportTurtle),
+  ToolboxMessageTree(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportFromTurtle, I18n::Message::PythonCommandImportFromTurtle),
+  ToolboxMessageTree(I18n::Message::PythonCommandTurtleFunction, I18n::Message::PythonTurtleFunction, I18n::Message::PythonCommandTurtleFunctionWithoutArg),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandForward, I18n::Message::PythonTurtleForward, I18n::Message::PythonTurtleCommandForward),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandBackward, I18n::Message::PythonTurtleBackward, I18n::Message::PythonTurtleCommandBackward),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandLeft, I18n::Message::PythonTurtleLeft, I18n::Message::PythonTurtleCommandLeft),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandRight, I18n::Message::PythonTurtleRight, I18n::Message::PythonTurtleCommandRight),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandPosition, I18n::Message::PythonTurtlePosition, I18n::Message::PythonTurtleCommandPosition),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandSetposition, I18n::Message::PythonTurtleSetposition, I18n::Message::PythonTurtleCommandSetposition),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandHeading, I18n::Message::PythonTurtleHeading, I18n::Message::PythonTurtleCommandHeading),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandSetheading, I18n::Message::PythonTurtleSetheading, I18n::Message::PythonTurtleCommandSetheading),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandSpeed, I18n::Message::PythonTurtleSpeed, I18n::Message::PythonTurtleCommandSpeed),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandPencolor, I18n::Message::PythonTurtlePencolor, I18n::Message::PythonTurtleCommandPencolor),
+  ToolboxMessageTree(I18n::Message::PythonTurtleCommandPensize, I18n::Message::PythonTurtlePensize, I18n::Message::PythonTurtleCommandPensize)};
+
+
 const ToolboxMessageTree modulesChildren[modulesChildrenCount] = {
   ToolboxMessageTree(I18n::Message::MathModule, I18n::Message::Default, I18n::Message::Default, MathModuleChildren, MathModuleChildrenCount),
   ToolboxMessageTree(I18n::Message::CmathModule, I18n::Message::Default, I18n::Message::Default, CMathModuleChildren, CMathModuleChildrenCount),
   ToolboxMessageTree(I18n::Message::RandomModule, I18n::Message::Default, I18n::Message::Default, RandomModuleChildren, RandomModuleChildrenCount),
-  ToolboxMessageTree(I18n::Message::KandinskyModule, I18n::Message::Default, I18n::Message::Default, KandinskyModuleChildren, KandinskyModuleChildrenCount)};
+  ToolboxMessageTree(I18n::Message::KandinskyModule, I18n::Message::Default, I18n::Message::Default, KandinskyModuleChildren, KandinskyModuleChildrenCount),
+  ToolboxMessageTree(I18n::Message::TurtleModule, I18n::Message::Default, I18n::Message::Default, TurtleModuleChildren, TurtleModuleChildrenCount)};
 
 const ToolboxMessageTree catalogChildren[catalogChildrenCount] = {
   ToolboxMessageTree(I18n::Message::PythonCommandPound, I18n::Message::PythonPound, I18n::Message::PythonCommandPound),

apps/code/sandbox_controller.cpp

@@ -13,8 +13,13 @@ StackViewController * SandboxController::stackViewController() {
   return static_cast<StackViewController *>(parentResponder());
 }
 
+void SandboxController::reset() {
+  m_solidColorView.reload();
+  redrawWindow();
+}
+
 void SandboxController::viewWillAppear() {
-  static_cast<AppsContainer *>(const_cast<Container *>(app()->container()))->redrawWindow();
+  redrawWindow();
 }
 
 bool SandboxController::handleEvent(Ion::Events::Event event) {
@@ -28,4 +33,8 @@ bool SandboxController::handleEvent(Ion::Events::Event event) {
   return true;
 }
 
+void SandboxController::redrawWindow() {
+  static_cast<AppsContainer *>(const_cast<Container *>(app()->container()))->redrawWindow();
+}
+
 }

apps/code/sandbox_controller.h

@@ -12,6 +12,7 @@ class SandboxController : public ViewController {
 public:
   SandboxController(Responder * parentResponder);
   StackViewController * stackViewController();
+  void reset();
 
   // ViewController
   View * view() override { return &m_solidColorView; }
@@ -20,6 +21,7 @@ class SandboxController : public ViewController {
   ViewController::DisplayParameter displayParameter() override { return ViewController::DisplayParameter::WantsMaximumSpace; }
 
 private:
+  void redrawWindow();
   SolidColorView m_solidColorView;
 };
 }

apps/code/script_store.cpp

@@ -17,6 +17,8 @@ ScriptStore::ScriptStore()
   addScriptFromTemplate(ScriptTemplate::Factorial());
   addScriptFromTemplate(ScriptTemplate::Mandelbrot());
   addScriptFromTemplate(ScriptTemplate::Polynomial());
+  addScriptFromTemplate(ScriptTemplate::Spiral());
+  addScriptFromTemplate(ScriptTemplate::Koch());
 }
 
 void ScriptStore::deleteAllScripts() {

apps/code/script_template.cpp

@@ -60,6 +60,39 @@ def roots(a,b,c):
   else:
     return None)");
 
+constexpr ScriptTemplate spiralScriptTemplate("spiral.py", "\x01" R"(from turtle import *
+def spiral(N_iteration):
+  N_iteration *= 25
+  for i in range(N_iteration):
+# Change pen color
+    gray=255-(i*255/N_iteration)
+    pencolor(int(gray),int(gray*0.75),int(gray*0.25))
+# Draw a segment of the spiral
+    forward(i*0.1)
+    left(10))");
+
+constexpr ScriptTemplate kochScriptTemplate("koch.py", "\x01" R"(from turtle import *
+def koch(N_iteration):
+# Save pencil size and set it to 1
+  prevSize = pensize()
+  pensize(1)
+# Define inner function for recursion
+  def _koch(n, l):
+    if n == 1:
+      forward(l)
+    else:
+      _koch(n-1,l/3)
+      left(60)
+      _koch(n-1,l/3)
+      right(120)
+      _koch(n-1,l/3)
+      left(60)
+      _koch(n-1,l/3)
+# Call inner function
+  _koch(N_iteration,140)
+# Restore pencil size
+  pensize(prevSize))");
+
 const ScriptTemplate * ScriptTemplate::Empty() {
   return &emptyScriptTemplate;
 }
@@ -80,6 +113,14 @@ const ScriptTemplate * ScriptTemplate::Polynomial() {
   return &polynomialScriptTemplate;
 }
 
+const ScriptTemplate * ScriptTemplate::Spiral() {
+  return &spiralScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Koch() {
+  return &kochScriptTemplate;
+}
+
 }
 
 

apps/code/script_template.h

@@ -11,6 +11,8 @@ class ScriptTemplate {
   static const ScriptTemplate * Fibonacci();
   static const ScriptTemplate * Mandelbrot();
   static const ScriptTemplate * Polynomial();
+  static const ScriptTemplate * Spiral();
+  static const ScriptTemplate * Koch();
   const char * name() const { return m_name; }
   const char * content() const { return m_value+1; }
   const char * value() const { return m_value; }

apps/code/toolbox.universal.i18n

@@ -1,6 +1,7 @@
 MathModule = "math"
 CmathModule = "cmath"
 KandinskyModule = "kandinsky"
+TurtleModule = "turtle"
 ForLoopMenu = "For"
 IfStatementMenu = "If"
 WhileLoopMenu = "While"

build/toolchain.emscripten.mak

@@ -64,7 +64,7 @@ _fun_bc_call \
 _fun_builtin_var_call \
 _main \
 _micropython_port_interruptible_msleep \
-_micropython_port_should_interrupt \
+_micropython_port_interrupt_if_needed \
 _micropython_port_vm_hook_loop \
 _mp_builtin___import__ \
 _mp_builtin_input \

escher/include/escher/palette.h

@@ -30,6 +30,8 @@ class Palette {
   constexpr static KDColor Orange = KDColor::RGB24(0xfe871f);
   constexpr static KDColor Green = KDColor::RGB24(0x50c102);
   constexpr static KDColor GreenLight = KDColor::RGB24(0x52db8f);
+  constexpr static KDColor Brown = KDColor::RGB24(0x8d7350);
+  constexpr static KDColor Purple = KDColor::RGB24(0x6e2d79);
   constexpr static KDColor DataColor[] = {Red, Blue, Green, YellowDark};
   constexpr static KDColor DataColorLight[] = {RedLight, BlueLight, GreenLight, YellowLight};
 };