- few Adjustments in Application class for Script editor - Shortkey for script editor (Alt+S) - highlighter: bold true/false , single line comments - Run scripts from the editor works - More icons from Maximillian, Thanks - Run on the fly checkbox, works if the script is running. - Load/save features

Thijs Wenker committed 12 years ago

Commit c016d651 parent d2d393715 files · +1160 −48Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 15 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+23−1

     return soundScriptValue;
 }
+static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
+    qDebug() << "script:print()<<" << context->argument(0).toString();
+    engine->evaluate("Script.print('"+context->argument(0).toString()+"')");
+    return QScriptValue();
+}
 ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
                            AbstractControllerScriptingInterface* controllerScriptingInterface) :
                 _scriptContents = in.readAll();
             } else {
                 qDebug() << "ERROR Loading file:" << fileName;
+                emit errorMessage("ERROR Loading file:" + fileName);
             }
         } else {
             QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);
     qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);
     qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);
+    QScriptValue printConstructorValue = _engine.newFunction(debugPrint);
+    _engine.globalObject().setProperty("print", printConstructorValue);
     QScriptValue soundConstructorValue = _engine.newFunction(soundConstructor);
     QScriptValue soundMetaObject = _engine.newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
     _engine.globalObject().setProperty("Sound", soundMetaObject);
     if (_engine.hasUncaughtException()) {
         int line = _engine.uncaughtExceptionLineNumber();
         qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
+        emit errorMessage("Uncaught exception at line" + QString::number(line) + ":" + result.toString());
     }
 }
         init();
     }
     _isRunning = true;
+    emit runningStateChanged();
     QScriptValue result = _engine.evaluate(_scriptContents);
     if (_engine.hasUncaughtException()) {
         int line = _engine.uncaughtExceptionLineNumber();
         qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
+        emit errorMessage("Uncaught exception at line" + QString::number(line) + ":" + result.toString());
     }
     timeval startTime;
         if (_engine.hasUncaughtException()) {
             int line = _engine.uncaughtExceptionLineNumber();
             qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();
+            emit errorMessage("Uncaught exception at line" + QString::number(line) + ":" + _engine.uncaughtException().toString());
         }
     }
     emit scriptEnding();
     emit finished(_fileNameString);
     _isRunning = false;
+    emit runningStateChanged();
 }
 void ScriptEngine::stop() {
     _isFinished = true;
+    emit runningStateChanged();
 }
 void ScriptEngine::timerFired() {
     return url;
 }
+void ScriptEngine::print(const QString& message) {
+    emit printedMessage(message);
+}
 void ScriptEngine::include(const QString& includeFile) {
     QUrl url = resolveInclude(includeFile);
     QString includeContents;
             includeContents = in.readAll();
         } else {
             qDebug() << "ERROR Loading file:" << fileName;
+            emit errorMessage("ERROR Loading file:" + fileName);
         }
     } else {
         QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);
     if (_engine.hasUncaughtException()) {
         int line = _engine.uncaughtExceptionLineNumber();
         qDebug() << "Uncaught exception at (" << includeFile << ") line" << line << ":" << result.toString();
+        emit errorMessage("Uncaught exception at (" + includeFile + ") line" + QString::number(line) + ":" + result.toString());
     }
 }