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

TechDraw: hard type enums, part 3 (#19418)

Browse Source 
* Remove magic number and hard type enums in LineNameEnum.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.

* Remove magic number and hard type enums in QGIFace.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.

* Remove magic number and hard type enums in Enums.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.

* Remove magic number and hard type enums in QGVPage.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.

* Remove magic number and hard type enums in TaskSurfaceFinishSymbols.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.

* Remove magic number and hard type enums in QGTracker.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-24 17:58:05 +01:00
committed by GitHub
parent 38797d1fa4
commit bf1f99c070
19 changed files with 161 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/TechDraw/Gui/QGIFace.cpp
View File

@@ -87,9 +87,9 @@ QGIFace::QGIFace(int index) :
m_fillDef = Qt::SolidPattern;
m_fillSelect = Qt::SolidPattern;
setFillMode(NoFill);
setFillMode(FillMode::NoFill);
if (m_colDefFill.alpha() > 0) {
setFillMode(PlainFill);
setFillMode(FillMode::PlainFill);
}
setFill(m_colDefFill, m_fillDef);
@@ -113,7 +113,7 @@ void QGIFace::draw()
m_imageSvgHatchArea->hide();
if (isHatched()) {
if (m_mode == GeomHatchFill) {
if (m_mode == FillMode::GeomHatchFill) {
//GeomHatch does not appear in pdf if clipping is set to true
setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
if (!m_lineSets.empty()) {
@@ -124,7 +124,7 @@ void QGIFace::draw()
lineSetToFillItems(ls);
}
}
} else if (m_mode == SvgFill) {
} else if (m_mode == FillMode::SvgFill) {
m_brush.setTexture(QPixmap());
m_fillNormal = m_fillDef;
m_fillStyleCurrent = m_fillNormal;
@@ -137,11 +137,11 @@ void QGIFace::draw()
buildSvgHatch();
m_svgHatchArea->show();
}
} else if (m_mode == BitmapFill) {
} else if (m_mode == FillMode::BitmapFill) {
m_fillStyleCurrent = Qt::TexturePattern;
m_texture = textureFromBitmap(m_fileSpec);
m_brush.setTexture(m_texture);
} else if (m_mode == PlainFill) {
} else if (m_mode == FillMode::PlainFill) {
setFill(m_colNormalFill, m_fillNormal);
}
}
@@ -153,7 +153,7 @@ void QGIFace::draw()
void QGIFace::setPrettyNormal() {
// Base::Console().Message("QGIF::setPrettyNormal() - hatched: %d\n", isHatched());
if (isHatched() &&
(m_mode == BitmapFill) ) { //hatch with bitmap fill
(m_mode == FillMode::BitmapFill) ) { //hatch with bitmap fill
m_fillStyleCurrent = Qt::TexturePattern;
m_brush.setTexture(m_texture);
} else {
@@ -216,11 +216,11 @@ void QGIFace::loadSvgHatch(std::string fileSpec)
}
}
void QGIFace::setFillMode(QGIFace::fillMode mode)
void QGIFace::setFillMode(FillMode mode)
{
m_mode = mode;
if ((m_mode == NoFill) ||
(m_mode == PlainFill)) {
if ((m_mode == FillMode::NoFill) ||
(m_mode == FillMode::PlainFill)) {
isHatched(false);
} else {
isHatched(true);