Choose individual measurements.
--HG-- branch : feature
This commit is contained in:
parent
2cddab80d4
commit
a950a9f59b
|
@ -29,9 +29,13 @@
|
|||
#include "dialogindividualmeasurements.h"
|
||||
#include "ui_dialogindividualmeasurements.h"
|
||||
#include <QButtonGroup>
|
||||
#include "../../xml/vindividualmeasurements.h"
|
||||
#include <QSettings>
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
|
||||
DialogIndividualMeasurements::DialogIndividualMeasurements(QWidget *parent) :
|
||||
QDialog(parent), ui(new Ui::DialogIndividualMeasurements), _name(QString()), _tablePath(QString())
|
||||
DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, QWidget *parent) :
|
||||
QDialog(parent), ui(new Ui::DialogIndividualMeasurements), _name(QString()), _tablePath(QString()), data(data)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
|
@ -46,10 +50,14 @@ DialogIndividualMeasurements::DialogIndividualMeasurements(QWidget *parent) :
|
|||
connect(bCansel, &QPushButton::clicked, this, &DialogIndividualMeasurements::DialogRejected);
|
||||
}
|
||||
|
||||
LoadIndividualTables();
|
||||
|
||||
CheckState();
|
||||
connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogIndividualMeasurements::CheckState);
|
||||
connect(ui->buttonGroupPath, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this,
|
||||
&DialogIndividualMeasurements::CheckState);
|
||||
connect(ui->toolButtonOpenExist, &QToolButton::clicked, this, &DialogIndividualMeasurements::OpenTable);
|
||||
connect(ui->toolButtonOpenNew, &QToolButton::clicked, this, &DialogIndividualMeasurements::NewTable);
|
||||
}
|
||||
|
||||
DialogIndividualMeasurements::~DialogIndividualMeasurements()
|
||||
|
@ -67,6 +75,20 @@ void DialogIndividualMeasurements::DialogAccepted()
|
|||
else
|
||||
{
|
||||
_tablePath = ui->lineEditPathNewM->text();
|
||||
QFile table(_tablePath);
|
||||
if (table.exists())
|
||||
{
|
||||
table.remove();
|
||||
}
|
||||
|
||||
const qint32 index = ui->comboBoxLang->currentIndex();
|
||||
QString path = ui->comboBoxLang->itemData(index).toString();
|
||||
QFile iMeasur(path);
|
||||
if ( iMeasur.copy(_tablePath) == false )
|
||||
{
|
||||
QMessageBox::warning(this, tr("Could not create measurements file"), tr("Please try again or change file"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
accept();
|
||||
}
|
||||
|
@ -94,18 +116,141 @@ void DialogIndividualMeasurements::CheckState()
|
|||
|
||||
ui->lineEditPathNewM->setEnabled(false);
|
||||
ui->toolButtonOpenNew->setEnabled(false);
|
||||
ui->comboBoxLang->setEditable(false);
|
||||
|
||||
if (ui->lineEditPathExistM->text().isEmpty() == false)
|
||||
{
|
||||
flagPath = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->lineEditPathNewM->setEnabled(true);
|
||||
ui->toolButtonOpenNew->setEnabled(true);
|
||||
ui->comboBoxLang->setEditable(true);
|
||||
|
||||
ui->toolButtonOpenExist->setEnabled(false);
|
||||
ui->lineEditPathExistM->setEnabled(false);
|
||||
|
||||
if (ui->lineEditPathNewM->text().isEmpty() == false)
|
||||
{
|
||||
flagPath = true;
|
||||
}
|
||||
}
|
||||
|
||||
bool flagLang = false;
|
||||
{
|
||||
const QComboBox *box = ui->comboBoxLang;
|
||||
Q_CHECK_PTR(box);
|
||||
if (box->count() > 0 && box->currentIndex() != -1)
|
||||
{
|
||||
flagLang = true;
|
||||
}
|
||||
}
|
||||
|
||||
QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
|
||||
Q_CHECK_PTR(bOk);
|
||||
bOk->setEnabled(flagName && flagPath);
|
||||
bOk->setEnabled(flagName && flagPath && flagLang);
|
||||
}
|
||||
|
||||
void DialogIndividualMeasurements::LoadIndividualTables()
|
||||
{
|
||||
#ifdef Q_OS_WIN
|
||||
const QString pathToTables = QString("/tables/individual");
|
||||
#else
|
||||
#ifdef QT_DEBUG
|
||||
const QString pathToTables = QString("/tables/individual");
|
||||
#else
|
||||
const QString pathToTables = QString("/usr/share/valentina/tables/individual");
|
||||
#endif
|
||||
#endif
|
||||
QStringList filters;
|
||||
filters << "*.vit";
|
||||
QDir tablesDir(pathToTables);
|
||||
tablesDir.setNameFilters(filters);
|
||||
|
||||
const QStringList allFiles = tablesDir.entryList(QDir::NoDotAndDotDot | QDir::Files);
|
||||
if (allFiles.isEmpty() == true)
|
||||
{
|
||||
ui->comboBoxLang->clear();
|
||||
CheckState();
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = 0; i < allFiles.size(); ++i)
|
||||
{
|
||||
QFile file(allFiles.at(i));
|
||||
if (file.open(QIODevice::ReadOnly))
|
||||
{
|
||||
try
|
||||
{
|
||||
VDomDocument::ValidatePattern("://schema/standard_measurements.xsd", allFiles.at(i));
|
||||
}
|
||||
catch(VException &e)
|
||||
{
|
||||
qWarning()<<"Validation file error."<<e.ErrorMessage()<<e.DetailedInformation()<<Q_FUNC_INFO;
|
||||
continue;
|
||||
}
|
||||
|
||||
VIndividualMeasurements m(data);
|
||||
try
|
||||
{
|
||||
m.setContent(&file);
|
||||
const QString lang = QLocale(m.Language()).nativeLanguageName();
|
||||
ui->comboBoxLang->addItem(lang, QVariant(allFiles.at(i)));
|
||||
}
|
||||
catch(VException &e)
|
||||
{
|
||||
qWarning()<<"Parsing pattern file error."<<e.ErrorMessage()<<e.DetailedInformation()<<Q_FUNC_INFO;
|
||||
continue;
|
||||
}
|
||||
|
||||
file.close();
|
||||
}
|
||||
else
|
||||
{
|
||||
qWarning()<<tr("Cannot read file %1:\n%2.").arg(allFiles.at(i)).arg(file.errorString()) << Q_FUNC_INFO;
|
||||
}
|
||||
}
|
||||
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(),
|
||||
QApplication::applicationName());
|
||||
|
||||
QString defaultLocale = QLocale::system().name(); // e.g. "de_DE"
|
||||
defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
|
||||
QString checkedLocale = settings.value("configuration/locale", defaultLocale).toString();
|
||||
|
||||
// set default translators and language checked
|
||||
qint32 index = ui->comboBoxLang->findData(checkedLocale);
|
||||
if (index != -1)
|
||||
{
|
||||
ui->comboBoxLang->setCurrentIndex(index);
|
||||
}
|
||||
}
|
||||
|
||||
void DialogIndividualMeasurements::OpenTable()
|
||||
{
|
||||
const QString filter(tr("Individual measurements (*.vit)"));
|
||||
const QString fileName = QFileDialog::getOpenFileName(this, tr("Open file"), QDir::homePath(), filter);
|
||||
ui->lineEditPathExistM->setText(fileName);
|
||||
CheckState();
|
||||
}
|
||||
|
||||
void DialogIndividualMeasurements::NewTable()
|
||||
{
|
||||
QString name = QFileDialog::getSaveFileName(this, tr("Where save measurements?"), QDir::homePath(),
|
||||
tr("Individual measurements (*.vit)"));
|
||||
|
||||
if (name.isEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// what if the users did not specify a suffix...?
|
||||
QFileInfo f( name );
|
||||
if (f.suffix().isEmpty() && f.suffix() != "vit")
|
||||
{
|
||||
name += ".vit";
|
||||
}
|
||||
ui->lineEditPathNewM->setText(name);
|
||||
CheckState();
|
||||
}
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#define DIALOGINDIVIDUALMEASUREMENTS_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "../../container/vcontainer.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
@ -41,7 +42,7 @@ class DialogIndividualMeasurements : public QDialog
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DialogIndividualMeasurements(QWidget *parent = nullptr);
|
||||
explicit DialogIndividualMeasurements(VContainer *data, QWidget *parent = nullptr);
|
||||
~DialogIndividualMeasurements();
|
||||
QString name() const;
|
||||
QString tablePath() const;
|
||||
|
@ -50,9 +51,13 @@ private:
|
|||
Ui::DialogIndividualMeasurements *ui;
|
||||
QString _name;
|
||||
QString _tablePath;
|
||||
VContainer *data;
|
||||
void DialogAccepted();
|
||||
void DialogRejected();
|
||||
void CheckState();
|
||||
void LoadIndividualTables();
|
||||
void OpenTable();
|
||||
void NewTable();
|
||||
};
|
||||
|
||||
inline QString DialogIndividualMeasurements::name() const
|
||||
|
|
|
@ -81,6 +81,9 @@
|
|||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboBoxLang"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="lineEditPathNewM"/>
|
||||
</item>
|
||||
|
|
|
@ -132,7 +132,7 @@ void MainWindow::ActionNewDraw()
|
|||
}
|
||||
else
|
||||
{
|
||||
DialogIndividualMeasurements indMeasurements(this);
|
||||
DialogIndividualMeasurements indMeasurements(pattern, this);
|
||||
if (indMeasurements.exec() == QDialog::Accepted)
|
||||
{
|
||||
nameDraw = indMeasurements.name();
|
||||
|
|
Loading…
Reference in New Issue
Block a user