Differential D22010 Diff 60398 src/backend/core/column/ColumnPrivate.cpp

Changeset View

Standalone View

View Options

src/backend/core/column/ColumnPrivate.cpp

Context not available.
30#include "ColumnPrivate.h" 30​#include "ColumnPrivate.h"
31#include "ColumnStringIO.h" 31​#include "ColumnStringIO.h"
32#include "Column.h" 32​#include "Column.h"
33​#include "backend/spreadsheet/Spreadsheet.h"
33#include "backend/core/datatypes/filter.h" 34​#include "backend/core/datatypes/filter.h"
34#include "backend/gsl/ExpressionParser.h" 35​#include "backend/gsl/ExpressionParser.h"
35 36​
Context not available.
162 */ 163​ */
163void ColumnPrivate::setColumnMode(AbstractColumn::ColumnMode mode) { 164​void ColumnPrivate::setColumnMode(AbstractColumn::ColumnMode mode) {
164 DEBUG("ColumnPrivate::setColumnMode() " << ENUM_TO_STRING(AbstractColumn, ColumnMode, m_column_mode) 165​ DEBUG("ColumnPrivate::setColumnMode() " << ENUM_TO_STRING(AbstractColumn, ColumnMode, m_column_mode)
165 << " -> " << ENUM_TO_STRING(AbstractColumn, ColumnMode, mode)); 166​ << " -> " << ENUM_TO_STRING(AbstractColumn, ColumnMode, mode))
166 if (mode == m_column_mode) return; 167​ if (mode == m_column_mode) return;
167 168​
168 void* old_data = m_data; 169​ void* old_data = m_data;
Context not available.
897 m_formulaVariableColumns = variableColumns; 898​ m_formulaVariableColumns = variableColumns;
898 m_formulaAutoUpdate = autoUpdate; 899​ m_formulaAutoUpdate = autoUpdate;
899 900​
900 //TODO: doesn't work 901​ for (auto connection: m_connectionsUpdateFormula)
901 disconnect(m_owner, SLOT(updateFormula())); 902​ disconnect(connection);
902 903​
asemkeUnsubmitted
Done

Ok. We can remove these comments.

asemke: Ok. We can remove these comments.
903 if (autoUpdate) { 904​ if (autoUpdate) {
asemkeUnsubmitted
Done

use range based for-loop here.

asemke: use range based for-loop here.
904 QVector<Column*> columns; ​
905 for (auto column : variableColumns) 905​ for (auto column : variableColumns)
asemkeUnsubmitted
Done

this vector doesn't seem to be used. Maybe you can remove it as part of your next patch here.

asemke: this vector doesn't seem to be used. Maybe you can remove it as part of your next patch here.
906 connect(column, &Column::dataChanged, m_owner, &Column::updateFormula); 906​ m_connectionsUpdateFormula << connect(column, &Column::dataChanged, m_owner, &Column::updateFormula);
907 } 907​ }
908} 908​}
909 909​
Context not available.
936 * \sa FunctionValuesDialog::generate() 936​ * \sa FunctionValuesDialog::generate()
937 */ 937​ */
938void ColumnPrivate::updateFormula() { 938​void ColumnPrivate::updateFormula() {
939 //TODO: this check shouldn't be required, but the disconnect in ​
940 //ColumnPrivate::setFormula() doesn't seem to work ​
941 if (!m_formulaAutoUpdate) ​
942 return; ​
943 939​
944 //determine variable names and the data vectors of the specified columns 940​ //determine variable names and the data vectors of the specified columns
945 QVector<QVector<double>*> xVectors; 941​ QVector<QVector<double>*> xVectors;
946 QVector<QVector<double>*> xNewVectors; 942​ QVector<QVector<double>*> xNewVectors;
943​ int maxRowCount = 0;
947 944​
948 for (auto column : m_formulaVariableColumns) { 945​ for (auto column : m_formulaVariableColumns) {
949 if (column->columnMode() == AbstractColumn::Integer) { 946​ if (column->columnMode() == AbstractColumn::Integer) {
Context not available.
956 xVectors << xVector; 953​ xVectors << xVector;
957 } else 954​ } else
958 xVectors << static_cast<QVector<double>* >(column->data()); 955​ xVectors << static_cast<QVector<double>* >(column->data());
956​
957​ if (column->rowCount() > maxRowCount)
958​ maxRowCount = column->rowCount();
asemkeUnsubmitted
Done

check indentation here.

asemke: check indentation here.
959 } 959​ }
960 960​
961​ Spreadsheet* spreadsheet = dynamic_cast<Spreadsheet*>(m_owner->parentAspect());
962​ // // use first column as reference for the minimal number of rows. For the
asemkeUnsubmitted
Done

this check is obsolete since it must be always a Spreadsheet. You can add an assert here maybe.

asemke: this check is obsolete since it must be always a Spreadsheet. You can add an assert here maybe.
963​ // // other columns increase rows only when rowCount is larger than maxRowCount,
964​ // // but don't decrease number of rows
965​ // int index = spreadsheet->indexOfChild<Spreadsheet>(m_owner);
966​
967​ // if ((index == 0 && spreadsheet->rowCount() != maxRowCount) ||
968​ // spreadsheet->rowCount() < maxRowCount)
969​ // spreadsheet->setRowCount(maxRowCount);
970​ Q_ASSERT(spreadsheet);
971​ if (spreadsheet->rowCount() < maxRowCount)
972​ spreadsheet->setRowCount(maxRowCount);
973​
974​
961 //create new vector for storing the calculated values 975​ //create new vector for storing the calculated values
962 //the vectors with the variable data can be smaller then the result vector. So, not all values in the result vector might get initialized. 976​ //the vectors with the variable data can be smaller then the result vector. So, not all values in the result vector might get initialized.
963 //->"clean" the result vector first 977​ //->"clean" the result vector first
Context not available.
970 parser->evaluateCartesian(m_formula, m_formulaVariableNames, xVectors, &new_data); 984​ parser->evaluateCartesian(m_formula, m_formulaVariableNames, xVectors, &new_data);
971 replaceValues(0, new_data); 985​ replaceValues(0, new_data);
972 986​
987​ // initialize remaining rows with NAN
988​ int remainingRows = rowCount() - maxRowCount;
989​ if (remainingRows > 0) {
990​ QVector<double> emptyRows(remainingRows, NAN);
991​ replaceValues(maxRowCount, emptyRows);
992​ }
993​
973 //delete help vectors created for the conversion from int to double 994​ //delete help vectors created for the conversion from int to double
974 for (auto* vector : xNewVectors) 995​ for (auto* vector : xNewVectors)
975 delete vector; 996​ delete vector;
Context not available.