palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-06-25 22:04:29 +02:00
Code Issues Projects Releases Wiki Activity

issue #654 refactoring the code so that the functions and variables are called xxx multisize xxx instead of xxx standard xxx

Browse source 
--HG--
branch : develop
This commit is contained in:
Ronan Le Tiec 2017-07-12 20:21:48 +02:00
parent 5b79acd2bb
commit 46f70788cf
40 changed files with 175 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/macx/tape/Info.plist vendored
View file

@ -50,7 +50,7 @@
<string>org.valentinaproject.vst</string>
</array>
<key>CFBundleTypeName</key>
<string>Valentina standard measurements</string>
<string>Valentina multisize measurements</string>
<key>LSHandlerRank</key>
<string>Owner</string>
</dict>
@ -86,7 +86,7 @@
<string>public.xml</string>
</array>
<key>UTTypeDescription</key>
<string>Valentina standard measurements</string>
<string>Valentina multisize measurements</string>
<key>UTTypeIconFile</key>
<string>s-measurements.icns</string>
<key>UTTypeIdentifier</key>

4
dist/macx/valentina/Info.plist vendored
View file

@ -64,7 +64,7 @@
<string>org.valentinaproject.vst</string>
</array>
<key>CFBundleTypeName</key>
<string>Valentina standard measurements</string>
<string>Valentina multisize measurements</string>
<key>LSHandlerRank</key>
<string>Alternate</string>
</dict>
@ -122,7 +122,7 @@
<string>public.xml</string>
</array>
<key>UTTypeDescription</key>
<string>Valentina standard measurements</string>
<string>Valentina multisize measurements</string>
<key>UTTypeIconFile</key>
<string>s-measurements.icns</string>
<key>UTTypeIdentifier</key>

2
src/app/share/collection/jacketМ1_52-176.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Пс_впрз" description="Высота основания" formula="16.1"/>
<increment name="#Пк_впрз1" description="проймы сзади АГ" formula="14"/>

2
src/app/share/collection/jacketМ2_40-146.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Пс_впрз" description="Высота основания" formula="16.1"/>
<increment name="#Пк_впрз1" description="проймы сзади АГ" formula="14"/>

2
src/app/share/collection/jacketМ3_40-146.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Пс_впрз" description="Высота основания" formula="16.1"/>
<increment name="#Пк_впрз1" description="проймы сзади АГ" formula="14"/>

2
src/app/share/collection/jacketМ4_40-146.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Пс_впрз" description="Высота основания" formula="16.1"/>
<increment name="#Пк_впрз1" description="проймы сзади АГ" formula="14"/>

2
src/app/share/collection/jacketМ5_30-110.val
View file

@ -10,7 +10,7 @@
<heights h116="true" h176="true" h104="true" h164="true" h152="true" h92="false" h140="true" h98="true" h158="true" h146="true" h134="true" h194="true" all="false" h122="true" h182="true" h110="true" h170="true" h128="true" h188="true"/>
<sizes s34="true" s36="true" s22="true" s38="true" s24="true" s26="true" s28="true" s50="true" s52="true" s54="true" s40="true" s56="true" all="true" s42="true" s44="true" s30="true" s46="true" s48="true" s32="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Пс_впрз" description="Высота основания" formula="16.1"/>
<increment name="#Пк_впрз1" description="проймы сзади АГ" formula="14"/>

2
src/app/share/collection/jacketМ6_30-110.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Qt_Qt_Version_GCC_32bit-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Qt_Qt_Version_GCC_32bit-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Пс_впрз" description="Высота основания" formula="16.1"/>
<increment name="#Пк_впрз1" description="проймы сзади АГ" formula="14"/>

2
src/app/share/collection/pantsМ1_52-176.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Диз" description="Длина брюк" formula="1120"/>
<increment name="#Дсп" description="Растояние от талии до пола спереди" formula="1110"/>

2
src/app/share/collection/pantsМ2_40-146.val
View file

@ -10,7 +10,7 @@
<heights all="true"/>
<sizes all="true"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<increments>
<increment name="#Диз" description="Длина брюк" formula="1120"/>
<increment name="#Дсп" description="Растояние от талии до пола спереди" formula="1110"/>

2
src/app/share/collection/pantsМ7.val
View file

@ -10,7 +10,7 @@
<heights h116="false" h176="true" h104="false" h164="true" h152="false" h92="false" h140="false" h98="false" h158="false" h146="false" h134="false" h194="true" all="false" h122="false" h182="true" h110="false" h170="true" h128="false" h188="true"/>
<sizes s34="false" s36="false" s22="false" s38="false" s24="false" s26="false" s28="false" s50="true" s52="true" s54="true" s40="false" s56="true" all="false" s42="true" s44="true" s30="false" s46="true" s48="true" s32="false"/>
</gradation>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst</measurements>
<measurements>../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/multisize/GOST_man_ru.vst</measurements>
<!--Valentina pattern format.-->
<increments>
<increment name="#Диз" description="Длина брюк" formula="1120"/>

0
src/app/share/tables/standard/GOST_man_ru.vst → src/app/share/tables/multisize/GOST_man_ru.vst
View file

6
src/app/tables.pri
View file

@ -1,9 +1,9 @@
# Keep path to all files with standard measurements we support right now
INSTALL_STANDARD_MEASUREMENTS += $$PWD/share/tables/standard/GOST_man_ru.vst
# Keep path to all files with multisize measurements we support right now
INSTALL_MULTISIZE_MEASUREMENTS += $$PWD/share/tables/multisize/GOST_man_ru.vst
# Keep path to all template files we have right now
INSTALL_STANDARD_TEMPLATES += \
$$PWD/share/tables/templates/template_all_measurements.vit \
$$PWD/share/tables/templates/t_Aldrich_Women.vit
copyToDestdir($$INSTALL_STANDARD_MEASUREMENTS, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard))
copyToDestdir($$INSTALL_MULTISIZE_MEASUREMENTS, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/multisize))

16
src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp
View file

@ -58,7 +58,7 @@ void TapePreferencesPathPage::Apply()
{
VTapeSettings *settings = qApp->TapeSettings();
settings->SetPathIndividualMeasurements(ui->pathTable->item(0, 1)->text());
settings->SetPathStandardMeasurements(ui->pathTable->item(1, 1)->text());
settings->SetPathMultisizeMeasurements(ui->pathTable->item(1, 1)->text());
settings->SetPathTemplate(ui->pathTable->item(2, 1)->text());
}
@ -75,8 +75,8 @@ void TapePreferencesPathPage::DefaultPath()
case 0: // individual measurements
path = VCommonSettings::GetDefPathIndividualMeasurements();
break;
case 1: // standard measurements
path = VCommonSettings::GetDefPathStandardMeasurements();
case 1: // multisize measurements
path = VCommonSettings::GetDefPathMultisizeMeasurements();
break;
case 2: // templates
path = VCommonSettings::GetDefPathTemplate();
@ -102,9 +102,9 @@ void TapePreferencesPathPage::EditPath()
case 0: // individual measurements
path = qApp->TapeSettings()->GetPathIndividualMeasurements();
break;
case 1: // standard measurements
path = qApp->TapeSettings()->GetPathStandardMeasurements();
path = VCommonSettings::PrepareStandardTables(path);
case 1: // multisize measurements
path = qApp->TapeSettings()->GetPathMultisizeMeasurements();
path = VCommonSettings::PrepareMultisizeTables(path);
break;
case 2: // templates
path = qApp->TapeSettings()->GetPathTemplate();
@ -155,8 +155,8 @@ void TapePreferencesPathPage::InitTable()
{
ui->pathTable->setItem(1, 0, new QTableWidgetItem(tr("My Multisize Measurements")));
QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathStandardMeasurements());
item->setToolTip(settings->GetPathStandardMeasurements());
QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathMultisizeMeasurements());
item->setToolTip(settings->GetPathMultisizeMeasurements());
ui->pathTable->setItem(1, 1, item);
}

4
src/app/tape/dialogs/dialognewmeasurements.cpp
View file

@ -141,7 +141,7 @@ void DialogNewMeasurements::showEvent(QShowEvent *event)
void DialogNewMeasurements::CurrentTypeChanged(int index)
{
const MeasurementsType type = static_cast<MeasurementsType>(ui->comboBoxMType->itemData(index).toInt());
if (type == MeasurementsType::Standard)
if (type == MeasurementsType::Multisize)
{
ui->comboBoxBaseSize->setEnabled(true);
ui->comboBoxBaseHeight->setEnabled(true);
@ -183,7 +183,7 @@ void DialogNewMeasurements::InitMTypes()
ui->comboBoxMType->blockSignals(true);
ui->comboBoxMType->clear();
ui->comboBoxMType->addItem(tr("Individual"), static_cast<int>(MeasurementsType::Individual));
ui->comboBoxMType->addItem(tr("Multisize"), static_cast<int>(MeasurementsType::Standard));
ui->comboBoxMType->addItem(tr("Multisize"), static_cast<int>(MeasurementsType::Multisize));
ui->comboBoxMType->blockSignals(false);
int index = ui->comboBoxMType->findData(val);

12
src/app/tape/tape.pro
View file

@ -174,7 +174,7 @@ QMAKE_EXTRA_COMPILERS += diagrams
QMAKE_CLEAN += $${OUT_PWD}/$${DESTDIR}/diagrams.rcc
# INSTALL_STANDARD_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri
# INSTALL_MULTISIZE_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri
include(../tables.pri)
copyToDestdir($$INSTALL_STANDARD_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/tables/templates))
include(../translations.pri)
@ -244,15 +244,15 @@ unix{
QMAKE_INFO_PLIST = $$PWD/../../../dist/macx/tape/Info.plist
# Copy to bundle standard measurements files
standard.path = $$RESOURCES_DIR/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASUREMENTS
# Copy to bundle multisize measurements files
multisize.path = $$RESOURCES_DIR/tables/multisize/
multisize.files = $$INSTALL_MULTISIZE_MEASUREMENTS
# Copy to bundle templates files
templates.path = $$RESOURCES_DIR/tables/templates/
templates.files = $$INSTALL_STANDARD_TEMPLATES
# Copy to bundle standard measurements files
# Copy to bundle multisize measurements files
# We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/$${DESTDIR}/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t)
@ -262,7 +262,7 @@ unix{
QMAKE_BUNDLE_DATA += \
templates \
standard \
multisize \
libraries \
format
}

46
src/app/tape/tmainwindow.cpp
View file

@ -176,7 +176,7 @@ void TMainWindow::SetBaseMHeight(int height)
{
if (m != nullptr)
{
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
const int row = ui->tableWidget->currentRow();
VContainer::SetHeight(UnitConvertor(height, Unit::Cm, mUnit));
@ -191,7 +191,7 @@ void TMainWindow::SetBaseMSize(int size)
{
if (m != nullptr)
{
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
const int row = ui->tableWidget->currentRow();
VContainer::SetSize(UnitConvertor(size, Unit::Cm, mUnit));
@ -260,7 +260,7 @@ bool TMainWindow::LoadFile(const QString &path)
throw e;
}
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
VVSTConverter converter(path);
m_curFileFormatVersion = converter.GetCurrentFormatVarsion();
@ -361,7 +361,7 @@ void TMainWindow::FileNew()
VContainer::SetHeight(measurements.BaseHeight());
VContainer::SetSize(measurements.BaseSize());
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
m = new VMeasurements(mUnit, measurements.BaseSize(), measurements.BaseHeight(), data);
m_curFileFormatVersion = VVSTConverter::MeasurementMaxVer;
@ -416,13 +416,13 @@ void TMainWindow::OpenIndividual()
}
//---------------------------------------------------------------------------------------------------------------------
void TMainWindow::OpenStandard()
void TMainWindow::OpenMultisize()
{
const QString filter = tr("Multisize measurements") + QLatin1String(" (*.vst);;") + tr("Individual measurements") +
QLatin1String(" (*.vit);;") + tr("All files") + QLatin1String(" (*.*)");
//Use standard path to standard measurements
QString pathTo = qApp->TapeSettings()->GetPathStandardMeasurements();
pathTo = VCommonSettings::PrepareStandardTables(pathTo);
//Use standard path to multisize measurements
QString pathTo = qApp->TapeSettings()->GetPathMultisizeMeasurements();
pathTo = VCommonSettings::PrepareMultisizeTables(pathTo);
Open(pathTo, filter);
}
@ -448,7 +448,7 @@ void TMainWindow::OpenTemplate()
void TMainWindow::CreateFromExisting()
{
const QString filter = tr("Individual measurements") + QLatin1String(" (*.vit)");
//Use standard path to standard measurements
//Use standard path to individual measurements
const QString pathTo = qApp->TapeSettings()->GetPathIndividualMeasurements();
bool usedNotExistedDir = false;
@ -531,7 +531,7 @@ void TMainWindow::changeEvent(QEvent *event)
// retranslate designer form (single inheritance approach)
ui->retranslateUi(this);
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
ui->labelMType->setText(tr("Multisize measurements"));
ui->labelBaseSizeValue->setText(QString().setNum(m->BaseSize()) + QLatin1String(" ") +
@ -715,7 +715,7 @@ bool TMainWindow::FileSave()
}
else
{
if (mType == MeasurementsType::Standard
if (mType == MeasurementsType::Multisize
&& m_curFileFormatVersion < VVSTConverter::MeasurementMaxVer
&& not ContinueFormatRewrite(m_curFileFormatVersionStr, VVSTConverter::MeasurementMaxVerStr))
{
@ -788,7 +788,7 @@ bool TMainWindow::FileSave()
}
else
{
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
m_curFileFormatVersion = VVSTConverter::MeasurementMaxVer;
m_curFileFormatVersionStr = VVSTConverter::MeasurementMaxVerStr;
@ -831,8 +831,8 @@ bool TMainWindow::FileSaveAs()
}
else
{
dir = qApp->TapeSettings()->GetPathStandardMeasurements();
dir = VCommonSettings::PrepareStandardTables(dir);
dir = qApp->TapeSettings()->GetPathMultisizeMeasurements();
dir = VCommonSettings::PrepareMultisizeTables(dir);
}
}
else
@ -958,7 +958,7 @@ void TMainWindow::AboutToShowDockMenu()
menu->addSeparator();
menu->addAction(ui->actionOpenIndividual);
menu->addAction(ui->actionOpenStandard);
menu->addAction(ui->actionOpenMultisize);
menu->addAction(ui->actionOpenTemplate);
menu->addSeparator();
@ -1098,7 +1098,7 @@ void TMainWindow::Remove()
ui->lineEditFullName->setText("");
ui->lineEditFullName->blockSignals(false);
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
ui->labelCalculatedValue->blockSignals(true);
ui->doubleSpinBoxBaseValue->blockSignals(true);
@ -1481,7 +1481,7 @@ void TMainWindow::ShowNewMData(bool fresh)
connect(ui->lineEditName, &QLineEdit::textEdited, this, &TMainWindow::SaveMName);
ui->plainTextEditDescription->blockSignals(false);
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
ui->labelCalculatedValue->blockSignals(true);
ui->doubleSpinBoxBaseValue->blockSignals(true);
@ -1889,7 +1889,7 @@ void TMainWindow::SetupMenu()
ui->actionNew->setShortcuts(QKeySequence::New);
connect(ui->actionOpenIndividual, &QAction::triggered, this, &TMainWindow::OpenIndividual);
connect(ui->actionOpenStandard, &QAction::triggered, this, &TMainWindow::OpenStandard);
connect(ui->actionOpenMultisize, &QAction::triggered, this, &TMainWindow::OpenMultisize);
connect(ui->actionOpenTemplate, &QAction::triggered, this, &TMainWindow::OpenTemplate);
connect(ui->actionCreateFromExisting, &QAction::triggered, this, &TMainWindow::CreateFromExisting);
@ -1994,7 +1994,7 @@ void TMainWindow::InitWindow()
ui->plainTextEditNotes->setEnabled(true);
ui->toolBarGradation->setVisible(true);
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
ui->labelMType->setText(tr("Multisize measurements"));
ui->labelBaseSizeValue->setText(QString().setNum(m->BaseSize()) + " " +
@ -2162,7 +2162,7 @@ void TMainWindow::InitWindow()
//---------------------------------------------------------------------------------------------------------------------
void TMainWindow::InitTable()
{
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
ui->tableWidget->setColumnHidden( ColumnFormula, true );// formula
}
@ -2548,7 +2548,7 @@ void TMainWindow::MFields(bool enabled)
ui->plainTextEditDescription->setEnabled(enabled);
ui->lineEditFullName->setEnabled(enabled);
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
ui->doubleSpinBoxBaseValue->setEnabled(enabled);
ui->doubleSpinBoxInSizes->setEnabled(enabled);
@ -2593,7 +2593,7 @@ void TMainWindow::UpdateWindowTitle()
else
{
showName = tr("untitled %1").arg(qApp->MainWindows().size()+1);
mType == MeasurementsType::Standard ? showName += QLatin1String(".vst") : showName += QLatin1String(".vit");
mType == MeasurementsType::Multisize ? showName += QLatin1String(".vst") : showName += QLatin1String(".vit");
}
showName += QLatin1String("[*]");
@ -2846,7 +2846,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
throw e;
}
if (mType == MeasurementsType::Standard)
if (mType == MeasurementsType::Multisize)
{
VException e(tr("Export from multisize measurements is not supported."));
throw e;

2
src/app/tape/tmainwindow.h
View file

@ -75,7 +75,7 @@ protected:
private slots:
void FileNew();
void OpenIndividual();
void OpenStandard();
void OpenMultisize();
void OpenTemplate();
void CreateFromExisting();
void Preferences();

4
src/app/tape/tmainwindow.ui
View file

@ -860,7 +860,7 @@
<addaction name="actionNew"/>
<addaction name="separator"/>
<addaction name="actionOpenIndividual"/>
<addaction name="actionOpenStandard"/>
<addaction name="actionOpenMultisize"/>
<addaction name="actionOpenTemplate"/>
<addaction name="actionCreateFromExisting"/>
<addaction name="separator"/>
@ -1126,7 +1126,7 @@
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionOpenStandard">
<action name="actionOpenMultisize">
<property name="icon">
<iconset theme="document-open">
<normaloff>.</normaloff>.</iconset>

4
src/app/valentina/core/vcmdexport.cpp
View file

@ -117,7 +117,7 @@ void VCommandLine::InitOptions(VCommandLineOptions &options, QMap<QString, int>
optionsIndex.insert(LONG_OPTION_GRADATIONSIZE, index++);
options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_GRADATIONSIZE << LONG_OPTION_GRADATIONSIZE,
translate("VCommandLine", "Set size value a pattern file, that was opened "
"with standard measurements (export mode). Valid "
"with multisize measurements (export mode). Valid "
"values: %1cm.")
.arg(VMeasurement::WholeListSizes(Unit::Cm).join(", ")),
translate("VCommandLine", "The size value")));
@ -125,7 +125,7 @@ void VCommandLine::InitOptions(VCommandLineOptions &options, QMap<QString, int>
optionsIndex.insert(LONG_OPTION_GRADATIONHEIGHT, index++);
options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_GRADATIONHEIGHT << LONG_OPTION_GRADATIONHEIGHT,
translate("VCommandLine", "Set height value a pattern file, that was opened "
"with standard measurements (export mode). Valid "
"with multisize measurements (export mode). Valid "
"values: %1cm.")
.arg(VMeasurement::WholeListHeights(Unit::Cm).join(", ")),
translate("VCommandLine", "The height value")));

16
src/app/valentina/dialogs/configpages/preferencespathpage.cpp
View file

@ -59,7 +59,7 @@ void PreferencesPathPage::Apply()
{
VSettings *settings = qApp->ValentinaSettings();
settings->SetPathIndividualMeasurements(ui->pathTable->item(0, 1)->text());
settings->SetPathStandardMeasurements(ui->pathTable->item(1, 1)->text());
settings->SetPathMultisizeMeasurements(ui->pathTable->item(1, 1)->text());
settings->SetPathPattern(ui->pathTable->item(2, 1)->text());
settings->SetPathLayout(ui->pathTable->item(3, 1)->text());
settings->SetPathTemplate(ui->pathTable->item(4, 1)->text());
@ -76,8 +76,8 @@ void PreferencesPathPage::DefaultPath()
switch (row)
{
case 1: // standard measurements
path = VCommonSettings::GetDefPathStandardMeasurements();
case 1: // multisize measurements
path = VCommonSettings::GetDefPathMultisizeMeasurements();
break;
case 2: // pattern path
path = VSettings::GetDefPathPattern();
@ -112,9 +112,9 @@ void PreferencesPathPage::EditPath()
case 0: // individual measurements
path = qApp->ValentinaSettings()->GetPathIndividualMeasurements();
break;
case 1: // standard measurements
path = qApp->ValentinaSettings()->GetPathStandardMeasurements();
path = VCommonSettings::PrepareStandardTables(path);
case 1: // multisize measurements
path = qApp->ValentinaSettings()->GetPathMultisizeMeasurements();
path = VCommonSettings::PrepareMultisizeTables(path);
break;
case 2: // pattern path
path = qApp->ValentinaSettings()->GetPathPattern();
@ -178,8 +178,8 @@ void PreferencesPathPage::InitTable()
{
ui->pathTable->setItem(1, 0, new QTableWidgetItem(tr("My Multisize Measurements")));
QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathStandardMeasurements());
item->setToolTip(settings->GetPathStandardMeasurements());
QTableWidgetItem *item = new QTableWidgetItem(settings->GetPathMultisizeMeasurements());
item->setToolTip(settings->GetPathMultisizeMeasurements());
ui->pathTable->setItem(1, 1, item);
}

2
src/app/valentina/dialogs/dialogpatternproperties.cpp
View file

@ -115,7 +115,7 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte
connect(bCancel, &QPushButton::clicked, this, &DialogPatternProperties::close);
ui->tabWidget->setCurrentIndex(0);
if (qApp->patternType() != MeasurementsType::Standard)
if (qApp->patternType() != MeasurementsType::Multisize)
{
ui->tabWidget->setTabEnabled(1, false);
}

2
src/app/valentina/dialogs/dialogpatternproperties.ui
View file

@ -208,7 +208,7 @@
<item>
<widget class="QRadioButton" name="radioButtonDefFromM">
<property name="text">
<string>From standard measurements</string>
<string>From multisize measurements</string>
</property>
<property name="checked">
<bool>true</bool>

62
src/app/valentina/mainwindow.cpp
View file

@ -382,7 +382,7 @@ QSharedPointer<VMeasurements> MainWindow::OpenMeasurementFile(const QString &pat
throw e;
}
if (m->Type() == MeasurementsType::Standard)
if (m->Type() == MeasurementsType::Multisize)
{
VVSTConverter converter(path);
m->setXMLContent(converter.Convert());// Read again after conversion
@ -401,12 +401,12 @@ QSharedPointer<VMeasurements> MainWindow::OpenMeasurementFile(const QString &pat
CheckRequiredMeasurements(m.data());
if (m->Type() == MeasurementsType::Standard)
if (m->Type() == MeasurementsType::Multisize)
{
if (m->MUnit() == Unit::Inch)
{
qCCritical(vMainWindow, "%s\n\n%s", qUtf8Printable(tr("Wrong units.")),
qUtf8Printable(tr("Application doesn't support standard table with inches.")));
qUtf8Printable(tr("Application doesn't support multisize table with inches.")));
m->clear();
if (not VApplication::IsGUIMode())
{
@ -440,13 +440,13 @@ bool MainWindow::LoadMeasurements(const QString &path)
return false;
}
if (qApp->patternUnit() == Unit::Inch && m->Type() == MeasurementsType::Standard)
if (qApp->patternUnit() == Unit::Inch && m->Type() == MeasurementsType::Multisize)
{
qWarning()<<tr("Gradation doesn't support inches");
return false;
}
if (m->Type() == MeasurementsType::Standard)
if (m->Type() == MeasurementsType::Multisize)
{
m->SetDataSize();
m->SetDataHeight();
@ -492,7 +492,7 @@ bool MainWindow::UpdateMeasurements(const QString &path, int size, int height)
return false;
}
if (m->Type() == MeasurementsType::Standard)
if (m->Type() == MeasurementsType::Multisize)
{
VContainer::SetSize(size);
VContainer::SetHeight(height);
@ -1536,13 +1536,13 @@ void MainWindow::LoadIndividual()
}
//---------------------------------------------------------------------------------------------------------------------
void MainWindow::LoadStandard()
void MainWindow::LoadMultisize()
{
const QString filter = tr("Multisize measurements") + QLatin1String(" (*.vst);;") + tr("Individual measurements") +
QLatin1String("(*.vit)");
//Use standard path to standard measurements
QString path = qApp->ValentinaSettings()->GetPathStandardMeasurements();
path = VCommonSettings::PrepareStandardTables(path);
//Use standard path to multisize measurements
QString path = qApp->ValentinaSettings()->GetPathMultisizeMeasurements();
path = VCommonSettings::PrepareMultisizeTables(path);
const QString mPath = QFileDialog::getOpenFileName(this, tr("Open file"), path, filter, nullptr,
QFileDialog::DontUseNativeDialog);
@ -1575,7 +1575,7 @@ void MainWindow::LoadStandard()
UpdateWindowTitle();
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
if (not hText.isEmpty() && not gradationHeights.isNull())
{
@ -1626,7 +1626,7 @@ void MainWindow::ShowMeasurements()
const QString absoluteMPath = AbsoluteMPath(curFile, doc->MPath());
QStringList arguments;
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
arguments = QStringList()
<< absoluteMPath
@ -1762,7 +1762,7 @@ void MainWindow::ToolBarOption()
delete gradationSizesLabel;
}
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
const QStringList listHeights = VMeasurement::ListHeights(doc->GetGradationHeights(), qApp->patternUnit());
const QStringList listSizes = VMeasurement::ListSizes(doc->GetGradationSizes(), qApp->patternUnit());
@ -2298,7 +2298,7 @@ void MainWindow::ActionDraw(bool checked)
SetEnableWidgets(true);
ui->toolBox->setCurrentIndex(currentToolBoxIndex);
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
ui->toolBarOption->setVisible(true);
}
@ -2373,7 +2373,7 @@ void MainWindow::ActionDetails(bool checked)
SetEnableWidgets(true);
ui->toolBox->setCurrentIndex(ui->toolBox->indexOf(ui->detailPage));
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
ui->toolBarOption->setVisible(true);
}
@ -2489,7 +2489,7 @@ void MainWindow::ActionLayout(bool checked)
mouseCoordinate->setText("");
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
ui->toolBarOption->setVisible(false);
}
@ -2781,7 +2781,7 @@ void MainWindow::Clear()
ui->actionLast_tool->setEnabled(false);
ui->actionShowCurveDetails->setEnabled(false);
ui->actionLoadIndividual->setEnabled(false);
ui->actionLoadStandard->setEnabled(false);
ui->actionLoadMultisize->setEnabled(false);
ui->actionUnloadMeasurements->setEnabled(false);
ui->actionEditCurrent->setEnabled(false);
SetEnableTool(false);
@ -3028,7 +3028,7 @@ void MainWindow::SetEnableWidgets(bool enable)
ui->actionZoomOriginal->setEnabled(enable);
ui->actionShowCurveDetails->setEnabled(enable && drawStage);
ui->actionLoadIndividual->setEnabled(enable && designStage);
ui->actionLoadStandard->setEnabled(enable && designStage);
ui->actionLoadMultisize->setEnabled(enable && designStage);
ui->actionUnloadMeasurements->setEnabled(enable && designStage);
actionDockWidgetToolOptions->setEnabled(enable && designStage);
@ -3994,7 +3994,7 @@ void MainWindow::CreateActions()
});
connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual);
connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard);
connect(ui->actionLoadMultisize, &QAction::triggered, this, &MainWindow::LoadMultisize);
connect(ui->actionOpenTape, &QAction::triggered, this, [this]()
{
@ -4129,7 +4129,7 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu
VMeasurements m(pattern);
m.setXMLContent(fileName);
if (m.Type() == MeasurementsType::Standard || m.Type() == MeasurementsType::Individual)
if (m.Type() == MeasurementsType::Multisize || m.Type() == MeasurementsType::Individual)
{
const QString tape = qApp->TapeFilePath();
const QString workingDirectory = QFileInfo(tape).absoluteDir().absolutePath();
@ -4551,7 +4551,7 @@ QString MainWindow::CheckPathToMeasurements(const QString &patternPath, const QS
MeasurementsType patternType;
if (table.suffix() == QLatin1String("vst"))
{
patternType = MeasurementsType::Standard;
patternType = MeasurementsType::Multisize;
}
else if (table.suffix() == QLatin1String("vit"))
{
@ -4563,12 +4563,12 @@ QString MainWindow::CheckPathToMeasurements(const QString &patternPath, const QS
}
QString mPath;
if (patternType == MeasurementsType::Standard)
if (patternType == MeasurementsType::Multisize)
{
const QString filter = tr("Multisize measurements") + QLatin1String(" (*.vst)");
//Use standard path to standard measurements
QString path = qApp->ValentinaSettings()->GetPathStandardMeasurements();
path = VCommonSettings::PrepareStandardTables(path);
//Use standard path to multisize measurements
QString path = qApp->ValentinaSettings()->GetPathMultisizeMeasurements();
path = VCommonSettings::PrepareMultisizeTables(path);
mPath = QFileDialog::getOpenFileName(this, tr("Open file"), path, filter, nullptr,
QFileDialog::DontUseNativeDialog);
}
@ -4600,7 +4600,7 @@ QString MainWindow::CheckPathToMeasurements(const QString &patternPath, const QS
tr("Multisize measurements") + QLatin1String(" (*.vst)");
//Use standard path to individual measurements
const QString path = qApp->ValentinaSettings()->GetPathIndividualMeasurements();
VCommonSettings::PrepareStandardTables(VCommonSettings::GetDefPathStandardMeasurements());
VCommonSettings::PrepareMultisizeTables(VCommonSettings::GetDefPathMultisizeMeasurements());
bool usedNotExistedDir = false;
QDir directory(path);
@ -4636,7 +4636,7 @@ QString MainWindow::CheckPathToMeasurements(const QString &patternPath, const QS
throw e;
}
if (patternType == MeasurementsType::Standard)
if (patternType == MeasurementsType::Multisize)
{
VVSTConverter converter(mPath);
m->setXMLContent(converter.Convert());// Read again after conversion
@ -4807,7 +4807,7 @@ bool MainWindow::SetSize(const QString &text)
{
if (this->isWindowModified() || not curFile.isEmpty())
{
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
const int size = static_cast<int>(UnitConvertor(text.toInt(), Unit::Cm, *pattern->GetPatternUnit()));
const qint32 index = gradationSizes->findText(QString().setNum(size));
@ -4825,7 +4825,7 @@ bool MainWindow::SetSize(const QString &text)
else
{
qCCritical(vMainWindow, "%s",
qUtf8Printable(tr("Couldn't set size. Need a file with standard measurements.")));
qUtf8Printable(tr("Couldn't set size. Need a file with multisize measurements.")));
return false;
}
}
@ -4850,7 +4850,7 @@ bool MainWindow::SetHeight(const QString &text)
{
if (this->isWindowModified() || not curFile.isEmpty())
{
if (qApp->patternType() == MeasurementsType::Standard)
if (qApp->patternType() == MeasurementsType::Multisize)
{
const int height = static_cast<int>(UnitConvertor(text.toInt(), Unit::Cm, *pattern->GetPatternUnit()));
const qint32 index = gradationHeights->findText(QString().setNum(height));
@ -4868,7 +4868,7 @@ bool MainWindow::SetHeight(const QString &text)
else
{
qCCritical(vMainWindow, "%s",
qUtf8Printable(tr("Couldn't set height. Need a file with standard measurements.")));
qUtf8Printable(tr("Couldn't set height. Need a file with multisize measurements.")));
return false;
}
}

2
src/app/valentina/mainwindow.h
View file

@ -180,7 +180,7 @@ private slots:
void ZoomFitBestCurrent();
void LoadIndividual();
void LoadStandard();
void LoadMultisize();
void UnloadMeasurements();
void ShowMeasurements();
void MeasurementsChanged(const QString &path);

24
src/app/valentina/mainwindow.ui
View file

@ -55,8 +55,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>127</width>
<height>358</height>
<width>126</width>
<height>351</height>
</rect>
</property>
<property name="sizePolicy">
@ -402,7 +402,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>110</height>
<height>108</height>
</rect>
</property>
<property name="sizePolicy">
@ -511,7 +511,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>248</height>
<height>243</height>
</rect>
</property>
<property name="sizePolicy">
@ -773,7 +773,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>248</height>
<height>243</height>
</rect>
</property>
<property name="sizePolicy">
@ -1038,7 +1038,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>104</height>
<height>102</height>
</rect>
</property>
<property name="sizePolicy">
@ -1121,7 +1121,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>328</height>
<height>326</height>
</rect>
</property>
<attribute name="icon">
@ -1325,7 +1325,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>196</height>
<height>192</height>
</rect>
</property>
<property name="sizePolicy">
@ -1535,7 +1535,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>328</height>
<height>326</height>
</rect>
</property>
<attribute name="icon">
@ -1635,7 +1635,7 @@
<x>0</x>
<y>0</y>
<width>1100</width>
<height>25</height>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@ -1699,7 +1699,7 @@
<addaction name="actionEditCurrent"/>
<addaction name="actionUnloadMeasurements"/>
<addaction name="actionLoadIndividual"/>
<addaction name="actionLoadStandard"/>
<addaction name="actionLoadMultisize"/>
<addaction name="actionSyncMeasurements"/>
<addaction name="actionTable"/>
<addaction name="actionExportIncrementsToCSV"/>
@ -2549,7 +2549,7 @@
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionLoadStandard">
<action name="actionLoadMultisize">
<property name="enabled">
<bool>false</bool>
</property>

24
src/app/valentina/valentina.pro
View file

@ -115,7 +115,7 @@ message(Examples: $$[QT_INSTALL_EXAMPLES])
# Path to recource file.
win32:RC_FILE = share/resources/valentina.rc
# INSTALL_STANDARD_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri
# INSTALL_MULTISIZE_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri
include(../tables.pri)
win32 {
@ -159,9 +159,9 @@ unix{
translations.path = /usr/share/$${TARGET}/translations/
translations.files = $$INSTALL_TRANSLATIONS
# Path to standard measurement after installation
standard.path = /usr/share/$${TARGET}/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASUREMENTS
# Path to multisize measurement after installation
multisize.path = /usr/share/$${TARGET}/tables/multisize/
multisize.files = $$INSTALL_MULTISIZE_MEASUREMENTS
# Path to templates after installation
templates.path = /usr/share/$${TARGET}/tables/templates/
@ -173,7 +173,7 @@ unix{
desktop \
pixmaps \
translations \
standard \
multisize \
templates
}
macx{
@ -226,9 +226,9 @@ unix{
QMAKE_INFO_PLIST = $$PWD/../../../dist/macx/valentina/Info.plist
# Copy to bundle standard measurements files
standard.path = $$RESOURCES_DIR/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASUREMENTS
# Copy to bundle multisize measurements files
multisize.path = $$RESOURCES_DIR/tables/multisize/
multisize.files = $$INSTALL_MULTISIZE_MEASUREMENTS
# Copy to bundle templates files
templates.path = $$RESOURCES_DIR/tables/templates/
@ -239,13 +239,13 @@ unix{
icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns
icns_resources.files += $$PWD/../../../dist/macx/pattern.icns
# Copy to bundle standard measurements files
# Copy to bundle multisize measurements files
# We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$RESOURCES_DIR/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t)
QMAKE_BUNDLE_DATA += \
templates \
standard \
multisize \
libraries \
tape \
xpdf \
@ -307,8 +307,8 @@ win32:*g++* {
package.CONFIG = no_check_exist
INSTALLS += package
package_tables.path = $${OUT_PWD}/../../../package/valentina/tables/standard
package_tables.files += $$INSTALL_STANDARD_MEASUREMENTS
package_tables.path = $${OUT_PWD}/../../../package/valentina/tables/multisize
package_tables.files += $$INSTALL_MULTISIZE_MEASUREMENTS
INSTALLS += package_tables
package_templates.path = $${OUT_PWD}/../../../package/valentina/tables/templates

4
src/libs/ifc/xml/vdomdocument.h
View file

@ -68,7 +68,7 @@ QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
* or more pattern pieces.
*
* An increment is an auxiliary variable that is calculated from regular measurement
* variables (that belong to the standard measurements table). Increments are used to
* variables (that belong to the multisize measurements table). Increments are used to
* create a graduation schema for the sewing pattern.
*
* A pattern piece contains
@ -176,7 +176,7 @@ template <>
inline void VDomDocument::SetAttribute<MeasurementsType>(QDomElement &domElement, const QString &name,
const MeasurementsType &value) const
{
domElement.setAttribute(name, value == MeasurementsType::Standard ? QStringLiteral("standard") :
domElement.setAttribute(name, value == MeasurementsType::Multisize ? QStringLiteral("multisize") :
QStringLiteral("individual"));
}

16
src/libs/vformat/vmeasurements.cpp
View file

@ -118,11 +118,11 @@ VMeasurements::VMeasurements(Unit unit, VContainer *data)
VMeasurements::VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data)
:VDomDocument(),
data(data),
type(MeasurementsType::Standard)
type(MeasurementsType::Multisize)
{
SCASSERT(data != nullptr)
CreateEmptyStandardFile(unit, baseSize, baseHeight);
CreateEmptyMultisizeFile(unit, baseSize, baseHeight);
}
//---------------------------------------------------------------------------------------------------------------------
@ -286,7 +286,7 @@ void VMeasurements::ReadMeasurements() const
QSharedPointer<VMeasurement> meash;
QSharedPointer<VMeasurement> tempMeash;
if (type == MeasurementsType::Standard)
if (type == MeasurementsType::Multisize)
{
qreal base = GetParametrDouble(dom, AttrBase, "0");
qreal ksize = GetParametrDouble(dom, AttrSizeIncrease, "0");
@ -350,7 +350,7 @@ MeasurementsType VMeasurements::Type() const
//---------------------------------------------------------------------------------------------------------------------
int VMeasurements::BaseSize() const
{
if (type == MeasurementsType::Standard)
if (type == MeasurementsType::Multisize)
{
return static_cast<int>(UniqueTagAttr(TagSize, AttrBase, 50));
}
@ -363,7 +363,7 @@ int VMeasurements::BaseSize() const
//---------------------------------------------------------------------------------------------------------------------
int VMeasurements::BaseHeight() const
{
if (type == MeasurementsType::Standard)
if (type == MeasurementsType::Multisize)
{
return static_cast<int>(UniqueTagAttr(TagHeight, AttrBase, 176));
}
@ -696,7 +696,7 @@ void VMeasurements::SetDataHeight()
}
//---------------------------------------------------------------------------------------------------------------------
void VMeasurements::CreateEmptyStandardFile(Unit unit, int baseSize, int baseHeight)
void VMeasurements::CreateEmptyMultisizeFile(Unit unit, int baseSize, int baseHeight)
{
this->clear();
QDomElement mElement = this->createElement(TagVST);
@ -819,7 +819,7 @@ QDomElement VMeasurements::MakeEmpty(const QString &name, const QString &formula
SetAttribute(element, AttrName, name);
if (type == MeasurementsType::Standard)
if (type == MeasurementsType::Multisize)
{
SetAttribute(element, AttrBase, QString("0"));
SetAttribute(element, AttrSizeIncrease, QString("0"));
@ -873,7 +873,7 @@ MeasurementsType VMeasurements::ReadType() const
QDomElement root = documentElement();
if (root.tagName() == TagVST)
{
return MeasurementsType::Standard;
return MeasurementsType::Multisize;
}
else if (root.tagName() == TagVIT)
{

2
src/libs/vformat/vmeasurements.h
View file

@ -147,7 +147,7 @@ private:
VContainer *data;
MeasurementsType type;
void CreateEmptyStandardFile(Unit unit, int baseSize, int baseHeight);
void CreateEmptyMultisizeFile(Unit unit, int baseSize, int baseHeight);
void CreateEmptyIndividualFile(Unit unit);
qreal UniqueTagAttr(const QString &tag, const QString &attr, qreal defValue) const;

2
src/libs/vmisc/def.h
View file

@ -56,7 +56,7 @@ class VTranslateMeasurements;
enum class NodeDetail : char { Contour, Modeling };
enum class SceneObject : char { Point, Line, Spline, Arc, ElArc, SplinePath, Detail, Unknown };
enum class MeasurementsType : char { Standard, Individual , Unknown};
enum class MeasurementsType : char { Multisize, Individual , Unknown};
enum class Unit : char { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE};
enum class Source : char { FromGui, FromFile, FromTool };
enum class NodeUsage : bool {NotInUse = false, InUse = true};

20
src/libs/vmisc/vcommonsettings.cpp
View file

@ -46,7 +46,7 @@
#include "../vpatterndb/pmsystems.h"
const QString settingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements");
const QString settingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements");
const QString settingPathsMultisizeMeasurements = QStringLiteral("paths/standard_measurements");
const QString settingPathsTemplates = QStringLiteral("paths/templates");
const QString settingConfigurationOsSeparator = QStringLiteral("configuration/osSeparator");
@ -227,9 +227,9 @@ QString VCommonSettings::SharePath(const QString &shareItem)
}
//---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::StandardTablesPath()
QString VCommonSettings::MultisizeTablesPath()
{
return SharePath(QStringLiteral("/tables/standard"));
return SharePath(QStringLiteral("/tables/multisize"));
}
//---------------------------------------------------------------------------------------------------------------------
@ -245,9 +245,9 @@ QString VCommonSettings::PrepareStandardTemplates(const QString & currentPath)
}
//---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::PrepareStandardTables(const QString &currentPath)
QString VCommonSettings::PrepareMultisizeTables(const QString &currentPath)
{
return PrepareStandardFiles(currentPath, StandardTablesPath(), GetDefPathStandardMeasurements());
return PrepareStandardFiles(currentPath, MultisizeTablesPath(), GetDefPathMultisizeMeasurements());
}
//---------------------------------------------------------------------------------------------------------------------
@ -272,23 +272,23 @@ void VCommonSettings::SetPathIndividualMeasurements(const QString &value)
}
//---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::GetDefPathStandardMeasurements()
QString VCommonSettings::GetDefPathMultisizeMeasurements()
{
return QDir::homePath() + QLatin1String("/valentina/") + tr("measurements") + QLatin1String("/") + tr("multisize");
}
//---------------------------------------------------------------------------------------------------------------------
QString VCommonSettings::GetPathStandardMeasurements() const
QString VCommonSettings::GetPathMultisizeMeasurements() const
{
QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
return settings.value(settingPathsStandardMeasurements, GetDefPathStandardMeasurements()).toString();
return settings.value(settingPathsMultisizeMeasurements, GetDefPathMultisizeMeasurements()).toString();
}
//---------------------------------------------------------------------------------------------------------------------
void VCommonSettings::SetPathStandardMeasurements(const QString &value)
void VCommonSettings::SetPathMultisizeMeasurements(const QString &value)
{
QSettings settings(this->format(), this->scope(), this->organizationName(), commonIniFilename);
settings.setValue(settingPathsStandardMeasurements, value);
settings.setValue(settingPathsMultisizeMeasurements, value);
settings.sync();
}

10
src/libs/vmisc/vcommonsettings.h
View file

@ -48,19 +48,19 @@ public:
QObject *parent = nullptr);
static QString SharePath(const QString &shareItem);
static QString StandardTablesPath();
static QString MultisizeTablesPath();
static QString StandardTemplatesPath();
static QString PrepareStandardTemplates(const QString &currentPath);
static QString PrepareStandardTables(const QString &currentPath);
static QString PrepareMultisizeTables(const QString &currentPath);
static QString GetDefPathIndividualMeasurements();
QString GetPathIndividualMeasurements() const;
void SetPathIndividualMeasurements(const QString &value);
static QString GetDefPathStandardMeasurements();
QString GetPathStandardMeasurements() const;
void SetPathStandardMeasurements(const QString &value);
static QString GetDefPathMultisizeMeasurements();
QString GetPathMultisizeMeasurements() const;
void SetPathMultisizeMeasurements(const QString &value);
static QString GetDefPathTemplate();
QString GetPathTemplate() const;

10
src/libs/vpatterndb/variables/vmeasurement.cpp
View file

@ -38,7 +38,7 @@
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief VMeasurement create measurement for standard table
* @brief VMeasurement create measurement for multisize table
* @param name measurement's name
* @param base value in base size and height
* @param ksize increment in sizes
@ -100,7 +100,7 @@ QStringList VMeasurement::ListHeights(QMap<GHeights, bool> heights, Unit pattern
QStringList list;
if (patternUnit == Unit::Inch)
{
qWarning()<<"Standard table doesn't support inches.";
qWarning()<<"Multisize table doesn't support inches.";
return list;
}
@ -127,7 +127,7 @@ QStringList VMeasurement::ListSizes(QMap<GSizes, bool> sizes, Unit patternUnit)
QStringList list;
if (patternUnit == Unit::Inch)
{
qWarning()<<"Standard table doesn't support inches.";
qWarning()<<"Multisize table doesn't support inches.";
return list;
}
@ -154,7 +154,7 @@ QStringList VMeasurement::WholeListHeights(Unit patternUnit)
QStringList list;
if (patternUnit == Unit::Inch)
{
qWarning()<<"Standard table doesn't support inches.";
qWarning()<<"Multisize table doesn't support inches.";
return list;
}
@ -172,7 +172,7 @@ QStringList VMeasurement::WholeListSizes(Unit patternUnit)
QStringList list;
if (patternUnit == Unit::Inch)
{
qWarning()<<"Standard table doesn't support inches.";
qWarning()<<"Multisize table doesn't support inches.";
return list;
}

8
src/libs/vpatterndb/variables/vmeasurement.h
View file

@ -26,8 +26,8 @@
**
*************************************************************************/
#ifndef VSTANDARDTABLEROW_H
#define VSTANDARDTABLEROW_H
#ifndef VMULTISIZETABLEROW_H
#define VMULTISIZETABLEROW_H
#include <qcompilerdetection.h>
#include <QMap>
@ -45,7 +45,7 @@ class VContainer;
class VMeasurementData;
/**
* @brief The VMeasurement class keep data row of standard table
* @brief The VMeasurement class keep data row of multisize table
*/
class VMeasurement :public VVariable
{
@ -96,4 +96,4 @@ private:
Q_DECLARE_TYPEINFO(VMeasurement, Q_MOVABLE_TYPE);
#endif // VSTANDARDTABLEROW_H
#endif // VMULTISIZETABLEROW_H

4
src/libs/vpatterndb/vcontainer.cpp
View file

@ -542,7 +542,7 @@ void VContainer::UpdatePiecePath(quint32 id, const VPiecePath &path)
qreal VContainer::GetTableValue(const QString &name, MeasurementsType patternType) const
{
QSharedPointer<VVariable> m = GetVariable<VVariable>(name);
if (patternType == MeasurementsType::Standard)
if (patternType == MeasurementsType::Multisize)
{
m->SetValue(size(), height(), *GetPatternUnit());
}
@ -617,7 +617,7 @@ const QHash<QString, qreal *> VContainer::PlainVariables() const
while (i != d->variables.constEnd())
{
QSharedPointer<VInternalVariable> var = i.value();
if ((qApp->patternType() == MeasurementsType::Standard) &&
if ((qApp->patternType() == MeasurementsType::Multisize) &&
(var->GetType() == VarType::Measurement || var->GetType() == VarType::Increment))
{
QSharedPointer<VVariable> m = GetVariable<VVariable>(i.key());

2
src/test/CollectionTest/CollectionTest.pro
View file

@ -213,7 +213,7 @@ VALENTINA_TEST_FILES += \
tst_valentina/wrong_formula.val
COLLECTION_FILES += \
$${PWD}/../../app/share/tables/standard/GOST_man_ru.vst \
$${PWD}/../../app/share/tables/multisize/GOST_man_ru.vst \
$${PWD}/../../app/share/collection/bra.val \
$${PWD}/../../app/share/collection/bra.vit \
$${PWD}/../../app/share/collection/jacketМ1_52-176.val \

8
src/test/CollectionTest/tst_valentinacommandline.cpp
View file

@ -125,12 +125,12 @@ void TST_ValentinaCommandLine::ExportMode_data() const
<< QString("-p;;0;;-d;;%1;;-b;;output").arg(tmp)
<< V_EX_OK;
QTest::newRow("A file with limited gradation. Standard measurements. Wrong data.")
QTest::newRow("A file with limited gradation. Multisize measurements. Wrong data.")
<< "glimited_vst.val"
<< QString("-p;;0;;-d;;%1;;--gsize;;46;;--gheight;;164;;-b;;output").arg(tmp)
<< V_EX_DATAERR;
QTest::newRow("A file with limited gradation. Standard measurements. Correct data.")
QTest::newRow("A file with limited gradation. Multisize measurements. Correct data.")
<< "glimited_vst.val"
<< QString("-p;;0;;-d;;%1;;--gsize;;40;;--gheight;;134;;-b;;output").arg(tmp)
<< V_EX_OK;
@ -190,12 +190,12 @@ void TST_ValentinaCommandLine::TestMode_data() const
QLatin1String("issue_256_wrong.vit"))
<< V_EX_NOINPUT;
QTest::newRow("Issue #256. Correct standard measurements.")<< "issue_256.val"
QTest::newRow("Issue #256. Correct multisize measurements.")<< "issue_256.val"
<< QString("--test;;-m;;%1").arg(tmp + QDir::separator() +
QLatin1String("issue_256_correct.vst"))
<< V_EX_OK;
QTest::newRow("Issue #256. Wrong standard measurements.")<< "issue_256.val"
QTest::newRow("Issue #256. Wrong multisize measurements.")<< "issue_256.val"
<< QString("--test;;-m;;%1").arg(tmp + QDir::separator() +
QLatin1String("issue_256_wrong.vst"))
<< V_EX_NOINPUT;

8
src/test/ValentinaTest/tst_vmeasurements.cpp
View file

@ -42,9 +42,9 @@ TST_VMeasurements::TST_VMeasurements(QObject *parent) :
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief CreateEmptyStandardFile check if empty standard measurement file is valid.
* @brief CreateEmptyMultisizeFile check if empty multisize measurement file is valid.
*/
void TST_VMeasurements::CreateEmptyStandardFile()
void TST_VMeasurements::CreateEmptyMultisizeFile()
{
Unit mUnit = Unit::Cm;
const int height = 176;
@ -129,10 +129,10 @@ void TST_VMeasurements::CreateEmptyIndividualFile()
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief ValidPMCodesStandardFile helps to check that all current pattern making systems match pattern inside XSD
* @brief ValidPMCodesMultisizeFile helps to check that all current pattern making systems match pattern inside XSD
* scheme.
*/
void TST_VMeasurements::ValidPMCodesStandardFile()
void TST_VMeasurements::ValidPMCodesMultisizeFile()
{
Unit mUnit = Unit::Cm;
const int height = 176;

4
src/test/ValentinaTest/tst_vmeasurements.h
View file

@ -38,10 +38,10 @@ public:
explicit TST_VMeasurements(QObject *parent = nullptr);
private slots:
void CreateEmptyStandardFile();
void CreateEmptyMultisizeFile();
void CreateEmptyIndividualFile();
void ValidPMCodesStandardFile();
void ValidPMCodesMultisizeFile();
void ValidPMCodesIndividualFile();
};