Commit 9d93322a authored by Riegel's avatar Riegel
Browse files

Fix: Add BridgeObject to PDF report output

parent 1f568610
...@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding; ...@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding;
import de.hft.stuttgart.citydoctor2.datastructure.AbstractFurniture; import de.hft.stuttgart.citydoctor2.datastructure.AbstractFurniture;
import de.hft.stuttgart.citydoctor2.datastructure.AbstractRoom; import de.hft.stuttgart.citydoctor2.datastructure.AbstractRoom;
import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel; import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel;
import de.hft.stuttgart.citydoctor2.datastructure.BridgeConstructiveElement;
import de.hft.stuttgart.citydoctor2.datastructure.BuildingUnit; import de.hft.stuttgart.citydoctor2.datastructure.BuildingUnit;
import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture; import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject; import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
...@@ -266,6 +267,8 @@ public class PdfStreamReporter implements StreamReporter { ...@@ -266,6 +267,8 @@ public class PdfStreamReporter implements StreamReporter {
bSection.setHeadlineColor(OK_COLOR); bSection.setHeadlineColor(OK_COLOR);
} }
writeErrorForCityObject(co, bSection); writeErrorForCityObject(co, bSection);
BridgeObject bo = (BridgeObject) co;
writeCheckResultForBridgeObject(bo, bSection);
} }
private void reportTrans(CityObject co, boolean hasError) { private void reportTrans(CityObject co, boolean hasError) {
...@@ -407,6 +410,7 @@ public class PdfStreamReporter implements StreamReporter { ...@@ -407,6 +410,7 @@ public class PdfStreamReporter implements StreamReporter {
for (AbstractFurniture af : ab.getBuildingRoomFurnitureList()) { for (AbstractFurniture af : ab.getBuildingRoomFurnitureList()) {
writeCheckResultForAbstractFurniture(af, root); writeCheckResultForAbstractFurniture(af, root);
} }
for (Storey s : ab.getBuildingStoreys()) { for (Storey s : ab.getBuildingStoreys()) {
writeCheckResultForStorey(s, root); writeCheckResultForStorey(s, root);
} }
...@@ -421,6 +425,33 @@ public class PdfStreamReporter implements StreamReporter { ...@@ -421,6 +425,33 @@ public class PdfStreamReporter implements StreamReporter {
} }
} }
private void writeCheckResultForBridgeObject(BridgeObject bo, Section root) {
Map<CheckId, CheckResult> results = bo.getAllCheckResults();
writeCheckResults(results.values(), root);
for (BridgeObject parts : bo.getParts()) {
sectionMap.put(bo.getGmlId().getGmlString(), root);
writeCheckResultForBridgeObject(parts, root);
}
for (Geometry geom : bo.getGeometries()) {
writeCheckResultForGeometry(geom, root);
}
for (AbstractRoom ar : bo.getBridgeRooms()) {
writeCheckResultForRoom(ar, root);
}
for (AbstractFurniture af : bo.getBridgeFurniture()) {
writeCheckResultForAbstractFurniture(af, root);
}
for (BridgeConstructiveElement bce : bo.getConstructiveElements()) {
writeCheckResultForBridgeConstructiveElement(bce, root);
}
for (BoundarySurface bs : bo.getBoundarySurfaces()) {
writeCheckResultForBoundarySurface(bs, root);
}
for (Installation bi : bo.getBridgeInstallations()) {
writeCheckResultForInstallation(bi, root);
}
}
private void writeCheckResultForStorey(Storey s, Section root) { private void writeCheckResultForStorey(Storey s, Section root) {
Map<CheckId, CheckResult> results = s.getAllCheckResults(); Map<CheckId, CheckResult> results = s.getAllCheckResults();
writeCheckResults(results.values(), root); writeCheckResults(results.values(), root);
...@@ -507,6 +538,17 @@ public class PdfStreamReporter implements StreamReporter { ...@@ -507,6 +538,17 @@ public class PdfStreamReporter implements StreamReporter {
} }
} }
private void writeCheckResultForBridgeConstructiveElement(BridgeConstructiveElement bce, Section root) {
Map<CheckId, CheckResult> results = bce.getAllCheckResults();
writeCheckResults(results.values(), root);
for (Geometry geom : bce.getGeometries()) {
writeCheckResultForGeometry(geom, root);
}
for (BoundarySurface bs : bce.getBoundarySurfaces()) {
writeCheckResultForBoundarySurface(bs, root);
}
}
private void writeErrorForCityObject(CityObject co, Section section) { private void writeErrorForCityObject(CityObject co, Section section) {
Map<CheckId, CheckResult> results = co.getAllCheckResults(); Map<CheckId, CheckResult> results = co.getAllCheckResults();
writeCheckResults(results.values(), section); writeCheckResults(results.values(), section);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment