From 53dc4135e3d8baabf12c87765745a1258501b45d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 27 Jun 2023 13:45:46 +0300 Subject: [PATCH] Refactoring. Code style. --- src/app/puzzle/layout/vpsheet.h | 15 +- src/app/puzzle/vpmainwindow.h | 2 +- .../tapepreferencesconfigurationpage.cpp | 61 +++-- src/app/tape/tmainwindow.h | 2 +- src/app/valentina/mainwindow.h | 2 +- src/app/valentina/mainwindowsnogui.cpp | 237 +++++++++--------- src/libs/vmisc/vabstractvalapplication.h | 5 +- 7 files changed, 165 insertions(+), 159 deletions(-) diff --git a/src/app/puzzle/layout/vpsheet.h b/src/app/puzzle/layout/vpsheet.h index c266990fb..d75de99ce 100644 --- a/src/app/puzzle/layout/vpsheet.h +++ b/src/app/puzzle/layout/vpsheet.h @@ -28,15 +28,17 @@ #ifndef VPSHEET_H #define VPSHEET_H -#include -#include -#include #include +#include +#include +#include +#include #include -#include "def.h" #include "layoutdef.h" +#include "../vmisc/def.h" + #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" #endif // QT_VERSION < QT_VERSION_CHECK(5, 13, 0) @@ -50,6 +52,7 @@ class VPGraphicsPiece; class VPGraphicsTileGrid; class VPGraphicsSheet; class VLayoutPiece; +class QGraphicsItem; class VPSheetSceneData { @@ -108,7 +111,7 @@ private: VPGraphicsPieceControls *m_rotationControls{nullptr}; VPGraphicsTransformationOrigin *m_rotationOrigin{nullptr}; - QList m_graphicsPieces{}; + QList m_graphicsPieces{}; /** * variable to hold temporarly hte value of the show tiles @@ -136,6 +139,7 @@ private: class VPSheet : public QObject { Q_OBJECT // NOLINT + public: explicit VPSheet(const VPLayoutPtr &layout, QObject *parent = nullptr); @@ -314,7 +318,6 @@ private: VPSheetSceneData *m_sceneData{nullptr}; auto SheetUnits() const -> Unit; - }; Q_DECLARE_METATYPE(VPSheetPtr) // NOLINT diff --git a/src/app/puzzle/vpmainwindow.h b/src/app/puzzle/vpmainwindow.h index 9de7c6ee8..e00c71d57 100644 --- a/src/app/puzzle/vpmainwindow.h +++ b/src/app/puzzle/vpmainwindow.h @@ -285,7 +285,7 @@ private slots: #if defined(Q_OS_MAC) void AboutToShowDockMenu(); #endif //defined(Q_OS_MAC) - + void SetDefaultGUILanguage(); void HorizontalScaleChanged(double value); diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp index b57a5fda4..a4140594d 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp @@ -27,10 +27,10 @@ *************************************************************************/ #include "tapepreferencesconfigurationpage.h" -#include "ui_tapepreferencesconfigurationpage.h" #include "../../mapplication.h" #include "../../vtapesettings.h" #include "../vpatterndb/pmsystems.h" +#include "ui_tapepreferencesconfigurationpage.h" #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vmisc/backport/qoverload.h" #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) @@ -38,19 +38,19 @@ //--------------------------------------------------------------------------------------------------------------------- TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *parent) - : QWidget(parent), - ui(new Ui::TapePreferencesConfigurationPage), - m_langChanged(false), - m_systemChanged(false) + : QWidget(parent), + ui(new Ui::TapePreferencesConfigurationPage), + m_langChanged(false), + m_systemChanged(false) { ui->setupUi(this); RetranslateUi(); InitLanguages(ui->langCombo); - connect(ui->langCombo, QOverload::of(&QComboBox::currentIndexChanged), this, [this]() - { - m_langChanged = true; - }); + connect(ui->langCombo, QOverload::of(&QComboBox::currentIndexChanged), this, + [this]() { m_langChanged = true; }); + + VTapeSettings *settings = MApplication::VApp()->TapeSettings(); //-------------------- Decimal separator setup ui->osOptionCheck->setChecked(MApplication::VApp()->TapeSettings()->GetOsSeparator()); @@ -63,17 +63,18 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare //---------------------- Pattern making system ui->systemBookValueLabel->setFixedHeight(4 * QFontMetrics(ui->systemBookValueLabel->font()).lineSpacing()); - connect(ui->systemCombo, QOverload::of(&QComboBox::currentIndexChanged), this, [this]() - { - m_systemChanged = true; - QString text = VAbstractApplication::VApp()->TrVars() - ->PMSystemAuthor(ui->systemCombo->currentData().toString()); - ui->systemAuthorValueLabel->setText(text); - ui->systemAuthorValueLabel->setToolTip(text); + connect(ui->systemCombo, QOverload::of(&QComboBox::currentIndexChanged), this, + [this]() + { + m_systemChanged = true; + QString text = + VAbstractApplication::VApp()->TrVars()->PMSystemAuthor(ui->systemCombo->currentData().toString()); + ui->systemAuthorValueLabel->setText(text); + ui->systemAuthorValueLabel->setToolTip(text); - text = VAbstractApplication::VApp()->TrVars()->PMSystemBook(ui->systemCombo->currentData().toString()); - ui->systemBookValueLabel->setPlainText(text); - }); + text = VAbstractApplication::VApp()->TrVars()->PMSystemBook(ui->systemCombo->currentData().toString()); + ui->systemBookValueLabel->setPlainText(text); + }); // set default pattern making system int index = ui->systemCombo->findData(MApplication::VApp()->TapeSettings()->GetPMSystemCode()); @@ -83,10 +84,8 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare } //----------------------------- Measurements Editing - connect(ui->resetWarningsButton, &QPushButton::released, this, []() - { - MApplication::VApp()->TapeSettings()->SetConfirmFormatRewriting(true); - }); + connect(ui->resetWarningsButton, &QPushButton::released, this, + []() { MApplication::VApp()->TapeSettings()->SetConfirmFormatRewriting(true); }); //----------------------- Toolbar ui->toolBarStyleCheck->setChecked(MApplication::VApp()->TapeSettings()->GetToolBarStyle()); @@ -133,7 +132,7 @@ auto TapePreferencesConfigurationPage::Apply() -> QStringList m_systemChanged = false; VAbstractApplication::VApp()->LoadTranslation(locale); - QCoreApplication::processEvents();// force to call changeEvent + QCoreApplication::processEvents(); // force to call changeEvent // Part about measurments will not be updated automatically MApplication::VApp()->RetranslateTables(); @@ -167,12 +166,12 @@ void TapePreferencesConfigurationPage::RetranslateUi() ui->osOptionCheck->setText(tr("With OS options") + QStringLiteral(" (%1)").arg(LocaleDecimalPoint(QLocale()))); { - const auto code = qvariant_cast(ui->systemCombo->currentData()); - ui->systemCombo->blockSignals(true); - ui->systemCombo->clear(); - InitPMSystems(ui->systemCombo); - ui->systemCombo->setCurrentIndex(-1); - ui->systemCombo->blockSignals(false); - ui->systemCombo->setCurrentIndex(ui->systemCombo->findData(code)); + const auto code = qvariant_cast(ui->systemCombo->currentData()); + ui->systemCombo->blockSignals(true); + ui->systemCombo->clear(); + InitPMSystems(ui->systemCombo); + ui->systemCombo->setCurrentIndex(-1); + ui->systemCombo->blockSignals(false); + ui->systemCombo->setCurrentIndex(ui->systemCombo->findData(code)); } } diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index 1fc7887ec..b14b6e952 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -145,7 +145,7 @@ private slots: void EditDimensionLabels(); void DimensionCustomNames(); - + void SetDefaultGUILanguage(); private: diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 3fbc06f1a..de3fc6ad7 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -236,7 +236,7 @@ private slots: void ShowProgress(); void ClearPatternMessages(); - + void SetDefaultGUILanguage(); void AddBackgroundImageItem(const QUuid &id); diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index c718a8e1c..de2b3b416 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -27,25 +27,25 @@ *************************************************************************/ #include "mainwindowsnogui.h" -#include "core/vapplication.h" -#include "../vpatterndb/vcontainer.h" -#include "dialogs/dialoglayoutsettings.h" -#include "../vwidgets/vmaingraphicsscene.h" +#include "../ifc/xml/vvitconverter.h" +#include "../ifc/xml/vvstconverter.h" +#include "../vdxf/libdxfrw/drw_base.h" +#include "../vformat/vmeasurements.h" +#include "../vlayout/vlayoutexporter.h" +#include "../vlayout/vlayoutgenerator.h" +#include "../vmisc/compatibility.h" #include "../vmisc/dialogs/dialogexporttocsv.h" #include "../vmisc/qxtcsvmodel.h" -#include "../vmisc/compatibility.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 "../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) #include "../vmisc/vtextcodec.h" @@ -53,21 +53,21 @@ #include #endif +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include #include +#include +#include +#include +#include #if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #include @@ -117,21 +117,22 @@ void InsertGlobalContours(const QList &scenes, const QListaddItem(gcontours.at(i)); } } #endif -} +} // namespace //--------------------------------------------------------------------------------------------------------------------- MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent) - : VAbstractMainWindow(parent), - pattern(new VContainer(VAbstractApplication::VApp()->TrVars(), VAbstractValApplication::VApp()->patternUnitsP(), - valentinaNamespace)) + : VAbstractMainWindow(parent), + pattern(new VContainer(VAbstractApplication::VApp()->TrVars(), VAbstractValApplication::VApp()->patternUnitsP(), + valentinaNamespace)) #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 { InitTempLayoutScene(); @@ -157,7 +158,7 @@ MainWindowsNoGUI::~MainWindowsNoGUI() //--------------------------------------------------------------------------------------------------------------------- void MainWindowsNoGUI::ToolLayoutSettings(bool checked) { - QToolButton *tButton = qobject_cast< QToolButton * >(this->sender()); + QToolButton *tButton = qobject_cast(this->sender()); SCASSERT(tButton != nullptr) if (checked) @@ -198,17 +199,15 @@ 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) m_taskbarProgress->setVisible(true); m_taskbarProgress->setValue(0); - m_taskbarProgress->setMaximum(lGenerator.GetNestingTime()*60); + m_taskbarProgress->setMaximum(lGenerator.GetNestingTime() * 60); progressTimer = new QTimer(this); - connect(progressTimer, &QTimer::timeout, this, [this, timer]() - { - m_taskbarProgress->setValue(static_cast(timer.elapsed()/1000)); - }); + connect(progressTimer, &QTimer::timeout, this, + [this, timer]() { m_taskbarProgress->setValue(static_cast(timer.elapsed() / 1000)); }); progressTimer->start(1000); #endif progress = QSharedPointer( - new DialogLayoutProgress(timer, lGenerator.GetNestingTimeMSecs(), this)); + new DialogLayoutProgress(timer, lGenerator.GetNestingTimeMSecs(), this)); connect(progress.data(), &DialogLayoutProgress::Abort, &lGenerator, &VLayoutGenerator::Abort); connect(progress.data(), &DialogLayoutProgress::Timeout, &lGenerator, &VLayoutGenerator::Timeout); @@ -219,17 +218,18 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool { // Because the progress bar dialog will not terminate nesting we must create separate timer for this auto *progressTimer = new QTimer(this); - connect(progressTimer, &QTimer::timeout, this, [timer, &lGenerator, progressTimer]() - { - const int timeout = static_cast(lGenerator.GetNestingTimeMSecs() - timer.elapsed()); + connect(progressTimer, &QTimer::timeout, this, + [timer, &lGenerator, progressTimer]() + { + const int timeout = static_cast(lGenerator.GetNestingTimeMSecs() - timer.elapsed()); - if (timeout <= 1000) - { - lGenerator.Timeout(); - progressTimer->stop(); - progressTimer->deleteLater(); - } - }); + if (timeout <= 1000) + { + lGenerator.Timeout(); + progressTimer->stop(); + progressTimer->deleteLater(); + } + }); progressTimer->start(1000); } @@ -264,7 +264,7 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool QCoreApplication::processEvents(); #ifdef LAYOUT_DEBUG - const QString path = QDir::homePath()+QStringLiteral("/LayoutDebug"); + const QString path = QDir::homePath() + QStringLiteral("/LayoutDebug"); QDir debugDir(path); debugDir.removeRecursively(); debugDir.mkpath(path); @@ -301,16 +301,16 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool } CleanLayout(); - m_layoutSettings->SetLayoutPapers(lGenerator.GetPapersItems());// Blank sheets - m_layoutSettings->SetLayoutDetails(lGenerator.GetAllDetailsItems());// All details items - detailsOnLayout = lGenerator.GetAllDetails();// All details items + m_layoutSettings->SetLayoutPapers(lGenerator.GetPapersItems()); // Blank sheets + m_layoutSettings->SetLayoutDetails(lGenerator.GetAllDetailsItems()); // All details items + detailsOnLayout = lGenerator.GetAllDetails(); // All details items m_layoutSettings->SetLayoutShadows(CreateShadows(m_layoutSettings->LayoutPapers())); m_layoutSettings->SetLayoutPortrait(lGenerator.IsPortrait()); m_layoutSettings->SetLayoutScenes(CreateScenes(m_layoutSettings->LayoutPapers(), m_layoutSettings->LayoutShadows(), m_layoutSettings->LayoutDetails())); #if !defined(V_NO_ASSERT) - //Uncomment to debug, shows global contour + // Uncomment to debug, shows global contour // gcontours = lGenerator.GetGlobalContours(); // uncomment for debugging // InsertGlobalContours(scenes, gcontours); // uncomment for debugging #endif @@ -320,8 +320,8 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool } m_layoutSettings->SetIgnorePrinterMargins(not lGenerator.IsUsePrinterFields()); m_layoutSettings->SetLayoutMargins(lGenerator.GetPrinterFields()); - m_layoutSettings->SetLayoutPaperSize(QSizeF(lGenerator.GetPaperWidth(), - lGenerator.GetPaperHeight())); + m_layoutSettings->SetLayoutPaperSize( + QSizeF(lGenerator.GetPaperWidth(), lGenerator.GetPaperHeight())); m_layoutSettings->SetAutoCropLength(lGenerator.GetAutoCropLength()); m_layoutSettings->SetAutoCropWidth(lGenerator.GetAutoCropWidth()); m_layoutSettings->SetUnitePages(lGenerator.IsUnitePages()); @@ -349,7 +349,7 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool rotationUsed = true; } } - lGenerator.SetShift(lGenerator.GetShift()/2.0); + lGenerator.SetShift(lGenerator.GetShift() / 2.0); break; case LayoutErrors::EmptyPaperError: if (lGenerator.IsRotationNeeded()) @@ -362,13 +362,13 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool } else { - lGenerator.SetShift(lGenerator.GetShift()/2.0); + lGenerator.SetShift(lGenerator.GetShift() / 2.0); rotationUsed = false; } } else { - lGenerator.SetShift(lGenerator.GetShift()/2.0); + lGenerator.SetShift(lGenerator.GetShift() / 2.0); } break; case LayoutErrors::Timeout: @@ -381,10 +381,10 @@ auto MainWindowsNoGUI::GenerateLayout(VLayoutGenerator &lGenerator) -> bool nestingState = lGenerator.State(); - if (nestingState == LayoutErrors::PrepareLayoutError || nestingState == LayoutErrors::ProcessStoped - || nestingState == LayoutErrors::TerminatedByException - || (nestingState == LayoutErrors::NoError && not qFuzzyIsNull(lGenerator.GetEfficiencyCoefficient()) - && efficiency >= lGenerator.GetEfficiencyCoefficient())) + if (nestingState == LayoutErrors::PrepareLayoutError || nestingState == LayoutErrors::ProcessStoped || + nestingState == LayoutErrors::TerminatedByException || + (nestingState == LayoutErrors::NoError && not qFuzzyIsNull(lGenerator.GetEfficiencyCoefficient()) && + efficiency >= lGenerator.GetEfficiencyCoefficient())) { if (not lGenerator.IsPreferOneSheetSolution() || lGenerator.PapersCount() == 1) { @@ -494,10 +494,11 @@ void MainWindowsNoGUI::ExportData(const QVector &listDetails) for (int i = 0; i < detailsOnLayout.size(); ++i) { 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( - m_layoutSettings->LayoutPapers().at(i)); + QGraphicsRectItem *paper = + qgraphicsitem_cast(m_layoutSettings->LayoutPapers().at(i)); SCASSERT(paper != nullptr) ExportApparelLayout(detailsOnLayout.at(i), name, paper->rect().size().toSize()); @@ -524,9 +525,9 @@ void MainWindowsNoGUI::ExportData(const QVector &listDetails) } //--------------------------------------------------------------------------------------------------------------------- -void MainWindowsNoGUI::ExportFlatLayout(const QList &scenes, - const QList &papers, const QList &shadows, - const QList > &details, bool ignorePrinterFields, +void MainWindowsNoGUI::ExportFlatLayout(const QList &scenes, const QList &papers, + const QList &shadows, + const QList> &details, bool ignorePrinterFields, const QMarginsF &margins) { const QString path = m_dialogSaveLayout->Path(); @@ -579,7 +580,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector &li if (piece.IsForceFlipping()) { - item->setPos(piece.GetMx()-diff, piece.GetMy()); + item->setPos(piece.GetMx() - diff, piece.GetMy()); } else { @@ -593,7 +594,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector &li scene->addItem(item); } - QList papers;// Blank sheets + QList papers; // Blank sheets QRect rect = scene->itemsBoundingRect().toRect(); const int mx = rect.x(); @@ -614,7 +615,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector &li paper->setBrush(QBrush(Qt::white)); papers.append(paper); - QList > details;// All details + QList> details; // All details details.append(list); QList shadows = CreateShadows(papers); @@ -624,7 +625,7 @@ void MainWindowsNoGUI::ExportDetailsAsFlatLayout(const QVector &li const qreal margin = ToPixel(1, Unit::Cm); 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 listDe QList list; 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); QGraphicsItem *item = piece.GetItem(m_dialogSaveLayout->IsTextAsPaths()); @@ -705,8 +706,8 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector listDe QTransform moveMatrix = piece.GetMatrix(); if (piece.IsForceFlipping()) { - item->setPos(piece.GetMx()-diff, piece.GetMy()); - moveMatrix = moveMatrix.translate(-piece.GetMx()+diff, piece.GetMy()); + item->setPos(piece.GetMx() - diff, piece.GetMy()); + moveMatrix = moveMatrix.translate(-piece.GetMx() + diff, piece.GetMy()); } else { @@ -737,7 +738,7 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector listDe 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(); if (listDetails.at(i).IsForceFlipping()) @@ -751,8 +752,8 @@ void MainWindowsNoGUI::ExportDetailsAsApparelLayout(QVector listDe listDetails[i].SetMatrix(moveMatrix); } - const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() + - QString::number(1) + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format()); + const QString name = m_dialogSaveLayout->Path() + '/' + m_dialogSaveLayout->FileName() + QString::number(1) + + VLayoutExporter::ExportFormatSuffix(m_dialogSaveLayout->Format()); ExportApparelLayout(listDetails, name, rect.size()); } @@ -782,12 +783,12 @@ void MainWindowsNoGUI::PrintPreviewTiled() VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); m_layoutSettings->SetTiledMargins(settings->GetTiledPDFMargins(Unit::Mm)); m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation()); - m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), - settings->GetTiledPDFPaperHeight(Unit::Mm))); + m_layoutSettings->SetTiledPDFPaperSize( + QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), settings->GetTiledPDFPaperHeight(Unit::Mm))); } m_layoutSettings->SetWatermarkPath( - AbsoluteMPath(VAbstractValApplication::VApp()->GetPatternPath(), doc->GetWatermarkPath())); + AbsoluteMPath(VAbstractValApplication::VApp()->GetPatternPath(), doc->GetWatermarkPath())); m_layoutSettings->PrintPreviewTiled(); } @@ -816,12 +817,12 @@ void MainWindowsNoGUI::PrintTiled() VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); m_layoutSettings->SetTiledMargins(settings->GetTiledPDFMargins(Unit::Mm)); m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation()); - m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), - settings->GetTiledPDFPaperHeight(Unit::Mm))); + m_layoutSettings->SetTiledPDFPaperSize( + QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), settings->GetTiledPDFPaperHeight(Unit::Mm))); } m_layoutSettings->SetWatermarkPath( - AbsoluteMPath(VAbstractValApplication::VApp()->GetPatternPath(), doc->GetWatermarkPath())); + AbsoluteMPath(VAbstractValApplication::VApp()->GetPatternPath(), doc->GetWatermarkPath())); m_layoutSettings->PrintTiled(); } @@ -846,7 +847,7 @@ auto MainWindowsNoGUI::PrepareDetailsForLayout(const QVector &d QFutureWatcher futureWatcher; QObject::connect(&futureWatcher, &QFutureWatcher::finished, &progress, &QProgressDialog::reset); - QObject::connect(&futureWatcher, &QFutureWatcher::progressRangeChanged, &progress, + QObject::connect(&futureWatcher, &QFutureWatcher::progressRangeChanged, &progress, &QProgressDialog::setRange); QObject::connect(&futureWatcher, &QFutureWatcher::progressValueChanged, &progress, &QProgressDialog::setValue); @@ -877,7 +878,7 @@ auto MainWindowsNoGUI::PrepareDetailsForLayout(const QVector &d void MainWindowsNoGUI::InitTempLayoutScene() { 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(); // Create the image with the exact size of the shrunk scene - image = QImage(QSize(static_cast(r.width()), static_cast(r.height())), - QImage::Format_RGB32); + image = + QImage(QSize(static_cast(r.width()), static_cast(r.height())), QImage::Format_RGB32); if (not image.isNull()) { image.fill(Qt::white); 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.setPen(QPen(Qt::black, VAbstractApplication::VApp()->Settings()->WidthMainLine(), Qt::SolidLine, 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); painter.end(); } 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.fill(Qt::white); @@ -941,11 +942,11 @@ auto MainWindowsNoGUI::CreateShadows(const QList &papers) -> QL 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(paper)) { 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)); shadows.append(shadowPaper); } @@ -964,7 +965,7 @@ auto MainWindowsNoGUI::CreateScenes(const QList &papers, const { QList scenes; scenes.reserve(papers.size()); - for (int i=0; iSetNonInteractive(true); @@ -1003,22 +1004,21 @@ void MainWindowsNoGUI::PdfTiledFile(const QString &name) VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); m_layoutSettings->SetTiledMargins(QMarginsF(settings->GetTiledPDFMargins(Unit::Mm))); m_layoutSettings->SetTiledPDFOrientation(settings->GetTiledPDFOrientation()); - m_layoutSettings->SetTiledPDFPaperSize(QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), - settings->GetTiledPDFPaperHeight(Unit::Mm))); + m_layoutSettings->SetTiledPDFPaperSize( + QSizeF(settings->GetTiledPDFPaperWidth(Unit::Mm), settings->GetTiledPDFPaperHeight(Unit::Mm))); m_layoutSettings->SetXScale(1); m_layoutSettings->SetYScale(1); } m_layoutSettings->SetWatermarkPath( - AbsoluteMPath(VAbstractValApplication::VApp()->GetPatternPath(), doc->GetWatermarkPath())); + AbsoluteMPath(VAbstractValApplication::VApp()->GetPatternPath(), doc->GetWatermarkPath())); m_layoutSettings->PdfTiledFile(name); } //--------------------------------------------------------------------------------------------------------------------- -void MainWindowsNoGUI::ExportScene(const QList &scenes, - const QList &papers, const QList &shadows, - const QList > &details, bool ignorePrinterFields, - const QMarginsF &margins) const +void MainWindowsNoGUI::ExportScene(const QList &scenes, const QList &papers, + const QList &shadows, const QList> &details, + bool ignorePrinterFields, const QMarginsF &margins) const { QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wnoexcept") @@ -1036,17 +1036,18 @@ void MainWindowsNoGUI::ExportScene(const QList &scenes, exporter.SetBinaryDxfFormat(m_dialogSaveLayout->IsBinaryDXFFormat()); 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(papers.at(i)); if (paper != nullptr) { 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(); - brush->setColor( QColor( Qt::white ) ); + brush->setColor(QColor(Qt::white)); QGraphicsScene *scene = scenes.at(i); - scene->setBackgroundBrush( *brush ); + scene->setBackgroundBrush(*brush); shadows[i]->setVisible(false); const qreal thinPen = 0.1; paper->setPen(QPen(QBrush(Qt::white, Qt::NoBrush), thinPen, Qt::NoPen)); @@ -1149,9 +1150,9 @@ void MainWindowsNoGUI::ExportScene(const QList &scenes, break; } paper->setPen(QPen(Qt::black, 1)); - brush->setColor( QColor( Qt::gray ) ); - brush->setStyle( Qt::SolidPattern ); - scenes[i]->setBackgroundBrush( *brush ); + brush->setColor(QColor(Qt::gray)); + brush->setStyle(Qt::SolidPattern); + scenes[i]->setBackgroundBrush(*brush); shadows[i]->setVisible(true); delete brush; } @@ -1163,7 +1164,8 @@ auto MainWindowsNoGUI::FileName() const -> QString { QString fileName; VAbstractValApplication::VApp()->GetPatternPath().isEmpty() - ? fileName = tr("unnamed") : fileName = VAbstractValApplication::VApp()->GetPatternPath(); + ? fileName = tr("unnamed") + : fileName = VAbstractValApplication::VApp()->GetPatternPath(); return QFileInfo(fileName).baseName(); } @@ -1188,7 +1190,7 @@ auto MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo VContainer completeData = doc->GetCompleteData(); 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); @@ -1206,9 +1208,10 @@ auto MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo if (qIsInf(result) || qIsNaN(result)) { - qCritical("%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")), - qUtf8Printable(tr("Value in line %1 is infinite or NaN. Please, check your calculations.") - .arg(i+1))); + qCritical( + "%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")), + qUtf8Printable( + tr("Value in line %1 is infinite or NaN. Please, check your calculations.").arg(i + 1))); if (not VApplication::IsGUIMode()) { QCoreApplication::exit(V_EX_DATAERR); @@ -1219,7 +1222,7 @@ auto MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo catch (qmu::QmuParserError &e) { 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()) { QCoreApplication::exit(V_EX_DATAERR); @@ -1269,12 +1272,12 @@ auto MainWindowsNoGUI::OpenMeasurementFile(const QString &path) const -> QShared if (m->Type() == MeasurementsType::Multisize) { VVSTConverter converter(path); - m->setXMLContent(converter.Convert());// Read again after conversion + m->setXMLContent(converter.Convert()); // Read again after conversion } else { VVITConverter converter(path); - m->setXMLContent(converter.Convert());// Read again after conversion + m->setXMLContent(converter.Convert()); // Read again after conversion } if (not m->IsDefinedKnownNamesValid()) @@ -1307,8 +1310,8 @@ auto MainWindowsNoGUI::OpenMeasurementFile(const QString &path) const -> QShared //--------------------------------------------------------------------------------------------------------------------- void MainWindowsNoGUI::CheckRequiredMeasurements(const VMeasurements *m) const { - const QSet match = ConvertToSet(doc->ListMeasurements()) - .subtract(ConvertToSet(m->ListAll())); + const QSet match = + ConvertToSet(doc->ListMeasurements()).subtract(ConvertToSet(m->ListAll())); if (not match.isEmpty()) { diff --git a/src/libs/vmisc/vabstractvalapplication.h b/src/libs/vmisc/vabstractvalapplication.h index b047a0c8c..04190e2fb 100644 --- a/src/libs/vmisc/vabstractvalapplication.h +++ b/src/libs/vmisc/vabstractvalapplication.h @@ -43,8 +43,9 @@ class VAbstractValApplication : public VAbstractApplication { Q_OBJECT // NOLINT - public : VAbstractValApplication(int &argc, char **argv); - virtual ~VAbstractValApplication() = default; +public: + VAbstractValApplication(int &argc, char **argv); + ~VAbstractValApplication() override = default; auto GetCustomerName() const -> QString; void SetCustomerName(const QString &name);