FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

Added new material 'metal'

Browse Source
This commit is contained in:
Markus Bullmann
2018-04-05 17:26:18 +02:00
parent 3a4deaf314
commit d8442ddb81
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mapview/2D/MapViewElementHelper.h
View File

@@ -79,6 +79,7 @@ public:
if (focus) {pen.setColor(Qt::black);} if (focus) {pen.setColor(Qt::black);}
if (mat == Material::CONCRETE) {;} if (mat == Material::CONCRETE) {;}
if (mat == Material::GLASS) {pen.setStyle(Qt::PenStyle::DotLine);} 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::HANDRAIL) {pen.setStyle(Qt::PenStyle::DashLine);}
if (type == ObstacleType::UNKNOWN) {pen.setColor(Qt::red);} if (type == ObstacleType::UNKNOWN) {pen.setColor(Qt::red);}
if (type == ObstacleType::PILLAR) {pen.setColor(Qt::red);} if (type == ObstacleType::PILLAR) {pen.setColor(Qt::red);}

2
params/ElementParamWidget.cpp
View File

@@ -30,6 +30,7 @@ QComboBox* getMaterials() {
case Material::DRYWALL: cmbMaterial->addItem("Drywall", i); break; case Material::DRYWALL: cmbMaterial->addItem("Drywall", i); break;
case Material::WOOD: cmbMaterial->addItem("Wood", i); break; case Material::WOOD: cmbMaterial->addItem("Wood", i); break;
case Material::GLASS: cmbMaterial->addItem("Glass", i); break; case Material::GLASS: cmbMaterial->addItem("Glass", i); break;
case Material::METAL: cmbMaterial->addItem("Metal", i); break;
case Material::_END: throw 1; case Material::_END: throw 1;
} }
} }
@@ -128,7 +129,6 @@ void ElementParamWidget::refresh() {
} }
} }
// has outline method? // has outline method?
{ {
MMFloorOutlinePolygon* elem = dynamic_cast<MMFloorOutlinePolygon*>(el); MMFloorOutlinePolygon* elem = dynamic_cast<MMFloorOutlinePolygon*>(el);