Differential D22010 Diff 60398 src/kdefrontend/spreadsheet/FunctionValuesDialog.cpp

Changeset View

Standalone View

src/kdefrontend/spreadsheet/FunctionValuesDialog.cpp

Context not available.
29	#include "backend/core/AspectTreeModel.h"	29		#include "backend/core/AspectTreeModel.h"
30	#include "backend/core/column/Column.h"	30		#include "backend/core/column/Column.h"
31	#include "backend/core/Project.h"	31		#include "backend/core/Project.h"
32	#include "backend/gsl/ExpressionParser.h"
33	#include "backend/lib/macros.h"	32		#include "backend/lib/macros.h"
34	#include "backend/spreadsheet/Spreadsheet.h"	33		#include "backend/spreadsheet/Spreadsheet.h"
35	#include "commonfrontend/widgets/TreeViewComboBox.h"	34		#include "commonfrontend/widgets/TreeViewComboBox.h"
Context not available.
334	//determine variable names and the data vectors of the specified columns	333		//determine variable names and the data vectors of the specified columns
335	QStringList variableNames;	334		QStringList variableNames;
336	QVector<Column*> columns;	335		QVector<Column*> columns;
337	QVector<QVector<double>*> xVectors;
338	QVector<QVector<double>*> xNewVectors;
339	int maxRowCount = m_spreadsheet->rowCount();	336		int maxRowCount = m_spreadsheet->rowCount();
340	for (int i = 0; i < m_variableNames.size(); ++i) {	337		for (int i = 0; i < m_variableNames.size(); ++i) {
341	variableNames << m_variableNames.at(i)->text().simplified();	338		variableNames << m_variableNames.at(i)->text().simplified();
Context not available.
345	auto* column = dynamic_cast<Column*>(aspect);	342		auto* column = dynamic_cast<Column*>(aspect);
346	Q_ASSERT(column);	343		Q_ASSERT(column);
347	columns << column;	344		columns << column;
348	if (column->columnMode() == AbstractColumn::Integer) {
349	//convert integers to doubles first
350	auto* xVector = new QVector<double>(column->rowCount());
351	for (int i = 0; i<column->rowCount(); ++i)
352	xVector->operator[](i) = column->valueAt(i);
353
354	xNewVectors << xVector;
355	xVectors << xVector;
356	} else
357	xVectors << static_cast<QVector<double>* >(column->data());
358		345
359	if (column->rowCount() > maxRowCount)	346		if (column->rowCount() > maxRowCount)
360	maxRowCount = column->rowCount();	347		maxRowCount = column->rowCount();
361	}	348		}
362		349
		350		// if (m_spreadsheet->rowCount() != maxRowCount) // if too many rows, delete the remaining to save memory
		351		// m_spreadsheet->setRowCount(maxRowCount);
		352
363	//resize the spreadsheet if one of the data vectors from other spreadsheet(s) has more elements then the current spreadsheet.	353		//resize the spreadsheet if one of the data vectors from other spreadsheet(s) has more elements then the current spreadsheet.
364	if (m_spreadsheet->rowCount() < maxRowCount)	354		if (m_spreadsheet->rowCount() < maxRowCount) // if too many rows, delete the remaining to save memory
365	m_spreadsheet->setRowCount(maxRowCount);	355		m_spreadsheet->setRowCount(maxRowCount);
366		356
367	//create new vector for storing the calculated values
368	//the vectors with the variable data can be smaller then the result vector. So, not all values in the result vector might get initialized.
369	//->"clean" the result vector first
370	QVector<double> new_data(maxRowCount);
371	for (auto& d : new_data)
372	d = NAN;
373
374	//evaluate the expression for f(x_1, x_2, ...) and write the calculated values into a new vector.
375	ExpressionParser* parser = ExpressionParser::getInstance();
376	const QString& expression = ui.teEquation->toPlainText();	357		const QString& expression = ui.teEquation->toPlainText();
377	parser->evaluateCartesian(expression, variableNames, xVectors, &new_data);
378
379	//set the new values and store the expression, variable names and the used data columns
380	bool autoUpdate = (ui.chkAutoUpdate->checkState() == Qt::Checked);	358		bool autoUpdate = (ui.chkAutoUpdate->checkState() == Qt::Checked);
381	for (auto* col : m_columns) {	359		m_spreadsheet->updateColumnValues(m_columns, expression, variableNames, columns, autoUpdate);
382	if (col->columnMode() != AbstractColumn::Numeric)
383	col->setColumnMode(AbstractColumn::Numeric);
384
385	col->setFormula(expression, variableNames, columns, autoUpdate);
386	col->replaceValues(0, new_data);
387	}
388		360
389	m_spreadsheet->endMacro();	361		m_spreadsheet->endMacro();
390		362
391	//delete help vectors created for the conversion from int to double
392	for (auto* vector : xNewVectors)
393	delete vector;
394
395	RESET_CURSOR;	363		RESET_CURSOR;
			sgerlachUnsubmitted Done to -> too sgerlach: to -> too
396	}	364		}
Context not available.
			sgerlachUnsubmitted Done to -> too sgerlach: to -> too
			asemkeUnsubmitted Done You removed the usage of ExpressinParser here. We can remove the include "EvaluationParser.h" in this file, too. asemke: You removed the usage of ExpressinParser here. We can remove the include "EvaluationParser.h"…
			asemkeUnsubmitted Done what happens now if m_spreadsheet->rowCount() < maxRowCount? asemke: what happens now if m_spreadsheet->rowCount() < maxRowCount?
			MurmeleAuthorUnsubmitted Not Done sorry is a mistake Murmele: sorry is a mistake