t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up "Save to Spreadsheet" command. More or less works properly now.

Browse Source
This commit is contained in:
Collin Kidder
2018-08-28 19:52:08 -04:00
parent 693e29141c
commit db4ea80bbc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/graphingwindow.cpp
+4 -2
View File
@@ -695,7 +695,7 @@ void GraphingWindow::saveSpreadsheet()
*/ */
QList<GraphParams>::iterator iter; QList<GraphParams>::iterator iter;
double xMin = 1000000000, xMax=-1000000000; double xMin = 10000000000000, xMax=-10000000000000;
int maxCount = 0; int maxCount = 0;
int numGraphs = 0; int numGraphs = 0;
for (iter = graphParams.begin(); iter != graphParams.end(); ++iter) for (iter = graphParams.begin(); iter != graphParams.end(); ++iter)
@@ -731,6 +731,7 @@ void GraphingWindow::saveSpreadsheet()
for (int j = 1; j < (maxCount - 1); j++) for (int j = 1; j < (maxCount - 1); j++)
{ {
currentX = xMin + (j * sliceSize); currentX = xMin + (j * sliceSize);
qDebug() << "X: " << currentX;
outFile->write(QString::number(currentX).toUtf8()); outFile->write(QString::number(currentX).toUtf8());
for (int k = 0; k < graphParams.count(); k++) for (int k = 0; k < graphParams.count(); k++)
{ {
@@ -763,9 +764,10 @@ void GraphingWindow::saveSpreadsheet()
double span = graphParams[k].x[indices[k] + 1] - graphParams[k].x[indices[k]]; double span = graphParams[k].x[indices[k] + 1] - graphParams[k].x[indices[k]];
double progress = (currentX - graphParams[k].x[indices[k]]) / span; double progress = (currentX - graphParams[k].x[indices[k]]) / span;
value = Utility::Lerp(graphParams[k].y[indices[k]], graphParams[k].y[indices[k] + 1], progress); value = Utility::Lerp(graphParams[k].y[indices[k]], graphParams[k].y[indices[k] + 1], progress);
qDebug() << "Span: " << span << " Prog: " << progress << " Value: " << value;
} }
if (currentX >= graphParams[k].x[indices[k] + 1]) indices[k]++; if (currentX >= graphParams[k].x[indices[k]]) indices[k]++;
outFile->putChar(','); outFile->putChar(',');
outFile->write(QString::number(value).toUtf8()); outFile->write(QString::number(value).toUtf8());