WebSVN - public iLand - Diff - Rev 989 and 994 - /src/ilandc/consoleshell.cpp



    // get the number of years to run...
    bool ok;
    int years = QCoreApplication::arguments().at(2).toInt(&ok);
    if (years<0 || !ok) {
        qDebug() << QCoreApplication::arguments().at(2) << "is an invalid number of years to run!";
        QCoreApplication::quit();
        return;
    }

    if (!QFile::exists(xml_name)) {
        qDebug() << "invalid XML project file: " << xml_name;
        QCoreApplication::quit();
        return;
    }
    try {

        ModelController iland_model;

        iland_model.setFileName(xml_name);
        if (iland_model.hasError()) {
            qWarning() << "!!!! ERROR !!!!";
            qWarning() << iland_model.lastError();
            qWarning() << "!!!! ERROR !!!!";
            QCoreApplication::quit();
            return;
        }

        setupLogging();
        mParams.clear();

            for (int i=3;i<QCoreApplication::arguments().count();++i) {
                QString line = QCoreApplication::arguments().at(i);
                mParams.append(line);
                QString key = line.left(line.indexOf('='));
                QString value = line.mid(line.indexOf('=')+1);
 
                const_cast<XmlHelper&>(GlobalSettings::instance()->settings()).setNodeValue(key, value);
                qWarning() << "set" << key << "to value:" << value << "(set:" << GlobalSettings::instance()->settings().value(key) << ").";
            }
        }
        qDebug() << "**************************************************";
        qDebug() << "***********     iLand console session     ********";
        qDebug() << "**************************************************";

        iland_model.create();
        if (iland_model.hasError()) {
            qWarning() << "!!!! ERROR !!!!";
            qWarning() << iland_model.lastError();
            qWarning() << "!!!! ERROR !!!!";
            QCoreApplication::quit();
            return;
        }
        runJavascript("onCreate");
        qWarning() << "**************************************************";
        qWarning() << "*** running model for" << years << "years";

        iland_model.run(years + 1);
        if (iland_model.hasError()) {
            qWarning() << "!!!! ERROR !!!!";
            qWarning() << iland_model.lastError();
            qWarning() << "!!!! ERROR !!!!";
            QCoreApplication::quit();
            return;
        }
        runJavascript("onFinish");

        qWarning() << "**************************************************";

Rev 989	Rev 994
Line 66...	Line 66...
66	// get the number of years to run...	66	// get the number of years to run...
67	bool ok;	67	bool ok;
68	int years = QCoreApplication::arguments().at(2).toInt(&ok);	68	int years = QCoreApplication::arguments().at(2).toInt(&ok);
69	if (years<0 \|\| !ok) {	69	if (years<0 \|\| !ok) {
70	qDebug() << QCoreApplication::arguments().at(2) << "is an invalid number of years to run!";	70	qDebug() << QCoreApplication::arguments().at(2) << "is an invalid number of years to run!";
-		71	QCoreApplication::quit();
71	return;	72	return;
72	}	73	}
73		74
74	if (!QFile::exists(xml_name)) {	75	if (!QFile::exists(xml_name)) {
75	qDebug() << "invalid XML project file: " << xml_name;	76	qDebug() << "invalid XML project file: " << xml_name;
-		77	QCoreApplication::quit();
76	return;	78	return;
77	}	79	}
78	try {	80	try {
79		81
80	ModelController iland_model;	82	ModelController iland_model;
Line 82...	Line 84...
82	iland_model.setFileName(xml_name);	84	iland_model.setFileName(xml_name);
83	if (iland_model.hasError()) {	85	if (iland_model.hasError()) {
84	qWarning() << "!!!! ERROR !!!!";	86	qWarning() << "!!!! ERROR !!!!";
85	qWarning() << iland_model.lastError();	87	qWarning() << iland_model.lastError();
86	qWarning() << "!!!! ERROR !!!!";	88	qWarning() << "!!!! ERROR !!!!";
-		89	QCoreApplication::quit();
87	return;	90	return;
88	}	91	}
89		92
90	setupLogging();	93	setupLogging();
91	mParams.clear();	94	mParams.clear();
Line 94...	Line 97...
94	for (int i=3;i<QCoreApplication::arguments().count();++i) {	97	for (int i=3;i<QCoreApplication::arguments().count();++i) {
95	QString line = QCoreApplication::arguments().at(i);	98	QString line = QCoreApplication::arguments().at(i);
96	mParams.append(line);	99	mParams.append(line);
97	QString key = line.left(line.indexOf('='));	100	QString key = line.left(line.indexOf('='));
98	QString value = line.mid(line.indexOf('=')+1);	101	QString value = line.mid(line.indexOf('=')+1);
99	qWarning() << "set" << key << "to value:" << value;	-
100	const_cast<XmlHelper&>(GlobalSettings::instance()->settings()).setNodeValue(key, value);	102	const_cast<XmlHelper&>(GlobalSettings::instance()->settings()).setNodeValue(key, value);
-		103	qWarning() << "set" << key << "to value:" << value << "(set:" << GlobalSettings::instance()->settings().value(key) << ").";
101	}	104	}
102	}	105	}
103	qDebug() << "**************************************************";	106	qDebug() << "**************************************************";
104	qDebug() << "********* iLand console session ******";	107	qDebug() << "********* iLand console session ******";
105	qDebug() << "**************************************************";	108	qDebug() << "**************************************************";
Line 113...	Line 116...
113	iland_model.create();	116	iland_model.create();
114	if (iland_model.hasError()) {	117	if (iland_model.hasError()) {
115	qWarning() << "!!!! ERROR !!!!";	118	qWarning() << "!!!! ERROR !!!!";
116	qWarning() << iland_model.lastError();	119	qWarning() << iland_model.lastError();
117	qWarning() << "!!!! ERROR !!!!";	120	qWarning() << "!!!! ERROR !!!!";
-		121	QCoreApplication::quit();
118	return;	122	return;
119	}	123	}
120	runJavascript("onCreate");	124	runJavascript("onCreate");
121	qWarning() << "**************************************************";	125	qWarning() << "**************************************************";
122	qWarning() << "*** running model for" << years << "years";	126	qWarning() << "*** running model for" << years << "years";
Line 125...	Line 129...
125	iland_model.run(years + 1);	129	iland_model.run(years + 1);
126	if (iland_model.hasError()) {	130	if (iland_model.hasError()) {
127	qWarning() << "!!!! ERROR !!!!";	131	qWarning() << "!!!! ERROR !!!!";
128	qWarning() << iland_model.lastError();	132	qWarning() << iland_model.lastError();
129	qWarning() << "!!!! ERROR !!!!";	133	qWarning() << "!!!! ERROR !!!!";
-		134	QCoreApplication::quit();
130	return;	135	return;
131	}	136	}
132	runJavascript("onFinish");	137	runJavascript("onFinish");
133		138
134	qWarning() << "**************************************************";	139	qWarning() << "**************************************************";

Subversion Repositories public iLand

(root)/src/ilandc/consoleshell.cpp @ 1222 - Rev 989 → 994