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

using enums to define line attributes

Browse Source
This commit is contained in:
edi271
2021-12-19 14:17:23 +01:00
committed by WandererFan
parent 5e44722a18
commit bfe2184251
3 changed files with 69 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ using namespace TechDrawGui;
using namespace TechDraw;
using namespace std;
lineAttributes activeAttributes; // container holding global line attributes
LineAttributes activeAttributes; // container holding global line attributes
//internal helper functions
bool _circulation(Base::Vector3d A, Base::Vector3d B, Base::Vector3d C);
@@ -1929,14 +1929,14 @@ 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 = activeAttributes.getStyle();
cosEdge->m_format.m_style = int(activeAttributes.getStyle()+1);
cosEdge->m_format.m_weight = activeAttributes.getWidthValue();
cosEdge->m_format.m_color = activeAttributes.getColorValue();
}
void _setLineAttributes(TechDraw::CenterLine* cosEdge) {
// set line attributes of a cosmetic edge
cosEdge->m_format.m_style = activeAttributes.getStyle();
// set line attributes of a centerline
cosEdge->m_format.m_style = int(activeAttributes.getStyle()+1);
cosEdge->m_format.m_weight = activeAttributes.getWidthValue();
cosEdge->m_format.m_color = activeAttributes.getColorValue();
}

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

@@ -74,49 +74,28 @@ using namespace Gui;
using namespace TechDraw;
using namespace TechDrawGui;
#define solid 1
#define dashed 2
#define dotted 3
#define dashdotted 4
//enum EdgeType{solid, dashed, dotted, dashdotted};
//enum EdgeWidth{small, middle, thick };
#define small 1
#define middle 2
#define thick 3
//enum EdgeColor{black, grey, red, green, blue, magenta, cyan, yellow};
#define black 1
#define grey 2
#define red 3
#define green 4
#define blue 5
#define magenta 6
#define cyan 7
#define yellow 8
//===========================================================================
// managing global line attributes
//===========================================================================
lineAttributes::lineAttributes(void)
LineAttributes::LineAttributes(void)
{
style = dotted;
width = middle;
color = black;
}
void lineAttributes::setStyle(int newStyle)
void LineAttributes::setStyle(edgeStyle newStyle)
{
style = newStyle;
}
void lineAttributes::setWidth(float newWidth)
void LineAttributes::setWidth(edgeWidth newWidth)
{
width = newWidth;
}
float lineAttributes::getWidthValue(void)
float LineAttributes::getWidthValue(void)
{
switch(width){
case small:
@@ -133,12 +112,12 @@ float lineAttributes::getWidthValue(void)
}
}
void lineAttributes::setColor(int newColor)
void LineAttributes::setColor(edgeColor newColor)
{
color = newColor;
}
App::Color lineAttributes::getColorValue(void)
App::Color LineAttributes::getColorValue(void)
{
switch(color){
case black:
@@ -190,7 +169,7 @@ dimAttributes activeDimAttributes; // container holding dimension attributes
// TaskSelectLineAttributes
//===========================================================================
TaskSelectLineAttributes::TaskSelectLineAttributes(lineAttributes * ptActiveAttributes) :
TaskSelectLineAttributes::TaskSelectLineAttributes(LineAttributes * ptActiveAttributes) :
ui(new Ui_TaskSelectLineAttributes),
activeAttributes(ptActiveAttributes)
@@ -224,64 +203,64 @@ void TaskSelectLineAttributes::changeEvent(QEvent *e)
void TaskSelectLineAttributes::setUiEdit()
{
setWindowTitle(QObject::tr("Select Line Attributes"));
int lineStyle = activeAttributes->getStyle();
LineAttributes::edgeStyle lineStyle = activeAttributes->getStyle();
switch(lineStyle){
case solid:
case LineAttributes::solid:
ui->rbSolid->setChecked(true);
break;
case dashed:
case LineAttributes::dashed:
ui->rbDashed->setChecked(true);
break;
case dotted:
case LineAttributes::dotted:
ui->rbDotted->setChecked(true);
break;
case dashdotted:
case LineAttributes::dashdotted:
ui->rbDashDotted->setChecked(true);
break;
default:
ui->rbDashDotted->setChecked(true);
}
int lineWidth = activeAttributes->getWidth();
LineAttributes::edgeWidth lineWidth = activeAttributes->getWidth();
switch(lineWidth){
case small:
case LineAttributes::small:
ui->rbThin->setChecked(true);
break;
case middle:
case LineAttributes::middle:
ui->rbMiddle->setChecked(true);
break;
case thick:
case LineAttributes::thick:
ui->rbThick->setChecked(true);
break;
default:
ui->rbMiddle->setChecked(true);
}
int lineColor = activeAttributes->getColor();
LineAttributes::edgeColor lineColor = activeAttributes->getColor();
switch(lineColor){
case black:
case LineAttributes::black:
ui->rbBlack->setChecked(true);
break;
case grey:
case LineAttributes::grey:
ui->rbGrey->setChecked(true);
break;
case red:
case LineAttributes::red:
ui->rbRed->setChecked(true);
break;
case green:
case LineAttributes::green:
ui->rbGreen->setChecked(true);
break;
case blue:
case LineAttributes::blue:
ui->rbBlue->setChecked(true);
break;
case magenta:
case LineAttributes::magenta:
ui->rbMagenta->setChecked(true);
break;
case cyan:
case LineAttributes::cyan:
ui->rbCyan->setChecked(true);
break;
case yellow:
ui->rbGreen->setChecked(true);
case LineAttributes::yellow:
ui->rbYellow->setChecked(true);
break;
default:
ui->rbBlack->setChecked(true);
@@ -295,60 +274,60 @@ void TaskSelectLineAttributes::setUiEdit()
bool TaskSelectLineAttributes::accept()
{
if (ui->rbSolid->isChecked()){
activeAttributes->setStyle(solid);
activeAttributes->setStyle(LineAttributes::solid);
}
else if (ui->rbDashed->isChecked()){
activeAttributes->setStyle(dashed);
activeAttributes->setStyle(LineAttributes::dashed);
}
else if (ui->rbDotted->isChecked()){
activeAttributes->setStyle(dotted);
activeAttributes->setStyle(LineAttributes::dotted);
}
else if (ui->rbDashDotted->isChecked()){
activeAttributes->setStyle(dashdotted);
activeAttributes->setStyle(LineAttributes::dashdotted);
}
else {
activeAttributes->setStyle(dashdotted);
activeAttributes->setStyle(LineAttributes::dashdotted);
}
if (ui->rbThin->isChecked()){
activeAttributes->setWidth(small);
activeAttributes->setWidth(LineAttributes::small);
}
else if (ui->rbMiddle->isChecked()){
activeAttributes->setWidth(middle);
activeAttributes->setWidth(LineAttributes::middle);
}
else if (ui->rbThick->isChecked()){
activeAttributes->setWidth(thick);
activeAttributes->setWidth(LineAttributes::thick);
}
else {
activeAttributes->setWidth(middle);
activeAttributes->setWidth(LineAttributes::middle);
}
if (ui->rbBlack->isChecked()){
activeAttributes->setColor(black);
activeAttributes->setColor(LineAttributes::black);
}
else if (ui->rbGrey->isChecked()){
activeAttributes->setColor(grey);
activeAttributes->setColor(LineAttributes::grey);
}
else if (ui->rbRed->isChecked()){
activeAttributes->setColor(red);
activeAttributes->setColor(LineAttributes::red);
}
else if (ui->rbGreen->isChecked()){
activeAttributes->setColor(green);
activeAttributes->setColor(LineAttributes::green);
}
else if (ui->rbBlue->isChecked()){
activeAttributes->setColor(blue);
activeAttributes->setColor(LineAttributes::blue);
}
else if (ui->rbMagenta->isChecked()){
activeAttributes->setColor(magenta);
activeAttributes->setColor(LineAttributes::magenta);
}
else if (ui->rbCyan->isChecked()){
activeAttributes->setColor(cyan);
activeAttributes->setColor(LineAttributes::cyan);
}
else if (ui->rbYellow->isChecked()){
activeAttributes->setColor(yellow);
activeAttributes->setColor(LineAttributes::yellow);
}
else {
activeAttributes->setColor(black);
activeAttributes->setColor(LineAttributes::black);
}
double cascadeSpacing = ui->sbSpacing->value();
@@ -368,7 +347,7 @@ bool TaskSelectLineAttributes::reject()
// TaskDlgSelectLineAttributes
//===========================================================================
TaskDlgSelectLineAttributes::TaskDlgSelectLineAttributes(lineAttributes * ptActiveAttributes)
TaskDlgSelectLineAttributes::TaskDlgSelectLineAttributes(LineAttributes * ptActiveAttributes)
: TaskDialog()
{
widget = new TaskSelectLineAttributes(ptActiveAttributes);

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

@@ -73,31 +73,36 @@ class QGIPrimPath;
class MDIViewPage;
class ViewProviderViewPart;
class lineAttributes {
int style;
int width;
int color;
class LineAttributes {
public:
enum edgeStyle{solid, dashed, dotted, dashdotted};
enum edgeWidth{small, middle, thick };
enum edgeColor{black, grey, red, green, blue, magenta, cyan, yellow};
private:
edgeStyle style;
edgeWidth width;
edgeColor color;
public:
lineAttributes(void);
void setStyle(int);
int getStyle(void) {return style;}
void setWidth(float);
int getWidth(void) {return width;}
LineAttributes(void);
void setStyle(edgeStyle);
edgeStyle getStyle(void) {return style;}
void setWidth(edgeWidth);
edgeWidth getWidth(void) {return width;}
float getWidthValue(void);
void setColor(int);
int getColor(void) {return color;}
void setColor(edgeColor);
edgeColor getColor(void) {return color;}
App::Color getColorValue(void);
}; // class lineAttributes
}; // class LineAttributes
class TaskSelectLineAttributes : public QWidget
{
Q_OBJECT
public:
TaskSelectLineAttributes(lineAttributes * ptActiveAttributes);
TaskSelectLineAttributes(LineAttributes * ptActiveAttributes);
~TaskSelectLineAttributes();
public Q_SLOTS:
@@ -106,7 +111,7 @@ public:
virtual bool accept();
virtual bool reject();
void updateTask();
lineAttributes* activeAttributes;
LineAttributes* activeAttributes;
protected Q_SLOTS:
@@ -125,7 +130,7 @@ class TaskDlgSelectLineAttributes : public Gui::TaskView::TaskDialog
Q_OBJECT
public:
TaskDlgSelectLineAttributes(lineAttributes * ptActiveAttributes);
TaskDlgSelectLineAttributes(LineAttributes * ptActiveAttributes);
~TaskDlgSelectLineAttributes();
public: