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

Refactoring.

Browse Source 
Code style.
This commit is contained in:
Roman Telezhynskyi 2023-06-27 13:45:46 +03:00
parent edd15cbbc0
commit 53dc4135e3
7 changed files with 165 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/puzzle/layout/vpsheet.h
View File

@ -28,15 +28,17 @@
#ifndef VPSHEET_H #ifndef VPSHEET_H
#define VPSHEET_H #define VPSHEET_H
#include <QSizeF>
#include <QMarginsF>
#include <QList>
#include <QComboBox> #include <QComboBox>
#include <QList>
#include <QMarginsF>
#include <QPageLayout>
#include <QSizeF>
#include <QUuid> #include <QUuid>
#include "def.h"
#include "layoutdef.h" #include "layoutdef.h"
#include "../vmisc/def.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#include "../vmisc/defglobal.h" #include "../vmisc/defglobal.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
@ -50,6 +52,7 @@ class VPGraphicsPiece;
class VPGraphicsTileGrid; class VPGraphicsTileGrid;
class VPGraphicsSheet; class VPGraphicsSheet;
class VLayoutPiece; class VLayoutPiece;
class QGraphicsItem;
class VPSheetSceneData class VPSheetSceneData
{ {
@ -108,7 +111,7 @@ private:
VPGraphicsPieceControls *m_rotationControls{nullptr}; VPGraphicsPieceControls *m_rotationControls{nullptr};
VPGraphicsTransformationOrigin *m_rotationOrigin{nullptr}; VPGraphicsTransformationOrigin *m_rotationOrigin{nullptr};
QList<VPGraphicsPiece*> m_graphicsPieces{}; QList<VPGraphicsPiece *> m_graphicsPieces{};
/** /**
* variable to hold temporarly hte value of the show tiles * variable to hold temporarly hte value of the show tiles
@ -136,6 +139,7 @@ private:
class VPSheet : public QObject class VPSheet : public QObject
{ {
Q_OBJECT // NOLINT Q_OBJECT // NOLINT
public: public:
explicit VPSheet(const VPLayoutPtr &layout, QObject *parent = nullptr); explicit VPSheet(const VPLayoutPtr &layout, QObject *parent = nullptr);
@ -314,7 +318,6 @@ private:
VPSheetSceneData *m_sceneData{nullptr}; VPSheetSceneData *m_sceneData{nullptr};
auto SheetUnits() const -> Unit; auto SheetUnits() const -> Unit;
}; };
Q_DECLARE_METATYPE(VPSheetPtr) // NOLINT Q_DECLARE_METATYPE(VPSheetPtr) // NOLINT

25
src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
View File

@ -27,10 +27,10 @@
*************************************************************************/ *************************************************************************/
#include "tapepreferencesconfigurationpage.h" #include "tapepreferencesconfigurationpage.h"
#include "ui_tapepreferencesconfigurationpage.h"
#include "../../mapplication.h" #include "../../mapplication.h"
#include "../../vtapesettings.h" #include "../../vtapesettings.h"
#include "../vpatterndb/pmsystems.h" #include "../vpatterndb/pmsystems.h"
#include "ui_tapepreferencesconfigurationpage.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
#include "../vmisc/backport/qoverload.h" #include "../vmisc/backport/qoverload.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
@ -47,10 +47,10 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare
RetranslateUi(); RetranslateUi();
InitLanguages(ui->langCombo); InitLanguages(ui->langCombo);
connect(ui->langCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() connect(ui->langCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
{ [this]() { m_langChanged = true; });
m_langChanged = true;
}); VTapeSettings *settings = MApplication::VApp()->TapeSettings();
//-------------------- Decimal separator setup //-------------------- Decimal separator setup
ui->osOptionCheck->setChecked(MApplication::VApp()->TapeSettings()->GetOsSeparator()); ui->osOptionCheck->setChecked(MApplication::VApp()->TapeSettings()->GetOsSeparator());
@ -63,11 +63,12 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare
//---------------------- Pattern making system //---------------------- Pattern making system
ui->systemBookValueLabel->setFixedHeight(4 * QFontMetrics(ui->systemBookValueLabel->font()).lineSpacing()); ui->systemBookValueLabel->setFixedHeight(4 * QFontMetrics(ui->systemBookValueLabel->font()).lineSpacing());
connect(ui->systemCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() connect(ui->systemCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
[this]()
{ {
m_systemChanged = true; m_systemChanged = true;
QString text = VAbstractApplication::VApp()->TrVars() QString text =
->PMSystemAuthor(ui->systemCombo->currentData().toString()); VAbstractApplication::VApp()->TrVars()->PMSystemAuthor(ui->systemCombo->currentData().toString());
ui->systemAuthorValueLabel->setText(text); ui->systemAuthorValueLabel->setText(text);
ui->systemAuthorValueLabel->setToolTip(text); ui->systemAuthorValueLabel->setToolTip(text);
@ -83,10 +84,8 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare
} }
//----------------------------- Measurements Editing //----------------------------- Measurements Editing
connect(ui->resetWarningsButton, &QPushButton::released, this, []() connect(ui->resetWarningsButton, &QPushButton::released, this,
{ []() { MApplication::VApp()->TapeSettings()->SetConfirmFormatRewriting(true); });
MApplication::VApp()->TapeSettings()->SetConfirmFormatRewriting(true);
});
//----------------------- Toolbar //----------------------- Toolbar
ui->toolBarStyleCheck->setChecked(MApplication::VApp()->TapeSettings()->GetToolBarStyle()); ui->toolBarStyleCheck->setChecked(MApplication::VApp()->TapeSettings()->GetToolBarStyle());
@ -133,7 +132,7 @@ auto TapePreferencesConfigurationPage::Apply() -> QStringList
m_systemChanged = false; m_systemChanged = false;
VAbstractApplication::VApp()->LoadTranslation(locale); VAbstractApplication::VApp()->LoadTranslation(locale);
QCoreApplication::processEvents();// force to call changeEvent QCoreApplication::processEvents(); // force to call changeEvent
// Part about measurments will not be updated automatically // Part about measurments will not be updated automatically
MApplication::VApp()->RetranslateTables(); MApplication::VApp()->RetranslateTables();

203
src/app/valentina/mainwindowsnogui.cpp
View File

@ -27,25 +27,25 @@
*************************************************************************/ *************************************************************************/
#include "mainwindowsnogui.h" #include "mainwindowsnogui.h"
#include "core/vapplication.h" #include "../ifc/xml/vvitconverter.h"
#include "../vpatterndb/vcontainer.h" #include "../ifc/xml/vvstconverter.h"
#include "dialogs/dialoglayoutsettings.h" #include "../vdxf/libdxfrw/drw_base.h"
#include "../vwidgets/vmaingraphicsscene.h" #include "../vformat/vmeasurements.h"
#include "../vlayout/vlayoutexporter.h"
#include "../vlayout/vlayoutgenerator.h"
#include "../vmisc/compatibility.h"
#include "../vmisc/dialogs/dialogexporttocsv.h" #include "../vmisc/dialogs/dialogexporttocsv.h"
#include "../vmisc/qxtcsvmodel.h" #include "../vmisc/qxtcsvmodel.h"
#include "../vmisc/compatibility.h"
#include "../vmisc/vsysexits.h" #include "../vmisc/vsysexits.h"
#include "../vformat/vmeasurements.h"
#include "../vlayout/vlayoutgenerator.h"
#include "dialogs/dialoglayoutprogress.h"
#include "dialogs/dialogsavelayout.h"
#include "../vlayout/vlayoutexporter.h"
#include "../vpatterndb/calculator.h"
#include "../vtools/tools/vabstracttool.h"
#include "../ifc/xml/vvstconverter.h"
#include "../ifc/xml/vvitconverter.h"
#include "../vmisc/vvalentinasettings.h" #include "../vmisc/vvalentinasettings.h"
#include "../vdxf/libdxfrw/drw_base.h" #include "../vpatterndb/calculator.h"
#include "../vpatterndb/vcontainer.h"
#include "../vtools/tools/vabstracttool.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "core/vapplication.h"
#include "dialogs/dialoglayoutprogress.h"
#include "dialogs/dialoglayoutsettings.h"
#include "dialogs/dialogsavelayout.h"
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include "../vmisc/vtextcodec.h" #include "../vmisc/vtextcodec.h"
@ -53,21 +53,21 @@
#include <QTextCodec> #include <QTextCodec>
#endif #endif
#include <QDebug>
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QMessageBox> #include <QMessageBox>
#include <QProcess>
#include <QToolButton>
#include <QtSvg>
#include <QPrintPreviewDialog>
#include <QPrintDialog>
#include <QPrinterInfo>
#include <QtConcurrent>
#include <functional>
#include <QPageSize> #include <QPageSize>
#include <QDebug> #include <QPrintDialog>
#include <QPrintPreviewDialog>
#include <QPrinterInfo>
#include <QProcess>
#include <QProgressDialog> #include <QProgressDialog>
#include <QToolButton>
#include <QtConcurrent>
#include <QtSvg>
#include <functional>
#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
#include <QWinTaskbarButton> #include <QWinTaskbarButton>
@ -117,13 +117,13 @@ void InsertGlobalContours(const QList<QGraphicsScene *> &scenes, const QList<QGr
return; return;
} }
for(int i = 0; i < scenes.size(); ++i) for (int i = 0; i < scenes.size(); ++i)
{ {
scenes.at(i)->addItem(gcontours.at(i)); scenes.at(i)->addItem(gcontours.at(i));
} }
} }
#endif #endif
} } // namespace
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent) MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent)
@ -131,7 +131,8 @@ MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent)
pattern(new VContainer(VAbstractApplication::VApp()->TrVars(), VAbstractValApplication::VApp()->patternUnitsP(), pattern(new VContainer(VAbstractApplication::VApp()->TrVars(), VAbstractValApplication::VApp()->patternUnitsP(),
valentinaNamespace)) valentinaNamespace))
#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
,m_taskbarButton(new QWinTaskbarButton(this)) ,
m_taskbarButton(new QWinTaskbarButton(this))
#endif #endif
{ {
InitTempLayoutScene(); InitTempLayoutScene();
@ -157,7 +158,7 @@ MainWindowsNoGUI::~MainWindowsNoGUI()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindowsNoGUI::ToolLayoutSettings(bool checked) void MainWindowsNoGUI::ToolLayoutSettings(bool checked)
{ {
QToolButton *tButton = qobject_cast< QToolButton * >(this->sender()); QToolButton *tButton = qobject_cast<QToolButton *>(this->sender());
SCASSERT(tButton != nullptr) SCASSERT(tButton != nullptr)
if (checked) if (checked)
@ -198,12 +199,10 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
m_taskbarProgress->setVisible(true); m_taskbarProgress->setVisible(true);
m_taskbarProgress->setValue(0); m_taskbarProgress->setValue(0);
m_taskbarProgress->setMaximum(lGenerator.GetNestingTime()*60); m_taskbarProgress->setMaximum(lGenerator.GetNestingTime() * 60);
progressTimer = new QTimer(this); progressTimer = new QTimer(this);
connect(progressTimer, &QTimer::timeout, this, [this, timer]() connect(progressTimer, &QTimer::timeout, this,
{ [this, timer]() { m_taskbarProgress->setValue(static_cast<int>(timer.elapsed() / 1000)); });
m_taskbarProgress->setValue(static_cast<int>(timer.elapsed()/1000));
});
progressTimer->start(1000); progressTimer->start(1000);
#endif #endif
@ -219,7 +218,8 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
{ {
// Because the progress bar dialog will not terminate nesting we must create separate timer for this // Because the progress bar dialog will not terminate nesting we must create separate timer for this
auto *progressTimer = new QTimer(this); auto *progressTimer = new QTimer(this);
connect(progressTimer, &QTimer::timeout, this, [timer, &lGenerator, progressTimer]() connect(progressTimer, &QTimer::timeout, this,
[timer, &lGenerator, progressTimer]()
{ {
const int timeout = static_cast<int>(lGenerator.GetNestingTimeMSecs() - timer.elapsed()); const int timeout = static_cast<int>(lGenerator.GetNestingTimeMSecs() - timer.elapsed());
@ -264,7 +264,7 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
QCoreApplication::processEvents(); QCoreApplication::processEvents();
#ifdef LAYOUT_DEBUG #ifdef LAYOUT_DEBUG
const QString path = QDir::homePath()+QStringLiteral("/LayoutDebug"); const QString path = QDir::homePath() + QStringLiteral("/LayoutDebug");
QDir debugDir(path); QDir debugDir(path);
debugDir.removeRecursively(); debugDir.removeRecursively();
debugDir.mkpath(path); debugDir.mkpath(path);
@ -301,16 +301,16 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
} }
CleanLayout(); CleanLayout();
m_layoutSettings->SetLayoutPapers(lGenerator.GetPapersItems());// Blank sheets m_layoutSettings->SetLayoutPapers(lGenerator.GetPapersItems()); // Blank sheets
m_layoutSettings->SetLayoutDetails(lGenerator.GetAllDetailsItems());// All details items m_layoutSettings->SetLayoutDetails(lGenerator.GetAllDetailsItems()); // All details items
detailsOnLayout = lGenerator.GetAllDetails();// All details items detailsOnLayout = lGenerator.GetAllDetails(); // All details items
m_layoutSettings->SetLayoutShadows(CreateShadows(m_layoutSettings->LayoutPapers())); m_layoutSettings->SetLayoutShadows(CreateShadows(m_layoutSettings->LayoutPapers()));
m_layoutSettings->SetLayoutPortrait(lGenerator.IsPortrait()); m_layoutSettings->SetLayoutPortrait(lGenerator.IsPortrait());
m_layoutSettings->SetLayoutScenes(CreateScenes(m_layoutSettings->LayoutPapers(), m_layoutSettings->SetLayoutScenes(CreateScenes(m_layoutSettings->LayoutPapers(),
m_layoutSettings->LayoutShadows(), m_layoutSettings->LayoutShadows(),
m_layoutSettings->LayoutDetails())); m_layoutSettings->LayoutDetails()));
#if !defined(V_NO_ASSERT) #if !defined(V_NO_ASSERT)
//Uncomment to debug, shows global contour // Uncomment to debug, shows global contour
// gcontours = lGenerator.GetGlobalContours(); // uncomment for debugging // gcontours = lGenerator.GetGlobalContours(); // uncomment for debugging
// InsertGlobalContours(scenes, gcontours); // uncomment for debugging // InsertGlobalContours(scenes, gcontours); // uncomment for debugging
#endif #endif
@ -320,8 +320,8 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
} }
m_layoutSettings->SetIgnorePrinterMargins(not lGenerator.IsUsePrinterFields()); m_layoutSettings->SetIgnorePrinterMargins(not lGenerator.IsUsePrinterFields());
m_layoutSettings->SetLayoutMargins(lGenerator.GetPrinterFields()); m_layoutSettings->SetLayoutMargins(lGenerator.GetPrinterFields());
m_layoutSettings->SetLayoutPaperSize(QSizeF(lGenerator.GetPaperWidth(), m_layoutSettings->SetLayoutPaperSize(
lGenerator.GetPaperHeight())); QSizeF(lGenerator.GetPaperWidth(), lGenerator.GetPaperHeight()));
m_layoutSettings->SetAutoCropLength(lGenerator.GetAutoCropLength()); m_layoutSettings->SetAutoCropLength(lGenerator.GetAutoCropLength());
m_layoutSettings->SetAutoCropWidth(lGenerator.GetAutoCropWidth()); m_layoutSettings->SetAutoCropWidth(lGenerator.GetAutoCropWidth());
m_layoutSettings->SetUnitePages(lGenerator.IsUnitePages()); m_layoutSettings->SetUnitePages(lGenerator.IsUnitePages());
@ -349,7 +349,7 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
rotationUsed = true; rotationUsed = true;
} }
} }
lGenerator.SetShift(lGenerator.GetShift()/2.0); lGenerator.SetShift(lGenerator.GetShift() / 2.0);
break; break;
case LayoutErrors::EmptyPaperError: case LayoutErrors::EmptyPaperError:
if (lGenerator.IsRotationNeeded()) if (lGenerator.IsRotationNeeded())
@ -362,13 +362,13 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
} }
else else
{ {
lGenerator.SetShift(lGenerator.GetShift()/2.0); lGenerator.SetShift(lGenerator.GetShift() / 2.0);
rotationUsed = false; rotationUsed = false;
} }
} }
else else
{ {
lGenerator.SetShift(lGenerator.GetShift()/2.0); lGenerator.SetShift(lGenerator.GetShift() / 2.0);
} }
break; break;
case LayoutErrors::Timeout: case LayoutErrors::Timeout:
@ -381,10 +381,10 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool
nestingState = lGenerator.State(); nestingState = lGenerator.State();
if (nestingState == LayoutErrors::PrepareLayoutError || nestingState == LayoutErrors::ProcessStoped if (nestingState == LayoutErrors::PrepareLayoutError || nestingState == LayoutErrors::ProcessStoped ||
|| nestingState == LayoutErrors::TerminatedByException nestingState == LayoutErrors::TerminatedByException ||
|| (nestingState == LayoutErrors::NoError && not qFuzzyIsNull(lGenerator.GetEfficiencyCoefficient()) (nestingState == LayoutErrors::NoError && not qFuzzyIsNull(lGenerator.GetEfficiencyCoefficient()) &&
&& efficiency >= lGenerator.GetEfficiencyCoefficient())) efficiency >= lGenerator.GetEfficiencyCoefficient()))
{ {
if (not lGenerator.IsPreferOneSheetSolution() || lGenerator.PapersCount() == 1) if (not lGenerator.IsPreferOneSheetSolution() || lGenerator.PapersCount() == 1)
{ {
@ -494,10 +494,11 @@ void MainWindowsNoGUI::ExportData(const QVector<VLayoutPiece> &listDetails)
for (int i = 0; i < detailsOnLayout.size(); ++i) for (int i = 0; i < detailsOnLayout.size(); ++i)
{ {
const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() + const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() +
QString::number(i+1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format()); QString::number(i + 1) +
VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format());
QGraphicsRectItem *paper = qgraphicsitem_cast<QGraphicsRectItem *>( QGraphicsRectItem *paper =
m_layoutSettings->LayoutPapers().at(i)); qgraphicsitem_cast<QGraphicsRectItem *>(m_layoutSettings->LayoutPapers().at(i));
SCASSERT(paper != nullptr) SCASSERT(paper != nullptr)
ExportApparelLayout(detailsOnLayout.at(i), name, paper->rect().size().toSize()); ExportApparelLayout(detailsOnLayout.at(i), name, paper->rect().size().toSize());
@ -524,9 +525,9 @@ void MainWindowsNoGUI::ExportData(const QVector<VLayoutPiece> &listDetails)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindowsNoGUI::ExportFlatLayout(const QList<QGraphicsScene *> &scenes, void MainWindowsNoGUI::ExportFlatLayout(const QList<QGraphicsScene *> &scenes, const QList<QGraphicsItem *> &papers,
const QList<QGraphicsItem *> &papers, const QList<QGraphicsItem *> &shadows, const QList<QGraphicsItem *> &shadows,
const QList<QList<QGraphicsItem *> > &details, bool ignorePrinterFields, const QList<QList<QGraphicsItem *>> &details, bool ignorePrinterFields,
const QMarginsF &margins) const QMarginsF &margins)
{ {
const QString path = m_dialogSaveLayout->Path(); const QString path = m_dialogSaveLayout->Path();
@ -579,7 +580,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector<VLayoutPiece> &li
if (piece.IsForceFlipping()) if (piece.IsForceFlipping())
{ {
item->setPos(piece.GetMx()-diff, piece.GetMy()); item->setPos(piece.GetMx() - diff, piece.GetMy());
} }
else else
{ {
@ -593,7 +594,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector<VLayoutPiece> &li
scene->addItem(item); scene->addItem(item);
} }
QList<QGraphicsItem *> papers;// Blank sheets QList<QGraphicsItem *> papers; // Blank sheets
QRect rect = scene->itemsBoundingRect().toRect(); QRect rect = scene->itemsBoundingRect().toRect();
const int mx = rect.x(); const int mx = rect.x();
@ -614,7 +615,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector<VLayoutPiece> &li
paper->setBrush(QBrush(Qt::white)); paper->setBrush(QBrush(Qt::white));
papers.append(paper); papers.append(paper);
QList<QList<QGraphicsItem *> > details;// All details QList<QList<QGraphicsItem *>> details; // All details
details.append(list); details.append(list);
QList<QGraphicsItem *> shadows = CreateShadows(papers); QList<QGraphicsItem *> shadows = CreateShadows(papers);
@ -624,7 +625,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector<VLayoutPiece> &li
const qreal margin = ToPixel(1, Unit::Cm); const qreal margin = ToPixel(1, Unit::Cm);
ExportFlatLayout(scenes, papers, shadows, details, ignorePrinterFields, QMarginsF(margin, margin, margin, margin)); ExportFlatLayout(scenes, papers, shadows, details, ignorePrinterFields, QMarginsF(margin, margin, margin, margin));
qDeleteAll(scenes);//Scene will clear all other items qDeleteAll(scenes); // Scene will clear all other items
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -688,7 +689,7 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector<VLayoutPiece> listDe
QList<QGraphicsItem *> list; QList<QGraphicsItem *> list;
list.reserve(listDetails.count()); list.reserve(listDetails.count());
for (int i=0; i < listDetails.count(); ++i) for (int i = 0; i < listDetails.count(); ++i)
{ {
VLayoutPiece piece = listDetails.at(i); VLayoutPiece piece = listDetails.at(i);
QGraphicsItem *item = piece.GetItem(m_dialogSaveLayout->IsTextAsPaths()); QGraphicsItem *item = piece.GetItem(m_dialogSaveLayout->IsTextAsPaths());
@ -705,8 +706,8 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector<VLayoutPiece> listDe
QTransform moveMatrix = piece.GetMatrix(); QTransform moveMatrix = piece.GetMatrix();
if (piece.IsForceFlipping()) if (piece.IsForceFlipping())
{ {
item->setPos(piece.GetMx()-diff, piece.GetMy()); item->setPos(piece.GetMx() - diff, piece.GetMy());
moveMatrix = moveMatrix.translate(-piece.GetMx()+diff, piece.GetMy()); moveMatrix = moveMatrix.translate(-piece.GetMx() + diff, piece.GetMy());
} }
else else
{ {
@ -737,7 +738,7 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector<VLayoutPiece> listDe
rect = scene->itemsBoundingRect().toRect(); rect = scene->itemsBoundingRect().toRect();
for (int i=0; i < listDetails.count(); ++i) for (int i = 0; i < listDetails.count(); ++i)
{ {
QTransform moveMatrix = listDetails.at(i).GetMatrix(); QTransform moveMatrix = listDetails.at(i).GetMatrix();
if (listDetails.at(i).IsForceFlipping()) if (listDetails.at(i).IsForceFlipping())
@ -751,8 +752,8 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector<VLayoutPiece> listDe
listDetails[i].SetMatrix(moveMatrix); listDetails[i].SetMatrix(moveMatrix);
} }
const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() + const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() + QString::number(1) +
QString::number(1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format()); VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format());
ExportApparelLayout(listDetails, name, rect.size()); ExportApparelLayout(listDetails, name, rect.size());
} }
@ -782,8 +783,8 @@ void MainWindowsNoGUI::PrintPreviewTiled()
VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
m_layoutSettings->SetTiledMargins(settings->GetTiledPDFMargins(Unit::Mm)); m_layoutSettings->SetTiledMargins(settings->GetTiledPDFMargins(Unit::Mm));
m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation()); m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation());
m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), m_layoutSettings->SetTiledPDFPaperSize(
settings->GetTiledPDFPaperHeight(Unit::Mm))); QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), settings->GetTiledPDFPaperHeight(Unit::Mm)));
} }
m_layoutSettings->SetWatermarkPath( m_layoutSettings->SetWatermarkPath(
@ -816,8 +817,8 @@ void MainWindowsNoGUI::PrintTiled()
VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
m_layoutSettings->SetTiledMargins(settings->GetTiledPDFMargins(Unit::Mm)); m_layoutSettings->SetTiledMargins(settings->GetTiledPDFMargins(Unit::Mm));
m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation()); m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation());
m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), m_layoutSettings->SetTiledPDFPaperSize(
settings->GetTiledPDFPaperHeight(Unit::Mm))); QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), settings->GetTiledPDFPaperHeight(Unit::Mm)));
} }
m_layoutSettings->SetWatermarkPath( m_layoutSettings->SetWatermarkPath(
@ -877,7 +878,7 @@ auto MainWindowsNoGUI::PrepareDetailsForLayout(const QVector<DetailForLayout> &d
void MainWindowsNoGUI::InitTempLayoutScene() void MainWindowsNoGUI::InitTempLayoutScene()
{ {
tempSceneLayout = new VMainGraphicsScene(); tempSceneLayout = new VMainGraphicsScene();
tempSceneLayout->setBackgroundBrush( QBrush(QColor(Qt::gray), Qt::SolidPattern) ); tempSceneLayout->setBackgroundBrush(QBrush(QColor(Qt::gray), Qt::SolidPattern));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -902,24 +903,24 @@ auto MainWindowsNoGUI::ScenePreview(int i, QSize iconSize, PreviewQuatilty quali
{ {
const QRectF r = paper->rect(); const QRectF r = paper->rect();
// Create the image with the exact size of the shrunk scene // Create the image with the exact size of the shrunk scene
image = QImage(QSize(static_cast<qint32>(r.width()), static_cast<qint32>(r.height())), image =
QImage::Format_RGB32); QImage(QSize(static_cast<qint32>(r.width()), static_cast<qint32>(r.height())), QImage::Format_RGB32);
if (not image.isNull()) if (not image.isNull())
{ {
image.fill(Qt::white); image.fill(Qt::white);
QPainter painter(&image); QPainter painter(&image);
painter.setFont( QFont( QStringLiteral("Arial"), 8, QFont::Normal ) ); painter.setFont(QFont(QStringLiteral("Arial"), 8, QFont::Normal));
painter.setRenderHint(QPainter::Antialiasing, true); painter.setRenderHint(QPainter::Antialiasing, true);
painter.setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthMainLine(), Qt::SolidLine, painter.setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthMainLine(), Qt::SolidLine,
Qt::RoundCap, Qt::RoundJoin)); Qt::RoundCap, Qt::RoundJoin));
painter.setBrush ( QBrush ( Qt::NoBrush ) ); painter.setBrush(QBrush(Qt::NoBrush));
m_layoutSettings->LayoutScenes().at(i)->render(&painter, r, r, Qt::IgnoreAspectRatio); m_layoutSettings->LayoutScenes().at(i)->render(&painter, r, r, Qt::IgnoreAspectRatio);
painter.end(); painter.end();
} }
else else
{ {
qDebug()<<"Cannot create image. Size " << r.size() << "too big"; qDebug() << "Cannot create image. Size " << r.size() << "too big";
image = QImage(iconSize, QImage::Format_RGB32); image = QImage(iconSize, QImage::Format_RGB32);
image.fill(Qt::white); image.fill(Qt::white);
@ -941,11 +942,11 @@ auto MainWindowsNoGUI::CreateShadows(const QList<QGraphicsItem *> &papers) -> QL
for (auto *paper : papers) for (auto *paper : papers)
{ {
qreal x1=0, y1=0, x2=0, y2=0; qreal x1 = 0, y1 = 0, x2 = 0, y2 = 0;
if (QGraphicsRectItem *item = qgraphicsitem_cast<QGraphicsRectItem *>(paper)) if (QGraphicsRectItem *item = qgraphicsitem_cast<QGraphicsRectItem *>(paper))
{ {
item->rect().getCoords(&x1, &y1, &x2, &y2); item->rect().getCoords(&x1, &y1, &x2, &y2);
QGraphicsRectItem *shadowPaper = new QGraphicsRectItem(QRectF(x1+4, y1+4, x2+4, y2+4)); QGraphicsRectItem *shadowPaper = new QGraphicsRectItem(QRectF(x1 + 4, y1 + 4, x2 + 4, y2 + 4));
shadowPaper->setBrush(QBrush(Qt::black)); shadowPaper->setBrush(QBrush(Qt::black));
shadows.append(shadowPaper); shadows.append(shadowPaper);
} }
@ -964,7 +965,7 @@ auto MainWindowsNoGUI::CreateScenes(const QList<QGraphicsItem *> &papers, const
{ {
QList<QGraphicsScene *> scenes; QList<QGraphicsScene *> scenes;
scenes.reserve(papers.size()); scenes.reserve(papers.size());
for (int i=0; i<papers.size(); ++i) for (int i = 0; i < papers.size(); ++i)
{ {
auto *scene = new VMainGraphicsScene(); auto *scene = new VMainGraphicsScene();
scene->SetNonInteractive(true); scene->SetNonInteractive(true);
@ -1003,8 +1004,8 @@ void MainWindowsNoGUI::PdfTiledFile(const QString &name)
VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
m_layoutSettings->SetTiledMargins(QMarginsF(settings->GetTiledPDFMargins(Unit::Mm))); m_layoutSettings->SetTiledMargins(QMarginsF(settings->GetTiledPDFMargins(Unit::Mm)));
m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation()); m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation());
m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), m_layoutSettings->SetTiledPDFPaperSize(
settings->GetTiledPDFPaperHeight(Unit::Mm))); QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), settings->GetTiledPDFPaperHeight(Unit::Mm)));
m_layoutSettings->SetXScale(1); m_layoutSettings->SetXScale(1);
m_layoutSettings->SetYScale(1); m_layoutSettings->SetYScale(1);
} }
@ -1015,10 +1016,9 @@ void MainWindowsNoGUI::PdfTiledFile(const QString &name)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes, void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes, const QList<QGraphicsItem *> &papers,
const QList<QGraphicsItem *> &papers, const QList<QGraphicsItem *> &shadows, const QList<QGraphicsItem *> &shadows, const QList<QList<QGraphicsItem *>> &details,
const QList<QList<QGraphicsItem *> > &details, bool ignorePrinterFields, bool ignorePrinterFields, const QMarginsF &margins) const
const QMarginsF &margins) const
{ {
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wnoexcept") QT_WARNING_DISABLE_GCC("-Wnoexcept")
@ -1036,17 +1036,18 @@ void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes,
exporter.SetBinaryDxfFormat(m_dialogSaveLayout->IsBinaryDXFFormat()); exporter.SetBinaryDxfFormat(m_dialogSaveLayout->IsBinaryDXFFormat());
exporter.SetShowGrainline(m_dialogSaveLayout->IsShowGrainline()); exporter.SetShowGrainline(m_dialogSaveLayout->IsShowGrainline());
for (int i=0; i < scenes.size(); ++i) for (int i = 0; i < scenes.size(); ++i)
{ {
auto *paper = qgraphicsitem_cast<QGraphicsRectItem *>(papers.at(i)); auto *paper = qgraphicsitem_cast<QGraphicsRectItem *>(papers.at(i));
if (paper != nullptr) if (paper != nullptr)
{ {
const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() + const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() +
QString::number(i+1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format()); QString::number(i + 1) +
VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format());
auto *brush = new QBrush(); auto *brush = new QBrush();
brush->setColor( QColor( Qt::white ) ); brush->setColor(QColor(Qt::white));
QGraphicsScene *scene = scenes.at(i); QGraphicsScene *scene = scenes.at(i);
scene->setBackgroundBrush( *brush ); scene->setBackgroundBrush(*brush);
shadows[i]->setVisible(false); shadows[i]->setVisible(false);
const qreal thinPen = 0.1; const qreal thinPen = 0.1;
paper->setPen(QPen(QBrush(Qt::white, Qt::NoBrush), thinPen, Qt::NoPen)); paper->setPen(QPen(QBrush(Qt::white, Qt::NoBrush), thinPen, Qt::NoPen));
@ -1149,9 +1150,9 @@ void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes,
break; break;
} }
paper->setPen(QPen(Qt::black, 1)); paper->setPen(QPen(Qt::black, 1));
brush->setColor( QColor( Qt::gray ) ); brush->setColor(QColor(Qt::gray));
brush->setStyle( Qt::SolidPattern ); brush->setStyle(Qt::SolidPattern);
scenes[i]->setBackgroundBrush( *brush ); scenes[i]->setBackgroundBrush(*brush);
shadows[i]->setVisible(true); shadows[i]->setVisible(true);
delete brush; delete brush;
} }
@ -1163,7 +1164,8 @@ auto MainWindowsNoGUI::FileName() const -> QString
{ {
QString fileName; QString fileName;
VAbstractValApplication::VApp()->GetPatternPath().isEmpty() VAbstractValApplication::VApp()->GetPatternPath().isEmpty()
? fileName = tr("unnamed") : fileName = VAbstractValApplication::VApp()->GetPatternPath(); ? fileName = tr("unnamed")
: fileName = VAbstractValApplication::VApp()->GetPatternPath();
return QFileInfo(fileName).baseName(); return QFileInfo(fileName).baseName();
} }
@ -1188,7 +1190,7 @@ auto MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo
VContainer completeData = doc->GetCompleteData(); VContainer completeData = doc->GetCompleteData();
completeData.FillPiecesAreas(VAbstractValApplication::VApp()->patternUnits()); completeData.FillPiecesAreas(VAbstractValApplication::VApp()->patternUnits());
for (int i=0; i < measurements.size(); ++i) for (int i = 0; i < measurements.size(); ++i)
{ {
const VFinalMeasurement &m = measurements.at(i); const VFinalMeasurement &m = measurements.at(i);
@ -1206,9 +1208,10 @@ auto MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo
if (qIsInf(result) || qIsNaN(result)) if (qIsInf(result) || qIsNaN(result))
{ {
qCritical("%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")), qCritical(
qUtf8Printable(tr("Value in line %1 is infinite or NaN. Please, check your calculations.") "%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")),
.arg(i+1))); qUtf8Printable(
tr("Value in line %1 is infinite or NaN. Please, check your calculations.").arg(i + 1)));
if (not VApplication::IsGUIMode()) if (not VApplication::IsGUIMode())
{ {
QCoreApplication::exit(V_EX_DATAERR); QCoreApplication::exit(V_EX_DATAERR);
@ -1219,7 +1222,7 @@ auto MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)
{ {
qCritical("%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")), qCritical("%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")),
qUtf8Printable(tr("Parser error at line %1: %2.").arg(i+1).arg(e.GetMsg()))); qUtf8Printable(tr("Parser error at line %1: %2.").arg(i + 1).arg(e.GetMsg())));
if (not VApplication::IsGUIMode()) if (not VApplication::IsGUIMode())
{ {
QCoreApplication::exit(V_EX_DATAERR); QCoreApplication::exit(V_EX_DATAERR);
@ -1269,12 +1272,12 @@ auto MainWindowsNoGUI::OpenMeasurementFile(const QString &path) const -> QShared
if (m->Type() == MeasurementsType::Multisize) if (m->Type() == MeasurementsType::Multisize)
{ {
VVSTConverter converter(path); VVSTConverter converter(path);
m->setXMLContent(converter.Convert());// Read again after conversion m->setXMLContent(converter.Convert()); // Read again after conversion
} }
else else
{ {
VVITConverter converter(path); VVITConverter converter(path);
m->setXMLContent(converter.Convert());// Read again after conversion m->setXMLContent(converter.Convert()); // Read again after conversion
} }
if (not m->IsDefinedKnownNamesValid()) if (not m->IsDefinedKnownNamesValid())
@ -1307,8 +1310,8 @@ auto MainWindowsNoGUI::OpenMeasurementFile(const QString &path) const -> QShared
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindowsNoGUI::CheckRequiredMeasurements(const VMeasurements *m) const void MainWindowsNoGUI::CheckRequiredMeasurements(const VMeasurements *m) const
{ {
const QSet<QString> match = ConvertToSet<QString>(doc->ListMeasurements()) const QSet<QString> match =
.subtract(ConvertToSet<QString>(m->ListAll())); ConvertToSet<QString>(doc->ListMeasurements()).subtract(ConvertToSet<QString>(m->ListAll()));
if (not match.isEmpty()) if (not match.isEmpty())
{ {

5
src/libs/vmisc/vabstractvalapplication.h
View File

@ -43,8 +43,9 @@ class VAbstractValApplication : public VAbstractApplication
{ {
Q_OBJECT // NOLINT Q_OBJECT // NOLINT
public : VAbstractValApplication(int &argc, char **argv); public:
virtual ~VAbstractValApplication() = default; VAbstractValApplication(int &argc, char **argv);
~VAbstractValApplication() override = default;
auto GetCustomerName() const -> QString; auto GetCustomerName() const -> QString;
void SetCustomerName(const QString &name); void SetCustomerName(const QString &name);