aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore full name and description for known measurements. ref #804.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-02-05 11:10:55 +02:00
parent 28559870bc
commit e56423905d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/tape/tmainwindow.cpp
View File

@ -3163,12 +3163,13 @@ void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv)
measurement.name = CheckMName(qApp->TrVars()->MFromUser(csv.text(i, 0).simplified())); measurement.name = CheckMName(qApp->TrVars()->MFromUser(csv.text(i, 0).simplified()));
measurement.value = VTranslateVars::TryFormulaFromUser(csv.text(i, 1), qApp->Settings()->GetOsSeparator()); measurement.value = VTranslateVars::TryFormulaFromUser(csv.text(i, 1), qApp->Settings()->GetOsSeparator());
if (columns >= 3) const bool custom = csv.text(i, 0).simplified().startsWith(CustomMSign);
if (columns >= 3 && not custom)
{ {
measurement.fullName = csv.text(i, 2).simplified(); measurement.fullName = csv.text(i, 2).simplified();
} }
if (columns >= 4) if (columns >= 4 && not custom)
{ {
measurement.description = csv.text(i, 3).simplified(); measurement.description = csv.text(i, 3).simplified();
} }
@ -3262,12 +3263,13 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
measurement.sizeIncrease = ConverToDouble(csv.text(i, 3), measurement.sizeIncrease = ConverToDouble(csv.text(i, 3),
tr("Cannot convert size increase value to double in column 4.")); tr("Cannot convert size increase value to double in column 4."));
if (columns >= 5) const bool custom = csv.text(i, 0).simplified().startsWith(CustomMSign);
if (columns >= 5 && not custom)
{ {
measurement.fullName = csv.text(i, 4).simplified(); measurement.fullName = csv.text(i, 4).simplified();
} }
if (columns >= 6) if (columns >= 6 && not custom)
{ {
measurement.description = csv.text(i, 5).simplified(); measurement.description = csv.text(i, 5).simplified();
} }