UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps][python] ExecutionEnvironment handles hide sand display of sandbox

Browse Source 
and plot controller the same way
This commit is contained in:
Émilie Feral
2020-03-20 13:38:27 +01:00
parent 51da01aa11
commit 659da1dff8
8 changed files with 81 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
apps/code/console_controller.cpp
View File

@@ -104,9 +104,7 @@ const char * ConsoleController::inputText(const char * prompt) {
m_inputRunLoopActive = true;
// Hide the sandbox if it is displayed
if (sandboxIsDisplayed()) {
hideSandbox();
}
hideAnyDisplayedViewController();
const char * promptText = prompt;
char * s = const_cast<char *>(prompt);
@@ -180,10 +178,6 @@ const char * ConsoleController::inputText(const char * prompt) {
return text;
}
void ConsoleController::displayViewController(ViewController * controller) {
stackViewController()->push(controller);
}
void ConsoleController::viewWillAppear() {
ViewController::viewWillAppear();
loadPythonEnvironment();
@@ -192,12 +186,12 @@ void ConsoleController::viewWillAppear() {
autoImport();
}
Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME
//Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME
m_selectableTableView.reloadData();
m_selectableTableView.selectCellAtLocation(0, m_consoleStore.numberOfLines());
m_editCell.setEditing(true);
m_editCell.setText("");
Container::activeApp()->setFirstResponder(firstResponder); // FIXME
//Container::activeApp()->setFirstResponder(firstResponder); // FIXME
}
void ConsoleController::didBecomeFirstResponder() {
@@ -350,14 +344,15 @@ bool ConsoleController::textFieldDidFinishEditing(TextField * textField, const c
}
telemetryReportEvent("Console", text);
runAndPrintForCommand(text);
Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME
if (!sandboxIsDisplayed()) {
//Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME
if (viewControllerIsDisplayed(nullptr)) {
// TODO factorize
m_selectableTableView.reloadData();
m_editCell.setEditing(true);
textField->setText("");
m_selectableTableView.selectCellAtLocation(0, m_consoleStore.numberOfLines());
}
Container::activeApp()->setFirstResponder(firstResponder); // FIXME
//Container::activeApp()->setFirstResponder(firstResponder); // FIXME
return true;
}
@@ -383,29 +378,29 @@ bool ConsoleController::textFieldDidAbortEditing(TextField * textField) {
return true;
}
void ConsoleController::displaySandbox() {
if (sandboxIsDisplayed()) {
return;
}
stackViewController()->push(&m_sandboxController);
}
void ConsoleController::hideSandbox() {
if (!sandboxIsDisplayed()) {
return;
}
m_sandboxController.hide();
}
void ConsoleController::resetSandbox() {
if (!sandboxIsDisplayed()) {
if (!viewControllerIsDisplayed(sandbox())) {
return;
}
m_sandboxController.reset();
}
void ConsoleController::displayViewController(ViewController * controller) {
if (m_displayedViewController == controller) {
return;
}
stackViewController()->push(controller);
}
void ConsoleController::hideAnyDisplayedViewController() {
if (m_displayedViewController == nullptr) {
return;
}
stackViewController()->pop();
}
void ConsoleController::refreshPrintOutput() {
if (sandboxIsDisplayed()) {
if (!viewControllerIsDisplayed(nullptr)) { // Displaying a controller
return;
}
m_selectableTableView.reloadData();
@@ -461,12 +456,11 @@ void ConsoleController::printText(const char * text, size_t length) {
}
void ConsoleController::autoImportScript(Script script, bool force) {
if (sandboxIsDisplayed()) {
/* The sandbox might be displayed, for instance if we are auto-importing
* several scripts that draw at importation. In this case, we want to remove
* the sandbox. */
hideSandbox();
}
/* The sandbox might be displayed, for instance if we are auto-importing
* several scripts that draw at importation. In this case, we want to remove
* the sandbox. */
hideAnyDisplayedViewController();
if (script.importationStatus() || force) {
// Step 1 - Create the command "from scriptName import *".
@@ -492,13 +486,13 @@ void ConsoleController::autoImportScript(Script script, bool force) {
// Step 2 - Run the command
runAndPrintForCommand(command);
}
if (!sandboxIsDisplayed() && force) {
Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME
if (viewControllerIsDisplayed(nullptr) && force) {
//Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME
m_selectableTableView.reloadData();
m_selectableTableView.selectCellAtLocation(0, m_consoleStore.numberOfLines());
m_editCell.setEditing(true);
m_editCell.setText("");
Container::activeApp()->setFirstResponder(firstResponder); // FIXME
//Container::activeApp()->setFirstResponder(firstResponder); // FIXME
}
}