From 714410287ab09202bdb47ddaea26cca2bb00a88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 30 Apr 2020 16:28:05 +0200 Subject: [PATCH] [apps/code] Remove TODOs --- apps/code/console_controller.cpp | 18 +++++------------- apps/code/variable_box_controller.cpp | 1 + apps/code/variable_box_controller.h | 1 - 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/apps/code/console_controller.cpp b/apps/code/console_controller.cpp index 04cdc79c4..1ee087939 100644 --- a/apps/code/console_controller.cpp +++ b/apps/code/console_controller.cpp @@ -47,20 +47,12 @@ ConsoleController::ConsoleController(Responder * parentResponder, App * pythonDe } bool ConsoleController::loadPythonEnvironment() { - if (m_pythonDelegate->isPythonUser(this)) { - return true; + if (!m_pythonDelegate->isPythonUser(this)) { + emptyOutputAccumulationBuffer(); + m_pythonDelegate->initPythonWithUser(this); + MicroPython::registerScriptProvider(m_scriptStore); + m_importScriptsWhenViewAppears = m_autoImportScripts; } - emptyOutputAccumulationBuffer(); - m_pythonDelegate->initPythonWithUser(this); - MicroPython::registerScriptProvider(m_scriptStore); - m_importScriptsWhenViewAppears = m_autoImportScripts; -#if 0 - //TODO LEA - /* We load functions and variables names in the variable box before running - * any other python code to avoid failling to load functions and variables - * due to memory exhaustion. */ - App::app()->variableBoxController()->loadFunctionsAndVariables(-1, nullptr, -1); -#endif return true; } diff --git a/apps/code/variable_box_controller.cpp b/apps/code/variable_box_controller.cpp index 9e658366c..8bf260cf2 100644 --- a/apps/code/variable_box_controller.cpp +++ b/apps/code/variable_box_controller.cpp @@ -375,6 +375,7 @@ bool VariableBoxController::selectLeaf(int rowIndex) { void VariableBoxController::insertTextInCaller(const char * text, int textLength) { int textLen = textLength < 0 ? strlen(text) : textLength; + constexpr int k_maxScriptObjectNameSize = 100; // Ad hoc value int commandBufferMaxSize = std::min(k_maxScriptObjectNameSize, textLen + 1); char commandBuffer[k_maxScriptObjectNameSize]; Shared::ToolboxHelpers::TextToInsertForCommandText(text, textLen, commandBuffer, commandBufferMaxSize, true); diff --git a/apps/code/variable_box_controller.h b/apps/code/variable_box_controller.h index 18a2bf4ca..3b6d44822 100644 --- a/apps/code/variable_box_controller.h +++ b/apps/code/variable_box_controller.h @@ -42,7 +42,6 @@ public: private: //TODO LEA use size_t - constexpr static int k_maxScriptObjectNameSize = 100; //TODO LEA constexpr static int k_maxNumberOfDisplayedRows = 8; // (240 - titlebar - margin)/27 //TODO LEA constexpr static int k_maxScriptNodesCount = 32; //TODO LEA constexpr static int k_totalBuiltinNodesCount = 107;