Skip to content

Commit

Permalink
GraphicsLayer: Fix typo and wrong default colors
Browse files Browse the repository at this point in the history
  • Loading branch information
ubruhin committed Feb 15, 2018
1 parent 9f0a680 commit d7861ac
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ DefaultGraphicsLayerProvider::DefaultGraphicsLayerProvider() noexcept
addLayer(GraphicsLayer::sBoardAlignment);
addLayer(GraphicsLayer::sBoardDocumentation);
addLayer(GraphicsLayer::sBoardComments);
addLayer(GraphicsLayer::sBoardcGuide);
addLayer(GraphicsLayer::sBoardGuide);
}

DefaultGraphicsLayerProvider::~DefaultGraphicsLayerProvider() noexcept
Expand Down
8 changes: 4 additions & 4 deletions libs/librepcb/common/graphics/graphicslayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ const QStringList& GraphicsLayer::getBoardGeometryElementLayerNames() noexcept
sBoardAlignment,
sBoardDocumentation,
sBoardComments,
sBoardcGuide,
sBoardGuide,
sTopPlacement,
sTopHiddenGrabAreas,
sTopDocumentation,
Expand Down Expand Up @@ -261,7 +261,7 @@ void GraphicsLayer::getDefaultValues(const QString& name, QString& nameTr, QColo
h.insert(sBoardAlignment, {tr("Alignment"), Qt::darkCyan, Qt::cyan, true});
h.insert(sBoardDocumentation, {tr("Documentation"), Qt::white, Qt::lightGray, true});
h.insert(sBoardComments, {tr("Comments"), Qt::yellow, Qt::darkYellow, true});
h.insert(sBoardcGuide, {tr("Guide"), Qt::darkYellow, Qt::yellow, true});
h.insert(sBoardGuide, {tr("Guide"), Qt::darkYellow, Qt::yellow, true});
// board symmetric
h.insert(sTopPlacement, {tr("Top Placement"), QColor(224, 224, 224, 150), QColor(224, 224, 224, 220), true});
h.insert(sBotPlacement, {tr("Bot Placement"), QColor(224, 224, 224, 150), QColor(224, 224, 224, 220), true});
Expand All @@ -279,8 +279,8 @@ void GraphicsLayer::getDefaultValues(const QString& name, QString& nameTr, QColo
h.insert(sBotValues, {tr("Bot Values"), QColor(224, 224, 224, 150), QColor(224, 224, 224, 220), true});
h.insert(sTopCourtyard, {tr("Top Courtyard"), QColor(255, 0, 255, 70), QColor(255, 0, 255, 90), false});
h.insert(sBotCourtyard, {tr("Bot Courtyard"), QColor(0, 255, 255, 70), QColor(0, 255, 255, 90), false});
h.insert(sTopStopMask, {tr("Top Stop Mask"), QColor(255, 255, 255, 100), QColor(255, 0, 0, 150), false});
h.insert(sBotStopMask, {tr("Bot Stop Mask"), QColor(255, 255, 255, 100), QColor(255, 0, 0, 150), false});
h.insert(sTopStopMask, {tr("Top Stop Mask"), QColor(255, 255, 255, 100), QColor(255, 255, 255, 150), false});
h.insert(sBotStopMask, {tr("Bot Stop Mask"), QColor(255, 255, 255, 100), QColor(255, 255, 255, 150), false});
h.insert(sTopSolderPaste, {tr("Top Solder Paste"), QColor(224, 224, 224, 100), QColor(224, 224, 224, 120), false});
h.insert(sBotSolderPaste, {tr("Bot Solder Paste"), QColor(224, 224, 224, 100), QColor(224, 224, 224, 120), false});
h.insert(sTopFinish, {tr("Top Finish"), QColor(255, 0, 0, 130), QColor(255, 0, 0, 130), true});
Expand Down
2 changes: 1 addition & 1 deletion libs/librepcb/common/graphics/graphicslayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class GraphicsLayer : public QObject
static constexpr const char* sBoardAlignment = "brd_alignment"; ///< alignment helpers in devices
static constexpr const char* sBoardDocumentation = "brd_documentation"; ///< for documentation purposes, e.g. text
static constexpr const char* sBoardComments = "brd_comments"; ///< for personal comments, e.g. text
static constexpr const char* sBoardcGuide = "brd_guide"; ///< e.g. for boxes around circuits
static constexpr const char* sBoardGuide = "brd_guide"; ///< e.g. for boxes around circuits

// symmetric board layers
static constexpr const char* sTopPlacement = "top_placement"; ///< placement information (e.g. outline) of devices
Expand Down
2 changes: 1 addition & 1 deletion libs/librepcb/libraryeditor/libraryeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ LibraryEditor::LibraryEditor(workspace::Workspace& ws, QSharedPointer<Library> l
addLayer(GraphicsLayer::sBoardAlignment);
addLayer(GraphicsLayer::sBoardDocumentation);
addLayer(GraphicsLayer::sBoardComments);
addLayer(GraphicsLayer::sBoardcGuide);
addLayer(GraphicsLayer::sBoardGuide);
addLayer(GraphicsLayer::sTopCopper);
for (int i = 1; i <= GraphicsLayer::getInnerLayerCount(); ++i) {
addLayer(GraphicsLayer::getInnerLayerName(i));
Expand Down
4 changes: 2 additions & 2 deletions libs/librepcb/project/boards/boardlayerstack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ QList<GraphicsLayer*> BoardLayerStack::getAllowedPolygonLayers() const noexcept
GraphicsLayer::sBoardOutlines,
GraphicsLayer::sBoardMillingPth,
GraphicsLayer::sBoardDocumentation,
GraphicsLayer::sBoardcGuide,
GraphicsLayer::sBoardGuide,
GraphicsLayer::sTopPlacement,
GraphicsLayer::sTopDocumentation,
GraphicsLayer::sTopNames,
Expand Down Expand Up @@ -199,7 +199,7 @@ void BoardLayerStack::addAllLayers() noexcept
addLayer(GraphicsLayer::sBoardAlignment);
addLayer(GraphicsLayer::sBoardDocumentation);
addLayer(GraphicsLayer::sBoardComments);
addLayer(GraphicsLayer::sBoardcGuide);
addLayer(GraphicsLayer::sBoardGuide);

#ifdef QT_DEBUG
// debug layers
Expand Down

0 comments on commit d7861ac

Please sign in to comment.