From 75017dbaac6328ccc0a1747ec5d1cdf3fd034109 Mon Sep 17 00:00:00 2001 From: Alberto Casas Ortiz Date: Fri, 18 Dec 2020 00:30:59 -0700 Subject: [PATCH] Scaled values in time-dist-sgv so it can be visualized in QCharts. --- .../model/executables/time_dist/time_dist.cpp | 24 +++++++++---------- .../visualization/charts/chartResults.cpp | 4 ++-- .../components/windows/chartVisualization.qml | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wfes-lib/source/model/executables/time_dist/time_dist.cpp b/wfes-lib/source/model/executables/time_dist/time_dist.cpp index e76d610..0bbc3fc 100644 --- a/wfes-lib/source/model/executables/time_dist/time_dist.cpp +++ b/wfes-lib/source/model/executables/time_dist/time_dist.cpp @@ -236,22 +236,22 @@ ResultsTimeDist *time_dist::timeDistSGV() { cdf += P_abs_t; PH(i, 0) = i + 1; - PH(i, 1) = P_abs_t; - PH(i, 2) = cdf; + PH(i, 1) = P_abs_t * 10e20; + PH(i, 2) = cdf * 10e20; c = wf.Q->multiply(c, true); // This is for chart visualization. - subs.append(QPointF(i + 1, P_abs_t)); - acum.append(QPointF(i + 1, cdf)); - if(minSubs >= P_abs_t) - minSubs = P_abs_t; - if(maxSubs <= P_abs_t) - maxSubs = P_abs_t; - if(minAcum >= cdf) - minAcum = cdf; - if(maxAcum <= cdf) - maxAcum = cdf; + subs.append(QPointF(i + 1, P_abs_t * 10e20)); + acum.append(QPointF(i + 1, cdf * 10e20)); + if(minSubs >= P_abs_t * 10e20) + minSubs = P_abs_t * 10e20; + if(maxSubs <= P_abs_t * 10e20) + maxSubs = P_abs_t * 10e20; + if(minAcum >= cdf * 10e20) + minAcum = cdf * 10e20; + if(maxAcum <= cdf * 10e20) + maxAcum = cdf * 10e20; // This is for chart visualization. } PH.conservativeResize(i, 3); diff --git a/wfes-lib/source/model/visualization/charts/chartResults.cpp b/wfes-lib/source/model/visualization/charts/chartResults.cpp index e499755..23cc383 100644 --- a/wfes-lib/source/model/visualization/charts/chartResults.cpp +++ b/wfes-lib/source/model/visualization/charts/chartResults.cpp @@ -261,7 +261,7 @@ void ChartResults::saveChartSVG(QString title, bool log, QString filePath, QStri series->attachAxis(axisY); series2->attachAxis(axisY); } else if (title.compare("Time Dist. SGV Sub.") == 0) { - chart->setTitle("Time Dist. SGV"); + chart->setTitle("Time Dist. SGV (scaled x10e20)"); // Append series. series->append(this->timeDistSGVSub); @@ -280,7 +280,7 @@ void ChartResults::saveChartSVG(QString title, bool log, QString filePath, QStri chart->addAxis(axisY, Qt::AlignLeft); series->attachAxis(axisY); } else if (title.compare("Time Dist. SGV Acum.") == 0) { - chart->setTitle("Time Dist. SGV"); + chart->setTitle("Time Dist. SGV (scaled x10e20)"); // Append series. series->append(this->timeDistSGVAcum); diff --git a/wfes-ui/components/windows/chartVisualization.qml b/wfes-ui/components/windows/chartVisualization.qml index 6ace6ac..ba3afba 100644 --- a/wfes-ui/components/windows/chartVisualization.qml +++ b/wfes-ui/components/windows/chartVisualization.qml @@ -487,7 +487,7 @@ ApplicationWindow { chartResults.saveChartSVG("Time Dist. Abs.", scaleButton.checked, url, "chart-" + name) } } - if(chart1Linear.title == "Time Dist. SGV") { + if(chart1Linear.title == "Time Dist. SGV (scaled x10e20)") { if(chart1Linear.visible || chart1Log.visible) { name = "time-dist-sgv-sub"; chartResults.saveChartSVG("Time Dist. SGV Sub.", scaleButton.checked, url, "chart-" + name) @@ -764,7 +764,7 @@ ApplicationWindow { visibleSeries(true, false, true, false, false, false) - setTitle("Time Dist. SGV") + setTitle("Time Dist. SGV (scaled x10e20)") setSeriesName("Probability of subs.", "", "Cumulative prob. of subs.", "", "", "")