WebSVN - public iLand - Diff - Rev 779 and 793

 //#include "csvfile.h"
 #include "scriptglobal.h"
 #include "mapgrid.h"
 //#include "modules.h"
-#include <QtScript>
+#include <QJSEngine>
+#include <QJSValue>
 /** @class Management Management executes management routines.
   @ingroup core
   The actual iLand management is based on Javascript functions. This class provides
   the frame for executing the javascript as well as the functions that are called by scripts and
 Management::Management()
+{
     // setup the scripting engine
     mEngine = GlobalSettings::instance()->scriptEngine();
-    QScriptValue objectValue = mEngine->newQObject(this);
+    QJSValue objectValue = mEngine->newQObject(this);
     mEngine->globalObject().setProperty("management", objectValue);
     // default values for removal fractions
     // 100% of the stem, 0% of foliage and branches
     mRemoveFoliage = 0.;
             } else {
                 ++tp;
+            }
+        }
     } catch(const IException &e) {
-        context()->throwError(e.message());
+        throwError(e.message());
+    }
     return n;
+}
 // calculate aggregates for all trees in the internal list
                 ++tp;
+            }
+        }
     } catch(const IException &e) {
-        context()->throwError(e.message());
+        throwError(e.message());
+    }
     if (type=="sum")
         return sum;
     if (type=="mean")
         return n>0?sum/double(n):0.;
     return 0.;
+}
+// introduced with switch to QJSEngine (context->throwMessage not available any more)
+void Management::throwError(const QString &errormessage)
+{
+    GlobalSettings::instance()->scriptEngine()->evaluate(QString("throw '%1'").arg(errormessage));
+    // no idea if this works!!!
+}
 // from the range percentile range pctfrom to pctto (each 1..100)
 int Management::kill(int pctfrom, int pctto, int number)
 void Management::run()
+{
     mTrees.clear();
     mRemoved=0;
     qDebug() << "Management::run() called";
-    QScriptValue mgmt = mEngine->globalObject().property("manage");
+    QJSValue mgmt = mEngine->globalObject().property("manage");
     int year = GlobalSettings::instance()->currentYear();
-    mgmt.call(QScriptValue(), QScriptValueList()<<year);
-    if (mEngine->hasUncaughtException())
-        qDebug() << "Script Error occured: " << mEngine->uncaughtException().toString() << "\n" << mEngine->uncaughtExceptionBacktrace();
+    //mgmt.call(QJSValue(), QScriptValueList()<<year);
+    QJSValue result = mgmt.call(QJSValueList() << year);
+    if (result.isError())
+        qDebug() << "Script Error occured: " << result.toString();//  << "\n" << mEngine->uncaughtExceptionBacktrace();
     if (mRemoved>0) {
         foreach(ResourceUnit *ru, GlobalSettings::instance()->model()->ruList())
            ru->cleanTreeList();
+    }
                 tp = mTrees.erase(tp);
             else
                 ++tp;
+        }
     } catch(const IException &e) {
-        context()->throwError(e.message());
+        throwError(e.message());
+    }
     qDebug() << "filtering with" << filter << "N=" << n_before << "/" << mTrees.count()  << "trees (before/after filtering).";
     return mTrees.count();
+}
 // loadFromMap: script access
 void Management::loadFromMap(MapGridWrapper *wrap, int key)
+{
     if (!wrap) {
-        context()->throwError("loadFromMap called with invalid map object!");
+        throwError("loadFromMap called with invalid map object!");
         return;
+    }
     loadFromMap(wrap->map(), key);
+}
 /// @param litterFrac 0: no change, 1: remove all of soil litter
 /// @param soilFrac 0: no change, 1: remove all of soil organic matter
 void Management::removeSoilCarbon(MapGridWrapper *wrap, int key, double SWDfrac, double DWDfrac, double litterFrac, double soilFrac)
+{
     if (!(SWDfrac>=0. && SWDfrac<=1. && DWDfrac>=0. && DWDfrac<=1. && soilFrac>=0. && soilFrac<=1. && litterFrac>=0. && litterFrac<=1.)) {
-        context()->throwError(QString("removeSoilCarbon called with invalid parameters!!\nArgs: %1").arg(context()->argumentsObject().toString()));
+        throwError(QString("removeSoilCarbon called with invalid parameters!!\nArgs: ---"));
         return;
+    }
     QList<QPair<ResourceUnit*, double> > ru_areas = wrap->map()->resourceUnitAreas(key);
     double total_area = 0.;
     for (int i=0;i<ru_areas.size();++i) {
   @param slash_fraction 0: no change, 1: 100%
    */
 void Management::slashSnags(MapGridWrapper *wrap, int key, double slash_fraction)
+{
     if (slash_fraction<0 || slash_fraction>1) {
-        context()->throwError(QString("slashSnags called with invalid parameters!!\nArgs: %1").arg(context()->argumentsObject().toString()));
+        throwError(QString("slashSnags called with invalid parameters!!\nArgs: ...."));
         return;
+    }
     QList<QPair<ResourceUnit*, double> > ru_areas = wrap->map()->resourceUnitAreas(key);
     double total_area = 0.;
     for (int i=0;i<ru_areas.size();++i) {

Subversion Repositories public iLand

(root)/src/core/management.cpp @ 1222 - Rev 779 → 793