From d8442ddb81ead36dca0ea7807466f1fd7c898273 Mon Sep 17 00:00:00 2001 From: Markus Bullmann Date: Thu, 5 Apr 2018 17:26:18 +0200 Subject: [PATCH] Added new material 'metal' --- mapview/2D/MapViewElementHelper.h | 1 + params/ElementParamWidget.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mapview/2D/MapViewElementHelper.h b/mapview/2D/MapViewElementHelper.h index 40a00f0..f84daf0 100644 --- a/mapview/2D/MapViewElementHelper.h +++ b/mapview/2D/MapViewElementHelper.h @@ -79,6 +79,7 @@ public: if (focus) {pen.setColor(Qt::black);} if (mat == Material::CONCRETE) {;} if (mat == Material::GLASS) {pen.setStyle(Qt::PenStyle::DotLine);} + if (mat == Material::METAL) {pen.setColor(QColor(50, 50, 50));} if (type == ObstacleType::HANDRAIL) {pen.setStyle(Qt::PenStyle::DashLine);} if (type == ObstacleType::UNKNOWN) {pen.setColor(Qt::red);} if (type == ObstacleType::PILLAR) {pen.setColor(Qt::red);} diff --git a/params/ElementParamWidget.cpp b/params/ElementParamWidget.cpp index 80c04a0..c5fb866 100644 --- a/params/ElementParamWidget.cpp +++ b/params/ElementParamWidget.cpp @@ -30,6 +30,7 @@ QComboBox* getMaterials() { case Material::DRYWALL: cmbMaterial->addItem("Drywall", i); break; case Material::WOOD: cmbMaterial->addItem("Wood", i); break; case Material::GLASS: cmbMaterial->addItem("Glass", i); break; + case Material::METAL: cmbMaterial->addItem("Metal", i); break; case Material::_END: throw 1; } } @@ -128,7 +129,6 @@ void ElementParamWidget::refresh() { } } - // has outline method? { MMFloorOutlinePolygon* elem = dynamic_cast(el);