From 7fd93eff5bb4f038c57716d1622b72a69ee5bc10 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 8 Aug 2017 23:25:09 +0300 Subject: [PATCH 1/2] Fix bug with mouse cursor. --HG-- branch : develop --- src/app/valentina/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index ba7a2d66d..a7e5984d2 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -568,8 +568,8 @@ void MainWindow::SetToolButton(bool checked, Tool t, const QString &cursor, cons } } QPixmap pixmap(cursorResource); - QCursor cur(pixmap, 2, 3); - ui->view->setCursor(cur); + QCursor cur(pixmap, 2, 2); + ui->view->viewport()->setCursor(cur); helpLabel->setText(toolTip); ui->view->setShowToolOptions(false); dialogTool = QSharedPointer(new Dialog(pattern, 0, this)); @@ -2201,7 +2201,7 @@ void MainWindow::ArrowTool() ui->view->AllowRubberBand(true); - ui->view->setCursor(Qt::ArrowCursor); + ui->view->viewport()->unsetCursor(); helpLabel->setText(""); ui->view->setShowToolOptions(true); qCDebug(vMainWindow, "Enabled arrow tool."); From d91f32be0283a5bdfe228e568519c5967481ce26 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 10 Aug 2017 16:50:10 +0300 Subject: [PATCH 2/2] Proposed to always use mm as the default DXF export unit. ref #745. --HG-- branch : develop --- src/app/valentina/mainwindowsnogui.cpp | 37 ++------------------------ src/libs/vdxf/vdxfengine.cpp | 2 +- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index d415bb900..c917a3ee7 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -1015,23 +1015,7 @@ void MainWindowsNoGUI::FlatDxfFile(const QString &name, int version, bool binary generator.setResolution(PrintDPI); generator.SetVersion(static_cast(version)); generator.SetBinaryFormat(binary); - - switch (*pattern->GetPatternUnit()) - { - case Unit::Cm: - generator.setInsunits(VarInsunits::Centimeters); - break; - case Unit::Mm: - generator.setInsunits(VarInsunits::Millimeters); - break; - case Unit::Inch: - generator.setInsunits(VarInsunits::Inches); - break; - case Unit::Px: - case Unit::LAST_UNIT_DO_NOT_USE: - Q_UNREACHABLE(); - break; - } + generator.setInsunits(VarInsunits::Millimeters);// Decided to always use mm. See issue #745 QPainter painter; if (painter.begin(&generator)) @@ -1052,24 +1036,7 @@ void MainWindowsNoGUI::AAMADxfFile(const QString &name, int version, bool binary generator.setResolution(PrintDPI); generator.SetVersion(static_cast(version)); generator.SetBinaryFormat(binary); - - switch (*pattern->GetPatternUnit()) - { - case Unit::Cm: - generator.setInsunits(VarInsunits::Centimeters); - break; - case Unit::Mm: - generator.setInsunits(VarInsunits::Millimeters); - break; - case Unit::Inch: - generator.setInsunits(VarInsunits::Inches); - break; - case Unit::Px: - case Unit::LAST_UNIT_DO_NOT_USE: - Q_UNREACHABLE(); - break; - } - + generator.setInsunits(VarInsunits::Millimeters);// Decided to always use mm. See issue #745 generator.ExportToAAMA(details); } diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index e8c8129c0..6bd162209 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -81,7 +81,7 @@ VDxfEngine::VDxfEngine() matrix(), input(), varMeasurement(VarMeasurement::Metric), - varInsunits(VarInsunits::Centimeters), + varInsunits(VarInsunits::Millimeters), textBuffer(new DRW_Text()) { }