kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]use standard lines & LineFormat in extensions

Browse Source
This commit is contained in:
wandererfan
2023-12-26 12:03:36 -05:00
committed by WandererFan
parent 7236d7442a
commit 0c1f6138b4
7 changed files with 94 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/TechDraw/App/Cosmetic.h
View File

@@ -23,7 +23,10 @@
#ifndef TECHDRAW_COSMETIC_H
#define TECHDRAW_COSMETIC_H
#include <QColor>
#include <App/FeaturePython.h>
#include <App/Color.h>
#include <Base/Persistence.h>
#include <Base/Vector3D.h>
@@ -49,6 +52,16 @@ public:
const bool visible);
~LineFormat() = default;
int getStyle() const { return m_style; }
void setStyle(int style) { m_style = style; }
double getWidth() const { return m_weight; }
void setWidth(double width) {m_weight = width; }
App::Color getColor() const { return m_color; }
void setColor(App::Color color) { m_color = color; }
QColor getQColor() const { return m_color.asValue<QColor>(); }
void setQColor(QColor qColor) { m_color.set(qColor.redF(), qColor.greenF(), qColor.blueF(), 1.0 - qColor.alphaF()); }
bool getVisible() const { return m_visible; }
void setVisible(bool viz) { m_visible = viz; }
int getLineNumber() const { return m_lineNumber; }
void setLineNumber(int number) { m_lineNumber = number; }

6
src/Mod/TechDraw/App/LineGenerator.cpp
View File

@@ -113,12 +113,6 @@ QPen LineGenerator::getLinePen(size_t lineNumber, double nominalLineWidth)
proportionalAdjust = nominalLineWidth;
}
// Note: if the cap style is Round or Square, the lengths of the lines, or
// dots/dashes within the line, will be wrong by 1 pen width. To get the
// exact line lengths or dash pattern, you must use Flat caps. Flat caps
// look terrible at the corners.
linePen.setCapStyle((Qt::PenCapStyle)Preferences::LineCapStyle());
// valid line numbers are [1, number of line definitions]
// line 1 is always (?) continuous
// 0 substitutes for LineFormat::InvalidLine here

2
src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
View File

@@ -1361,6 +1361,7 @@ void execCreateObliqueChainDimension(Gui::Command* cmd) {
std::string edgeTag = objFeat->addCosmeticEdge(oldVertex.point / scale, nextPoint / scale);
auto edge = objFeat->getCosmeticEdge(edgeTag);
edge->m_format.m_style = 1;
edge->m_format.m_lineNumber = 1;
edge->m_format.m_weight = 0.15;
edge->m_format.m_color = App::Color(0.0f, 0.0f, 0.0f);
}
@@ -1716,6 +1717,7 @@ void execCreateObliqueCoordDimension(Gui::Command* cmd) {
std::string edgeTag = objFeat->addCosmeticEdge(oldVertex.point / scale, nextPoint / scale);
auto edge = objFeat->getCosmeticEdge(edgeTag);
edge->m_format.m_style = 1;
edge->m_format.m_lineNumber = 1;
edge->m_format.m_weight = 0.15;
edge->m_format.m_color = App::Color(0.0f, 0.0f, 0.0f);
}

28
src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
View File

@@ -74,10 +74,10 @@ using DU = DrawUtil;
namespace TechDrawGui
{
//LineAttributes activeAttributes; // container holding global line attributes
//TechDraw::LineFormat activeAttributes; // container holding global line attributes
//internal helper functions
lineAttributes& _getActiveLineAttributes();
TechDraw::LineFormat& _getActiveLineAttributes();
Base::Vector3d _circleCenter(Base::Vector3d p1, Base::Vector3d p2, Base::Vector3d p3);
void _createThreadCircle(std::string Name, TechDraw::DrawViewPart* objFeat, float factor);
void _createThreadLines(std::vector<std::string> SubNames, TechDraw::DrawViewPart* objFeat,
@@ -1488,7 +1488,7 @@ void execExtendShortenLine(Gui::Command* cmd, bool extend)
toDelete.push_back(uniTag);
if (baseGeo->source() == 1) {
auto cosEdge = objFeat->getCosmeticEdge(uniTag);
oldStyle = cosEdge->m_format.m_style;
oldStyle = cosEdge->m_format.m_lineNumber;
oldWeight = cosEdge->m_format.m_weight;
oldColor = cosEdge->m_format.m_color;
objFeat->removeCosmeticEdge(toDelete);
@@ -1974,9 +1974,9 @@ bool CmdTechDrawExtensionArcLengthAnnotation::isActive()
namespace TechDrawGui
{
lineAttributes& _getActiveLineAttributes()
LineFormat& _getActiveLineAttributes()
{
static lineAttributes attributes;
static TechDraw::LineFormat attributes;
return attributes;
}
@@ -2133,19 +2133,19 @@ void _createThreadLines(std::vector<std::string> SubNames, TechDraw::DrawViewPar
void _setLineAttributes(TechDraw::CosmeticEdge* cosEdge)
{
// set line attributes of a cosmetic edge
cosEdge->m_format.m_style = _getActiveLineAttributes().getStyle();
cosEdge->m_format.m_weight = _getActiveLineAttributes().getWidthValue();
cosEdge->m_format.m_color = _getActiveLineAttributes().getColorValue();
cosEdge->m_format.m_lineNumber = _getActiveLineAttributes().getStyle();
cosEdge->m_format.setStyle(_getActiveLineAttributes().getStyle());
cosEdge->m_format.setWidth(_getActiveLineAttributes().getWidth());
cosEdge->m_format.setColor(_getActiveLineAttributes().getColor());
cosEdge->m_format.setLineNumber(_getActiveLineAttributes().getLineNumber());
}
void _setLineAttributes(TechDraw::CenterLine* cosEdge)
{
// set line attributes of a cosmetic edge
cosEdge->m_format.m_style = _getActiveLineAttributes().getStyle();
cosEdge->m_format.m_weight = _getActiveLineAttributes().getWidthValue();
cosEdge->m_format.m_color = _getActiveLineAttributes().getColorValue();
cosEdge->m_format.m_lineNumber = _getActiveLineAttributes().getStyle();
cosEdge->m_format.m_weight = _getActiveLineAttributes().getWidth();
cosEdge->m_format.m_color = _getActiveLineAttributes().getColor();
cosEdge->m_format.setLineNumber(_getActiveLineAttributes().getLineNumber());
}
void _setLineAttributes(TechDraw::CosmeticEdge* cosEdge, int style, float weight, App::Color color)
@@ -2154,16 +2154,16 @@ void _setLineAttributes(TechDraw::CosmeticEdge* cosEdge, int style, float weight
cosEdge->m_format.m_style = _getActiveLineAttributes().getStyle();
cosEdge->m_format.m_weight = weight;
cosEdge->m_format.m_color = color;
cosEdge->m_format.m_lineNumber = style;
cosEdge->m_format.setLineNumber(style);
}
void _setLineAttributes(TechDraw::CenterLine* cosEdge, int style, float weight, App::Color color)
{
// set line attributes of a centerline
cosEdge->m_format.m_style = _getActiveLineAttributes().getStyle();
cosEdge->m_format.m_lineNumber = style;
cosEdge->m_format.m_weight = weight;
cosEdge->m_format.m_color = color;
cosEdge->m_format.setLineNumber(style);
}
}// namespace TechDrawGui

169
src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
View File

@@ -25,6 +25,7 @@
#include <Gui/BitmapFactory.h>
#include <Mod/TechDraw/App/LineGenerator.h>
#include <Mod/TechDraw/App/LineGroup.h>
#include "ui_TaskSelectLineAttributes.h"
#include "TaskSelectLineAttributes.h"
@@ -34,13 +35,6 @@ using namespace Gui;
using namespace TechDraw;
using namespace TechDrawGui;
//enum class EdgeStyle {
// solid = 1,
// dashed = 2,
// dotted = 3,
// dashdotted = 4
//};
enum class EdgeWidth {
small = 1,
middle = 2,
@@ -62,65 +56,6 @@ enum class EdgeColor {
// managing global line attributes
//===========================================================================
lineAttributes::lineAttributes()
{
style = 2;
width = int(EdgeWidth::middle);
color = int(EdgeColor::black);
}
void lineAttributes::setStyle(int newStyle)
{
style = newStyle;
}
void lineAttributes::setWidth(int newWidth)
{
width = newWidth;
}
float lineAttributes::getWidthValue()
{
switch(EdgeWidth(width)) {
case EdgeWidth::small:
return 0.18f;
case EdgeWidth::middle:
return 0.35f;
case EdgeWidth::thick:
return 0.5f;
default:
return 0.35f;
}
}
void lineAttributes::setColor(int newColor)
{
color = newColor;
}
App::Color lineAttributes::getColorValue()
{
switch (EdgeColor(color)) {
case EdgeColor::black:
return App::Color(0.0f, 0.0f, 0.0f);
case EdgeColor::grey:
return App::Color(0.7f, 0.7f, 0.7f);
case EdgeColor::red:
return App::Color(1.0f, 0.0f, 0.0f);
case EdgeColor::green:
return App::Color(0.0f, 1.0f, 0.0f);
case EdgeColor::blue:
return App::Color(0.0f, 0.0f, 1.0f);
case EdgeColor::magenta:
return App::Color(1.0f, 0.0f, 1.0f);
case EdgeColor::cyan:
return App::Color(0.0f, 1.0f, 1.0f);
case EdgeColor::yellow:
return App::Color(1.0f, 1.0f, 0.0f);
default:
return App::Color(0.0f, 0.0f, 0.0f);
}
}
//===========================================================================
// managing global dimension attributes
@@ -148,7 +83,7 @@ dimAttributes activeDimAttributes; // container holding dimension attributes
// TaskSelectLineAttributes
//===========================================================================
TaskSelectLineAttributes::TaskSelectLineAttributes(lineAttributes * ptActiveAttributes) :
TaskSelectLineAttributes::TaskSelectLineAttributes(LineFormat *ptActiveAttributes) :
activeAttributes(ptActiveAttributes),
ui(new Ui_TaskSelectLineAttributes)
{
@@ -189,50 +124,24 @@ void TaskSelectLineAttributes::setUiEdit()
ui->cbLineStyle->setCurrentIndex(lineStyle - 1);
}
int lineWidth = activeAttributes->getWidth();
switch(EdgeWidth(lineWidth)) {
case EdgeWidth::small:
ui->rbThin->setChecked(true);
break;
case EdgeWidth::middle:
ui->rbMiddle->setChecked(true);
break;
case EdgeWidth::thick:
ui->rbThick->setChecked(true);
break;
default:
ui->rbMiddle->setChecked(true);
// TODO: how to handle translation of a string with arg parameters in it?
ui->rbThin->setText(QString::fromUtf8("Thin %1").arg(QString::number(TechDraw::LineGroup::getDefaultWidth("Thin"))));
ui->rbMiddle->setText(QString::fromUtf8("Middle %1").arg(QString::number(TechDraw::LineGroup::getDefaultWidth("Graphic"))));
ui->rbThick->setText(QString::fromUtf8("Thick %1").arg(QString::number(TechDraw::LineGroup::getDefaultWidth("Thick"))));
double lineWidth = activeAttributes->getWidth();
if (lineWidth <= TechDraw::LineGroup::getDefaultWidth("Thin")) {
ui->rbThin->setChecked(true);
} else if (lineWidth <= TechDraw::LineGroup::getDefaultWidth("Graphic")) {
ui->rbMiddle->setChecked(true);
} else if (lineWidth <= TechDraw::LineGroup::getDefaultWidth("Thick")) {
ui->rbThick->setChecked(true);
} else {
ui->rbMiddle->setChecked(true);
}
int lineColor = activeAttributes->getColor();
switch(EdgeColor(lineColor)) {
case EdgeColor::black:
ui->rbBlack->setChecked(true);
break;
case EdgeColor::grey:
ui->rbGrey->setChecked(true);
break;
case EdgeColor::red:
ui->rbRed->setChecked(true);
break;
case EdgeColor::green:
ui->rbGreen->setChecked(true);
break;
case EdgeColor::blue:
ui->rbBlue->setChecked(true);
break;
case EdgeColor::magenta:
ui->rbMagenta->setChecked(true);
break;
case EdgeColor::cyan:
ui->rbCyan->setChecked(true);
break;
case EdgeColor::yellow:
ui->rbYellow->setChecked(true);
break;
default:
ui->rbBlack->setChecked(true);
}
QColor lineColor = activeAttributes->getQColor();
ui->cbColor->setColor(lineColor);
double cascadeSpacing = activeDimAttributes.getCascadeSpacing();
ui->sbSpacing->setValue(cascadeSpacing);
@@ -244,47 +153,25 @@ void TaskSelectLineAttributes::setUiEdit()
bool TaskSelectLineAttributes::accept()
{
activeAttributes->setStyle(ui->cbLineStyle->currentIndex() + 1);
activeAttributes->setLineNumber(ui->cbLineStyle->currentIndex() + 1);
if (ui->rbThin->isChecked()){
activeAttributes->setWidth(int(EdgeWidth::small));
activeAttributes->setWidth(TechDraw::LineGroup::getDefaultWidth("Thin"));
}
else if (ui->rbMiddle->isChecked()){
activeAttributes->setWidth(int(EdgeWidth::middle));
activeAttributes->setWidth(TechDraw::LineGroup::getDefaultWidth("Graphic"));
}
else if (ui->rbThick->isChecked()){
activeAttributes->setWidth(int(EdgeWidth::thick));
activeAttributes->setWidth(TechDraw::LineGroup::getDefaultWidth("Thick"));
}
else {
activeAttributes->setWidth(int(EdgeWidth::middle));
activeAttributes->setWidth(TechDraw::LineGroup::getDefaultWidth("Graphic"));
}
if (ui->rbBlack->isChecked()){
activeAttributes->setColor(int(EdgeColor::black));
}
else if (ui->rbGrey->isChecked()){
activeAttributes->setColor(int(EdgeColor::grey));
}
else if (ui->rbRed->isChecked()){
activeAttributes->setColor(int(EdgeColor::red));
}
else if (ui->rbGreen->isChecked()){
activeAttributes->setColor(int(EdgeColor::green));
}
else if (ui->rbBlue->isChecked()){
activeAttributes->setColor(int(EdgeColor::blue));
}
else if (ui->rbMagenta->isChecked()){
activeAttributes->setColor(int(EdgeColor::magenta));
}
else if (ui->rbCyan->isChecked()){
activeAttributes->setColor(int(EdgeColor::cyan));
}
else if (ui->rbYellow->isChecked()){
activeAttributes->setColor(int(EdgeColor::yellow));
}
else {
activeAttributes->setColor(int(EdgeColor::black));
}
QColor qTemp = ui->cbColor->color();
App::Color temp;
temp.set(qTemp.redF(), qTemp.greenF(), qTemp.blueF(), 1.0 - qTemp.alphaF());
activeAttributes->setColor(temp);
double cascadeSpacing = ui->sbSpacing->value();
activeDimAttributes.setCascadeSpacing(cascadeSpacing);
@@ -303,7 +190,7 @@ bool TaskSelectLineAttributes::reject()
// TaskDlgSelectLineAttributes
//===========================================================================
TaskDlgSelectLineAttributes::TaskDlgSelectLineAttributes(lineAttributes * ptActiveAttributes)
TaskDlgSelectLineAttributes::TaskDlgSelectLineAttributes(LineFormat *ptActiveAttributes)
: TaskDialog()
{
widget = new TaskSelectLineAttributes(ptActiveAttributes);

38
src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
View File

@@ -26,6 +26,7 @@
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <Mod/TechDraw/App/Cosmetic.h>
class dimAttributes {
@@ -69,31 +70,31 @@ class MDIViewPage;
class ViewProviderViewPart;
class Ui_TaskSelectLineAttributes;
class lineAttributes {
int style;
int width;
int color;
// class lineAttributes {
// int style;
// int width;
// int color;
public:
// public:
lineAttributes();
void setStyle(int);
int getStyle() const {return style;}
void setWidth(int);
int getWidth() const {return width;}
float getWidthValue();
void setColor(int);
int getColor() const {return color;}
App::Color getColorValue();
// lineAttributes();
// void setStyle(int);
// int getStyle() const {return style;}
// void setWidth(int);
// int getWidth() const {return width;}
// float getWidthValue();
// void setColor(int);
// int getColor() const {return color;}
// App::Color getColorValue();
}; // class lineAttributes
// }; // class lineAttributes
class TaskSelectLineAttributes : public QWidget
{
Q_OBJECT
public:
explicit TaskSelectLineAttributes(lineAttributes * ptActiveAttributes);
explicit TaskSelectLineAttributes(TechDraw::LineFormat* ptActiveAttributes);
~TaskSelectLineAttributes() override;
virtual bool accept();
@@ -106,7 +107,8 @@ protected:
void setUiEdit();
private:
lineAttributes* activeAttributes;
// lineAttributes* activeAttributes;
TechDraw::LineFormat* activeAttributes;
std::unique_ptr<Ui_TaskSelectLineAttributes> ui;
TechDraw::LineGenerator* m_lineGenerator;
@@ -117,7 +119,7 @@ class TaskDlgSelectLineAttributes : public Gui::TaskView::TaskDialog
Q_OBJECT
public:
explicit TaskDlgSelectLineAttributes(lineAttributes * ptActiveAttributes);
explicit TaskDlgSelectLineAttributes(TechDraw::LineFormat * ptActiveAttributes);
~TaskDlgSelectLineAttributes() override;
public:

126
src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>332</width>
<height>401</height>
<width>424</width>
<height>308</height>
</rect>
</property>
<property name="sizePolicy">
@@ -95,6 +95,9 @@
</item>
<item>
<layout class="QGridLayout" name="lineColors">
<item row="0" column="1">
<widget class="Gui::PrefColorButton" name="cbColor"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_colors">
<property name="text">
@@ -102,113 +105,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="rbBlack">
<property name="text">
<string>Black</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="rbBlue">
<property name="text">
<string>Blue</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="rbGrey">
<property name="text">
<string>Grey</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="2" column="1">
<widget class="QRadioButton" name="rbMagenta">
<property name="text">
<string>Magenta</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="3" column="0">
<widget class="QRadioButton" name="rbRed">
<property name="text">
<string>Red</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="3" column="1">
<widget class="QRadioButton" name="rbCyan">
<property name="text">
<string>Cyan</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="4" column="0">
<widget class="QRadioButton" name="rbGreen">
<property name="text">
<string>Green</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
<item row="4" column="1">
<widget class="QRadioButton" name="rbYellow">
<property name="text">
<string>Yellow</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bgLineColor</string>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
@@ -267,6 +163,18 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::ColorButton</class>
<extends>QPushButton</extends>
<header>Gui/Widgets.h</header>
</customwidget>
<customwidget>
<class>Gui::PrefColorButton</class>
<extends>Gui::ColorButton</extends>
<header>Gui/PrefWidgets.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="Resources/TechDraw.qrc"/>
</resources>