diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 3e5d16f58d..fb03ba059a 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -98,7 +98,6 @@ set(TechDrawGui_UIC_SRCS TaskBalloon.ui TaskCosVertex.ui TaskCenterLine.ui - TaskCL2Lines.ui TaskLineDecor.ui TaskRestoreLines.ui TaskWeldingSymbol.ui @@ -189,7 +188,6 @@ SET(TechDrawGui_SRCS TaskLineDecor.cpp TaskLineDecor.h TaskRestoreLines.ui - TaskCL2Lines.ui TaskWeldingSymbol.ui TaskWeldingSymbol.cpp TaskWeldingSymbol.h @@ -365,7 +363,6 @@ SET(TechDrawGuiTaskDlgs_SRCS TaskCenterLine.ui TaskLineDecor.ui TaskRestoreLines.ui - TaskCL2Lines.ui TaskWeldingSymbol.ui SymbolChooser.ui TaskActiveView.ui diff --git a/src/Mod/TechDraw/Gui/TaskCL2Lines.ui b/src/Mod/TechDraw/Gui/TaskCL2Lines.ui deleted file mode 100644 index e8c2ccbf62..0000000000 --- a/src/Mod/TechDraw/Gui/TaskCL2Lines.ui +++ /dev/null @@ -1,38 +0,0 @@ - - - TechDrawGui::TaskCL2Lines - - - - 0 - 0 - 247 - 65 - - - - - 0 - 0 - - - - 2 Line Parameters - - - - - - - - Flip ends - - - - - - - - - - diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index 64d0c336c5..d75fd99173 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -54,7 +54,6 @@ #include #include -#include #include "DrawGuiStd.h" #include "QGVPage.h" @@ -80,7 +79,6 @@ TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat, m_basePage(page), m_createMode(false), m_edgeName(edgeName), - m_flipped(false), m_type(0), //0 - Face, 1 - 2 Lines, 2 - 2 points m_mode(0) //0 - vertical, 1 - horizontal, 2 - aligned @@ -97,7 +95,6 @@ TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat, Base::Console().Message("TCL::TCL() - no centerline found\n"); } m_type = m_cl->m_type; - m_flipped = m_cl->m_flip2Line; m_mode = m_cl->m_mode; setUiEdit(); @@ -112,7 +109,6 @@ TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat, m_basePage(page), m_createMode(true), m_subNames(subNames), - m_flipped(false), m_type(0), //0 - Face, 1 - 2 Lines, 2 - 2 points m_mode(0) //0 - vertical, 1 - horizontal, 2 - aligned { @@ -161,7 +157,6 @@ void TaskCenterLine::changeEvent(QEvent *e) void TaskCenterLine::setUiPrimary() { -// Base::Console().Message("TCL::setUiPrimary()\n"); setWindowTitle(QObject::tr("Create Center Line")); if (m_partFeat != nullptr) { @@ -172,25 +167,32 @@ void TaskCenterLine::setUiPrimary() ui->lstSubList->addItem(listItem); } } - ui->cpLineColor->setColor(getCenterColor()); ui->dsbWeight->setValue(getCenterWidth()); ui->cboxStyle->setCurrentIndex(getCenterStyle() - 1); + Base::Quantity qVal; qVal.setUnit(Base::Unit::Length); qVal.setValue(getExtendBy()); ui->qsbExtend->setValue(qVal); + + Base::Quantity qAngle; + qAngle.setUnit(Base::Unit::Angle); + ui->qsbRotate->setValue(qAngle); int precision = Base::UnitsApi::getDecimals(); - ui->dsbRotate->setDecimals(precision); + ui->qsbRotate->setDecimals(precision); if (m_type == 0) // if face, then aligned is not possible ui->rbAligned->setEnabled(false); else ui->rbAligned->setEnabled(true); + if (m_type == 1) // only if line, feature is enabled + ui->cbFlip->setEnabled(true); + else + ui->cbFlip->setEnabled(false); } void TaskCenterLine::setUiEdit() { -// Base::Console().Message("TCL::setUiEdit()\n"); setWindowTitle(QObject::tr("Edit Center Line")); if (m_partFeat != nullptr) { std::string baseName = m_partFeat->getNameInDocument(); @@ -198,25 +200,24 @@ void TaskCenterLine::setUiEdit() QString listItem = Base::Tools::fromStdString(m_edgeName); ui->lstSubList->addItem(listItem); } - ui->cpLineColor->setColor(m_cl->m_format.m_color.asValue()); ui->dsbWeight->setValue(m_cl->m_format.m_weight); ui->cboxStyle->setCurrentIndex(m_cl->m_format.m_style - 1); - int precision = Base::UnitsApi::getDecimals(); - ui->dsbRotate->setDecimals(precision); - ui->rbVertical->setChecked(false); ui->rbHorizontal->setChecked(false); ui->rbAligned->setChecked(false); - if (m_cl->m_mode == 0) { + if (m_cl->m_mode == 0) ui->rbVertical->setChecked(true); - } else if (m_cl->m_mode == 1) { + else if (m_cl->m_mode == 1) ui->rbHorizontal->setChecked(true); - } else if (m_cl->m_mode ==2) { + else if (m_cl->m_mode ==2) ui->rbAligned->setChecked(true); - } - ui->dsbRotate->setValue(m_cl->m_rotate); + if (m_cl->m_type == 0) // if face, then aligned is not possible + ui->rbAligned->setEnabled(false); + else + ui->rbAligned->setEnabled(true); + Base::Quantity qVal; qVal.setUnit(Base::Unit::Length); qVal.setValue(m_cl->m_vShift); @@ -225,10 +226,22 @@ void TaskCenterLine::setUiEdit() ui->qsbHorizShift->setValue(qVal); qVal.setValue(m_cl->m_extendBy); ui->qsbExtend->setValue(qVal); - if (m_cl->m_type == 0) // if face, then aligned is not possible - ui->rbAligned->setEnabled(false); + + Base::Quantity qAngle; + qAngle.setUnit(Base::Unit::Angle); + ui->qsbRotate->setValue(qAngle); + int precision = Base::UnitsApi::getDecimals(); + ui->qsbRotate->setDecimals(precision); + ui->qsbRotate->setValue(m_cl->m_rotate); + + if (m_cl->m_flip2Line) + ui->cbFlip->setChecked(true); else - ui->rbAligned->setEnabled(true); + ui->cbFlip->setChecked(false); + if (m_cl->m_type == 1) // only if line, feature is enabled + ui->cbFlip->setEnabled(true); + else + ui->cbFlip->setEnabled(false); } //****************************************************************************** @@ -239,7 +252,7 @@ void TaskCenterLine::createCenterLine(void) // bool vertical = false; double hShift = ui->qsbHorizShift->rawValue(); double vShift = ui->qsbVertShift->rawValue(); - double rotate = ui->dsbRotate->value(); + double rotate = ui->qsbRotate->rawValue(); double extendBy = ui->qsbExtend->rawValue(); std::pair ends; if (ui->rbVertical->isChecked()) { @@ -253,13 +266,12 @@ void TaskCenterLine::createCenterLine(void) TechDraw::CenterLine* cl = CenterLine::CenterLineBuilder(m_partFeat, m_subNames, - m_mode, - m_flipped); + m_mode); if (cl != nullptr) { cl->setShifts(hShift, vShift); cl->setExtend(extendBy); cl->setRotate(rotate); - cl->setFlip(m_flipped); + cl->m_flip2Line = ui->cbFlip->checkState(); App::Color ac; ac.setValue(ui->cpLineColor->color()); cl->m_format.m_color = ac; @@ -293,12 +305,12 @@ void TaskCenterLine::updateCenterLine(void) m_mode = CenterLine::CLMODE::ALIGNED; } m_cl->m_mode = m_mode; - m_cl->m_rotate = ui->dsbRotate->value(); + m_cl->m_rotate = ui->qsbRotate->rawValue(); m_cl->m_vShift = ui->qsbVertShift->rawValue(); m_cl->m_hShift = ui->qsbHorizShift->rawValue(); m_cl->m_extendBy = ui->qsbExtend->rawValue(); m_cl->m_type = m_type; - m_cl->m_flip2Line = m_flipped; + m_cl->m_flip2Line = ui->cbFlip->checkState(); m_partFeat->replaceCenterLine(m_cl); m_partFeat->refreshCLGeoms(); m_partFeat->requestPaint(); @@ -361,12 +373,6 @@ double TaskCenterLine::getExtendBy(void) return ext; } -void TaskCenterLine::setFlipped(bool b) -{ -// Base::Console().Message("TCL::setFlipped(%d)\n",b); - m_flipped = b; -} - //****************************************************************************** bool TaskCenterLine::accept() @@ -408,51 +414,6 @@ bool TaskCenterLine::reject() return false; } -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -TaskCL2Lines::TaskCL2Lines(TechDrawGui::TaskCenterLine* tcl) : - ui(new Ui_TaskCL2Lines), - m_tcl(tcl) -{ - ui->setupUi(this); - - connect(ui->cbFlip, SIGNAL(toggled( bool )), this, SLOT(onFlipToggled( bool ))); - - initUi(); -} - -TaskCL2Lines::~TaskCL2Lines() -{ - delete ui; -} - -void TaskCL2Lines::initUi() -{ -} - -void TaskCL2Lines::onFlipToggled(bool b) -{ -// Base::Console().Message("TCL2L::onFlipToggled(%d)\n", b); - m_tcl->setFlipped(b); -} - -bool TaskCL2Lines::accept() -{ -// Base::Console().Message("TCL2L::accept()\n"); - return true; -} - -bool TaskCL2Lines::reject() -{ -// Base::Console().Message("TCL2L::reject()\n"); - return false; -} - -void TaskCL2Lines::changeEvent(QEvent *e) -{ - if (e->type() == QEvent::LanguageChange) { - ui->retranslateUi(this); - } -} ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -466,18 +427,6 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat, widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); - - cl2Lines = new TaskCL2Lines(widget); - linesBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-2linecenterline"), - cl2Lines->windowTitle(), true, 0); - linesBox->groupLayout()->addWidget(cl2Lines); - Content.push_back(linesBox); - -// cl2Points = new TaskCL2Points(widget); -// pointsBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-2pointcenterline"), -// widget->windowTitle(), true, 0); -// pointsBox->groupLayout()->addWidget(cl2Lines); -// Content.push_back(pointsBox); } TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat, @@ -490,18 +439,6 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat, widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); - - cl2Lines = new TaskCL2Lines(widget); - linesBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-2linecenterline"), - widget->windowTitle(), true, 0); - linesBox->groupLayout()->addWidget(cl2Lines); - Content.push_back(linesBox); - -// cl2Points = new TaskCL2Points(widget); -// pointsBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-2pointcenterline"), -// widget->windowTitle(), true, 0); -// pointsBox->groupLayout()->addWidget(cl2Lines); -// Content.push_back(pointsBox); } TaskDlgCenterLine::~TaskDlgCenterLine() diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h index 78f65eef52..6f2d5e980d 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.h +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h @@ -1,212 +1,180 @@ -/*************************************************************************** - * Copyright (c) 2019 WandererFan * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#ifndef TECHDRAWGUI_TASKCENTERLINE_H -#define TECHDRAWGUI_TASKCENTERLINE_H - -#include -#include -#include -#include - -#include -#include - -/*#include "QGTracker.h"*/ - -//TODO: make this a proper enum -#define TRACKERPICK 0 -#define TRACKEREDIT 1 -#define TRACKERCANCEL 2 -#define TRACKERCANCELEDIT 3 -#define TRACKERFINISHED 4 -#define TRACKERSAVE 5 - -class Ui_TaskCenterLine; -class Ui_TaskCL2Lines; - -namespace App { -class DocumentObject; -} - -namespace TechDraw -{ -class DrawPage; -class DrawView; -class DrawViewPart; -class CosmeticEdge; -class LineFormat; -} - -namespace TechDraw -{ -class Face; -} - -namespace TechDrawGui -{ -class QGVPage; -class QGIView; -class QGIPrimPath; -class MDIViewPage; -class ViewProviderViewPart; - -class TaskCenterLine : public QWidget -{ - Q_OBJECT - -public: - TaskCenterLine(TechDraw::DrawViewPart* baseFeat, - TechDraw::DrawPage* page, - std::vector subNames); - TaskCenterLine(TechDraw::DrawViewPart* baseFeat, - TechDraw::DrawPage* page, - std::string edgeName); - ~TaskCenterLine(); - -public Q_SLOTS: - -public: - virtual bool accept(); - virtual bool reject(); - virtual void setCreateMode(bool b) { m_createMode = b; } - virtual bool getCreateMode(void) { return m_createMode; } - void updateTask(); - void saveButtons(QPushButton* btnOK, - QPushButton* btnCancel); - void enableTaskButtons(bool b); - void setFlipped(bool b); - - -protected Q_SLOTS: - -protected: - void changeEvent(QEvent *e); - - void blockButtons(bool b); - void setUiPrimary(void); - void setUiEdit(void); - - void createCenterLine(void); - void create2Lines(void); - void create2Points(void); - - void updateCenterLine(void); - void update2Lines(void); - void update2Points(void); - - double getCenterWidth(); - QColor getCenterColor(); - Qt::PenStyle getCenterStyle(); - double getExtendBy(); - - -private: - Ui_TaskCenterLine * ui; - - TechDraw::DrawViewPart* m_partFeat; - TechDraw::DrawPage* m_basePage; - bool m_createMode; - - QPushButton* m_btnOK; - QPushButton* m_btnCancel; - - std::vector m_subNames; - std::string m_edgeName; - double m_extendBy; - int m_geomIndex; - TechDraw::CenterLine* m_cl; - int m_clIdx; - bool m_flipped; - int m_type; - int m_mode; -}; - -class TaskCL2Lines : public QWidget -{ - Q_OBJECT - -public: - TaskCL2Lines(TaskCenterLine* tcl); - ~TaskCL2Lines(); - -public: - virtual bool accept(); - virtual bool reject(); - -protected Q_SLOTS: - void onFlipToggled(bool b); - -protected: - void changeEvent(QEvent *e); - void initUi(void); - -private: - Ui_TaskCL2Lines* ui; - TechDrawGui::TaskCenterLine* m_tcl; -}; - - -class TaskDlgCenterLine : public Gui::TaskView::TaskDialog -{ - Q_OBJECT - -public: - TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat, - TechDraw::DrawPage* page, - std::vector subNames); - TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat, - TechDraw::DrawPage* page, - std::string edgeName); - ~TaskDlgCenterLine(); - -public: - /// is called the TaskView when the dialog is opened - virtual void open(); - /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); - /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); - /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); - /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const - { return false; } - void update(); - - void modifyStandardButtons(QDialogButtonBox* box); - -protected: - -private: - TaskCenterLine* widget; - Gui::TaskView::TaskBox* taskbox; - - TaskCL2Lines* cl2Lines; - Gui::TaskView::TaskBox* linesBox; - -}; - -} //namespace TechDrawGui - -#endif // #ifndef TECHDRAWGUI_TASKCENTERLINE_H +/*************************************************************************** + * Copyright (c) 2019 WandererFan * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + +#ifndef TECHDRAWGUI_TASKCENTERLINE_H +#define TECHDRAWGUI_TASKCENTERLINE_H + +#include +#include +#include +#include + +#include + +/*#include "QGTracker.h"*/ + +//TODO: make this a proper enum +#define TRACKERPICK 0 +#define TRACKEREDIT 1 +#define TRACKERCANCEL 2 +#define TRACKERCANCELEDIT 3 +#define TRACKERFINISHED 4 +#define TRACKERSAVE 5 + +class Ui_TaskCenterLine; + +namespace App { +class DocumentObject; +} + +namespace TechDraw +{ +class DrawPage; +class DrawView; +class DrawViewPart; +class CosmeticEdge; +class LineFormat; +} + +namespace TechDraw +{ +class Face; +} + +namespace TechDrawGui +{ +class QGVPage; +class QGIView; +class QGIPrimPath; +class MDIViewPage; +class ViewProviderViewPart; + +class TaskCenterLine : public QWidget +{ + Q_OBJECT + +public: + TaskCenterLine(TechDraw::DrawViewPart* baseFeat, + TechDraw::DrawPage* page, + std::vector subNames); + TaskCenterLine(TechDraw::DrawViewPart* baseFeat, + TechDraw::DrawPage* page, + std::string edgeName); + ~TaskCenterLine(); + +public Q_SLOTS: + +public: + virtual bool accept(); + virtual bool reject(); + virtual void setCreateMode(bool b) { m_createMode = b; } + virtual bool getCreateMode(void) { return m_createMode; } + void updateTask(); + void saveButtons(QPushButton* btnOK, + QPushButton* btnCancel); + void enableTaskButtons(bool b); + void setFlipped(bool b); + + +protected Q_SLOTS: + +protected: + void changeEvent(QEvent *e); + + void blockButtons(bool b); + void setUiPrimary(void); + void setUiEdit(void); + + void createCenterLine(void); + void create2Lines(void); + void create2Points(void); + + void updateCenterLine(void); + void update2Lines(void); + void update2Points(void); + + double getCenterWidth(); + QColor getCenterColor(); + Qt::PenStyle getCenterStyle(); + double getExtendBy(); + +private: + Ui_TaskCenterLine * ui; + + TechDraw::DrawViewPart* m_partFeat; + TechDraw::DrawPage* m_basePage; + bool m_createMode; + + QPushButton* m_btnOK; + QPushButton* m_btnCancel; + + std::vector m_subNames; + std::string m_edgeName; + double m_extendBy; + int m_geomIndex; + TechDraw::CenterLine* m_cl; + int m_clIdx; + int m_type; + int m_mode; +}; + +class TaskDlgCenterLine : public Gui::TaskView::TaskDialog +{ + Q_OBJECT + +public: + TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat, + TechDraw::DrawPage* page, + std::vector subNames); + TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat, + TechDraw::DrawPage* page, + std::string edgeName); + ~TaskDlgCenterLine(); + +public: + /// is called the TaskView when the dialog is opened + virtual void open(); + /// is called by the framework if an button is clicked which has no accept or reject role + virtual void clicked(int); + /// is called by the framework if the dialog is accepted (Ok) + virtual bool accept(); + /// is called by the framework if the dialog is rejected (Cancel) + virtual bool reject(); + /// is called by the framework if the user presses the help button + virtual void helpRequested() { return;} + virtual bool isAllowedAlterDocument(void) const + { return false; } + void update(); + + void modifyStandardButtons(QDialogButtonBox* box); + +protected: + +private: + TaskCenterLine* widget; + Gui::TaskView::TaskBox* taskbox; + +}; + +} //namespace TechDrawGui + +#endif // #ifndef TECHDRAWGUI_TASKCENTERLINE_H diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.ui b/src/Mod/TechDraw/Gui/TaskCenterLine.ui index 605f15c1ec..3440ebdbeb 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.ui +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.ui @@ -6,12 +6,12 @@ 0 0 - 409 - 460 + 380 + 393 - + 0 0 @@ -29,319 +29,316 @@ :/icons/actions/techdraw-facecenterline.svg:/icons/actions/techdraw-facecenterline.svg - + - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Raised - - - - - - - - - - false - - - false - - - Qt::NoFocus - - - false - - - - - - - Base View - - - - - - - Elements - - - - - - - false - - - - 16777215 - 100 - - - - - - - - - - - - Top to Bottom line - - - Vertical - - - true - - - - - - - true - - - Left to Right line - - - Horizontal - - - - - - - true - - - centerline between + + + + + false + + + false + + + Qt::NoFocus + + + false + + + + + + + Base View + + + + + + + Elements + + + + + + + false + + + + 16777215 + 100 + + + + + + + + + + + + Top to Bottom line + + + Vertical + + + true + + + + + + + true + + + Left to Right line + + + Horizontal + + + + + + + true + + + centerline between - lines: in equal distance to the lines and with - half of the angle tghe lines have to each other + half of the angle the lines have to each other - points: in equal distance to the points - - - Aligned - - - - - - - - - - - Shift Horiz - - - - - - - Shift Vert - - - - - - - Rotate - - - - - - - Rotate line +CCW or -CW - - - -360.000000000000000 - - - 360.000000000000000 - - - - - - - Move line +Up or -Down - - - - - - - - - - Move line -Left or +Right - - - - - - - - - - - - Qt::Horizontal - - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Color - - - - - - - - 0 - 0 - 0 - - - - - - - - Weight - - - - - - - 0.100000000000000 - - - 0.500000000000000 - - - - - - - Style - - - - - - - 1 - - - - Continuous - - - - :/icons/continuous-line.svg:/icons/continuous-line.svg - - - - - Dash - - - - :/icons/dash-line.svg:/icons/dash-line.svg - - - - - Dot - - - - :/icons/dot-line.svg:/icons/dot-line.svg - - - - - DashDot - - - - :/icons/dashDot-line.svg:/icons/dashDot-line.svg - - - - - DashDotDot - - - - :/icons/dashDotDot-line.svg:/icons/dashDotDot-line.svg - - - - - - - - Extend By - - - - - - - Make the line a little longer. - - - mm - - - 3.000000000000000 - - - - - - - - - - - Qt::Vertical + + + Aligned + + + + + + + + + + + Shift Horiz + + + + + + + Shift Vert + + + + + + + Rotate + + + + + + + + 0 + 20 + + + + Rotate line +CCW or -CW + + + -360.000000000000000 + + + 360.000000000000000 + + + + + + + Move line +Up or -Down + + + + + + + + + + + 0 + 20 + + + + Move line -Left or +Right + + + + + + + + + + + + Qt::Horizontal + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Color + + + + + + + + 0 + 0 + 0 + + + + + + + + Weight + + + + + + + 0.100000000000000 + + + 0.500000000000000 + + + + + + + Style + + + + + + + 1 + + + + Continuous - - - 20 - 40 - + + + :/icons/continuous-line.svg:/icons/continuous-line.svg - - - + + + + Dash + + + + :/icons/dash-line.svg:/icons/dash-line.svg + + + + + Dot + + + + :/icons/dot-line.svg:/icons/dot-line.svg + + + + + DashDot + + + + :/icons/dashDot-line.svg:/icons/dashDot-line.svg + + + + + DashDotDot + + + + :/icons/dashDotDot-line.svg:/icons/dashDotDot-line.svg + + + + + + + + Extend By + + + + + + + + 0 + 20 + + + + Make the line a little longer. + + + mm + + + 3.000000000000000 + + + + + + + + + false + + + Flips endpoints of selected lines for centerline creation, +see the FreeCAD Wiki '2LineCenterLine' for a description + + + Flip Ends + diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h index 83e5064613..f3acf1007e 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h @@ -33,7 +33,6 @@ #include class Ui_TaskWeldingSymbol; -class Ui_TaskCL2Lines; namespace App { class DocumentObject;