issue #712 new setting added in dialog for seam default seam allowance. not taken into account in the rest of the programm yet
--HG-- branch : develop
This commit is contained in:
parent
b2d310fea4
commit
07556c6c46
|
@ -52,6 +52,8 @@ PreferencesPatternPage::PreferencesPatternPage(QWidget *parent)
|
||||||
QMessageBox::information(this, QCoreApplication::applicationName(), qsMsg);
|
QMessageBox::information(this, QCoreApplication::applicationName(), qsMsg);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ui->defaultSeamAllowance->setValue(qApp->ValentinaSettings()->GetDefaultSeamAllowance());
|
||||||
|
|
||||||
ui->forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping());
|
ui->forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping());
|
||||||
ui->doublePassmarkCheck->setChecked(qApp->ValentinaSettings()->IsDoublePassmark());
|
ui->doublePassmarkCheck->setChecked(qApp->ValentinaSettings()->IsDoublePassmark());
|
||||||
ui->checkBoxHideMainPath->setChecked(qApp->ValentinaSettings()->IsHideMainPath());
|
ui->checkBoxHideMainPath->setChecked(qApp->ValentinaSettings()->IsHideMainPath());
|
||||||
|
@ -79,6 +81,8 @@ void PreferencesPatternPage::Apply()
|
||||||
* prints a warning and does nothing.*/
|
* prints a warning and does nothing.*/
|
||||||
settings->SetUndoCount(ui->undoCount->value());
|
settings->SetUndoCount(ui->undoCount->value());
|
||||||
|
|
||||||
|
settings->SetDefaultSeamAllowance(ui->defaultSeamAllowance->value());
|
||||||
|
|
||||||
settings->SetForbidWorkpieceFlipping(ui->forbidFlippingCheck->isChecked());
|
settings->SetForbidWorkpieceFlipping(ui->forbidFlippingCheck->isChecked());
|
||||||
settings->SetHideMainPath(ui->checkBoxHideMainPath->isChecked());
|
settings->SetHideMainPath(ui->checkBoxHideMainPath->isChecked());
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>327</width>
|
<width>327</width>
|
||||||
<height>414</height>
|
<height>482</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -136,6 +136,38 @@
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupBox_6">
|
||||||
|
<property name="title">
|
||||||
|
<string>Seam allowance</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QFormLayout" name="formLayout_3">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_defaultSeamAllowance">
|
||||||
|
<property name="text">
|
||||||
|
<string>Default value:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="defaultSeamAllowance">
|
||||||
|
<property name="decimals">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<double>10.000000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<double>1.000000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|
|
@ -43,6 +43,8 @@
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
#include "../vmisc/vmath.h"
|
#include "../vmisc/vmath.h"
|
||||||
#include "../vpatterndb/pmsystems.h"
|
#include "../vpatterndb/pmsystems.h"
|
||||||
|
//#include "../ifc/xml/vdomdocument.h"
|
||||||
|
|
||||||
|
|
||||||
const QString settingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements");
|
const QString settingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements");
|
||||||
const QString settingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements");
|
const QString settingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements");
|
||||||
|
@ -59,11 +61,12 @@ const QString settingConfigurationConfirmItemDeletion = QStringLiteral("confi
|
||||||
const QString settingConfigurationConfirmFormatRewriting = QStringLiteral("configuration/confirm_format_rewriting");
|
const QString settingConfigurationConfirmFormatRewriting = QStringLiteral("configuration/confirm_format_rewriting");
|
||||||
const QString settingConfigurationToolBarStyle = QStringLiteral("configuration/tool_bar_style");
|
const QString settingConfigurationToolBarStyle = QStringLiteral("configuration/tool_bar_style");
|
||||||
|
|
||||||
const QString settingPatternUser = QStringLiteral("pattern/user");
|
const QString settingPatternUser = QStringLiteral("pattern/user");
|
||||||
const QString settingPatternUndo = QStringLiteral("pattern/undo");
|
const QString settingPatternUndo = QStringLiteral("pattern/undo");
|
||||||
const QString settingPatternForbidFlipping = QStringLiteral("pattern/forbidFlipping");
|
const QString settingPatternForbidFlipping = QStringLiteral("pattern/forbidFlipping");
|
||||||
const QString settingPatternHideMainPath = QStringLiteral("pattern/hideMainPath");
|
const QString settingPatternHideMainPath = QStringLiteral("pattern/hideMainPath");
|
||||||
const QString settingDoublePassmark = QStringLiteral("pattern/doublePassmark");
|
const QString settingDoublePassmark = QStringLiteral("pattern/doublePassmark");
|
||||||
|
const QString settingPatternDefaultSeamAllowance = QStringLiteral("pattern/defaultSeamAllowance");
|
||||||
|
|
||||||
const QString settingGeneralRecentFileList = QStringLiteral("recentFileList");
|
const QString settingGeneralRecentFileList = QStringLiteral("recentFileList");
|
||||||
const QString settingGeneralRestoreFileList = QStringLiteral("restoreFileList");
|
const QString settingGeneralRestoreFileList = QStringLiteral("restoreFileList");
|
||||||
|
@ -755,3 +758,50 @@ QChar VCommonSettings::GetDefCSVSeparator() const
|
||||||
{
|
{
|
||||||
return QChar(',');
|
return QChar(',');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VCommonSettings::SetDefaultSeamAllowance(double value)
|
||||||
|
{
|
||||||
|
setValue(settingPatternDefaultSeamAllowance, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
/**
|
||||||
|
* @brief returns the default seam allowance. The corresponding unit is the default unit.
|
||||||
|
* @return the default seam allowance
|
||||||
|
*/
|
||||||
|
double VCommonSettings::GetDefaultSeamAllowance()
|
||||||
|
{
|
||||||
|
double defaultValue;
|
||||||
|
|
||||||
|
//Unit globalUnit = VDomDocument::StrToUnits(GetUnit());
|
||||||
|
Unit globalUnit = Unit::Cm; // just for test purpuses
|
||||||
|
|
||||||
|
switch (globalUnit)
|
||||||
|
{
|
||||||
|
case Unit::Mm:
|
||||||
|
defaultValue = 10;
|
||||||
|
break;
|
||||||
|
case Unit::Inch:
|
||||||
|
defaultValue = 0.25;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
case Unit::Cm:
|
||||||
|
defaultValue = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ok = false;
|
||||||
|
double val = value(settingPatternDefaultSeamAllowance, defaultValue).toDouble(&ok);
|
||||||
|
if (ok == false)
|
||||||
|
{
|
||||||
|
qDebug()<< "Could not convert value"<<value(settingPatternDefaultSeamAllowance, 0)
|
||||||
|
<< "to int. Return default value for default seam allowance is "
|
||||||
|
<< defaultValue << ".";
|
||||||
|
val = defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,8 @@
|
||||||
|
|
||||||
#include "../vlayout/vbank.h"
|
#include "../vlayout/vbank.h"
|
||||||
|
|
||||||
|
class VDomDocument;
|
||||||
|
|
||||||
class VCommonSettings : public QSettings
|
class VCommonSettings : public QSettings
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -157,6 +159,10 @@ public:
|
||||||
QChar GetCSVSeparator() const;
|
QChar GetCSVSeparator() const;
|
||||||
QChar GetDefCSVSeparator() const;
|
QChar GetDefCSVSeparator() const;
|
||||||
|
|
||||||
|
void SetDefaultSeamAllowance(double value);
|
||||||
|
double GetDefaultSeamAllowance();
|
||||||
|
|
||||||
|
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
static const QString unixStandardSharePath;
|
static const QString unixStandardSharePath;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user