Rev 780 | Rev 808 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 780 | Rev 802 | ||
---|---|---|---|
Line 47... | Line 47... | ||
47 | mModel = NULL; |
47 | mModel = NULL; |
48 | mPaused = false; |
48 | mPaused = false; |
49 | mRunning = false; |
49 | mRunning = false; |
50 | mYearsToRun = 0; |
50 | mYearsToRun = 0; |
51 | mViewerWindow = 0; |
51 | mViewerWindow = 0; |
- | 52 | mDynamicOutputEnabled = false; |
|
52 | }
|
53 | }
|
53 | 54 | ||
54 | ModelController::~ModelController() |
55 | ModelController::~ModelController() |
55 | {
|
56 | {
|
56 | destroy(); |
57 | destroy(); |
Line 363... | Line 364... | ||
363 | mDynFieldList.prepend("count"); |
364 | mDynFieldList.prepend("count"); |
364 | mDynFieldList.prepend("year"); // fixed fields. |
365 | mDynFieldList.prepend("year"); // fixed fields. |
365 | }
|
366 | }
|
366 | mDynData.clear(); |
367 | mDynData.clear(); |
367 | mDynData.append(mDynFieldList.join(";")); |
368 | mDynData.append(mDynFieldList.join(";")); |
- | 369 | mDynamicOutputEnabled = true; |
|
368 | }
|
370 | }
|
369 | 371 | ||
370 | QString ModelController::dynamicOutput() |
372 | QString ModelController::dynamicOutput() |
371 | {
|
373 | {
|
372 | return mDynData.join("\n"); |
374 | return mDynData.join("\n"); |
373 | }
|
375 | }
|
374 | 376 | ||
375 | const QStringList aggList = QStringList() << "mean" << "sum" << "min" << "max" << "p25" << "p50" << "p75" << "p5"<< "p10" << "p90" << "p95"; |
377 | const QStringList aggList = QStringList() << "mean" << "sum" << "min" << "max" << "p25" << "p50" << "p75" << "p5"<< "p10" << "p90" << "p95"; |
376 | void ModelController::fetchDynamicOutput() |
378 | void ModelController::fetchDynamicOutput() |
377 | {
|
379 | {
|
378 | if (mDynFieldList.isEmpty()) |
- | |
- | 380 | if (!mDynamicOutputEnabled || mDynFieldList.isEmpty()) |
|
379 | return; |
381 | return; |
380 | DebugTimer t("dynamic output"); |
382 | DebugTimer t("dynamic output"); |
381 | QStringList var;
|
383 | QStringList var;
|
382 | QString lastVar = ""; |
384 | QString lastVar = ""; |
383 | QVector<double> data; |
385 | QVector<double> data; |