Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
db490e30
Commit
db490e30
authored
Nov 13, 2024
by
Riegel
Browse files
Fix Feature search not rendering bridges correctly
parent
162d91e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java
View file @
db490e30
...
...
@@ -471,18 +471,30 @@ public class CityDoctorController {
root
.
getChildren
().
add
(
item
);
createGeometryNodes
(
bridge
,
item
);
createBoundarySurfaceNodes
(
bridge
.
getBoundarySurfaces
(),
item
);
createBridgeRoomNodes
(
bridge
,
item
);
createBridgeInstallationNodes
(
bridge
,
item
);
createConstructiveElementsNodes
(
bridge
,
item
);
createBridgeFurnitureNodes
(
bridge
,
item
);
createBridgeConstructiveElementsNodes
(
bridge
,
item
);
createBridgePartNodes
(
bridge
,
item
);
}
}
private
void
createBridgeRoomNodes
(
BridgeObject
bridge
,
TreeItem
<
Renderable
>
root
)
{
createRoomNodes
(
bridge
.
getBridgeRooms
(),
root
);
}
private
void
createBridgeInstallationNodes
(
BridgeObject
bridge
,
TreeItem
<
Renderable
>
root
)
{
createInstallationNodes
(
bridge
.
getBridgeInstallations
(),
root
);
}
private
void
createConstructiveElementsNodes
(
BridgeObject
bridge
,
TreeItem
<
Renderable
>
item
)
{
private
void
createBridgeFurnitureNodes
(
BridgeObject
bridge
,
TreeItem
<
Renderable
>
root
)
{
createFurnitureNodes
(
bridge
.
getBridgeFurniture
(),
root
);
}
private
void
createBridgeConstructiveElementsNodes
(
BridgeObject
bridge
,
TreeItem
<
Renderable
>
item
)
{
if
(
bridge
.
getConstructiveElements
().
isEmpty
())
{
return
;
}
...
...
@@ -493,11 +505,11 @@ public class CityDoctorController {
for
(
BridgeConstructiveElement
bce
:
bridge
.
getConstructiveElements
())
{
BridgeConstructiveElementNode
bceNode
=
new
BridgeConstructiveElementNode
(
bce
);
TreeItem
<
Renderable
>
b
p
NodeItem
=
new
TreeItem
<>(
bceNode
);
b
p
NodeItem
.
setExpanded
(
true
);
allBceNodeTextItem
.
getChildren
().
add
(
b
p
NodeItem
);
createGeometryNodes
(
bce
,
b
p
NodeItem
);
createBoundarySurfaceNodes
(
bce
.
getBoundarySurfaces
(),
b
p
NodeItem
);
TreeItem
<
Renderable
>
b
ce
NodeItem
=
new
TreeItem
<>(
bceNode
);
b
ce
NodeItem
.
setExpanded
(
true
);
allBceNodeTextItem
.
getChildren
().
add
(
b
ce
NodeItem
);
createGeometryNodes
(
bce
,
b
ce
NodeItem
);
createBoundarySurfaceNodes
(
bce
.
getBoundarySurfaces
(),
b
ce
NodeItem
);
}
}
...
...
@@ -855,6 +867,16 @@ public class CityDoctorController {
updateTree
(
root
);
addMoreButtonToBuildingsIfNecessary
(
foundBuildings
,
buildingsView
,
root
,
buildingChunkNr
);
}
else
{
}
else
if
(
selectedTab
==
FeatureType
.
BRIDGE
){
List
<
BridgeObject
>
foundBridges
=
filterFeatures
(
searchString
,
model
.
getBridges
());
TreeView
<
Renderable
>
brigdeView
=
mainWindow
.
getBridgeView
();
TreeItem
<
Renderable
>
root
=
brigdeView
.
getRoot
();
root
.
getChildren
().
clear
();
buildBridgeTreeFromList
(
foundBridges
,
root
);
updateTree
(
root
);
addMoreButtonIfNecessary
(
foundBridges
,
brigdeView
,
root
,
bridgeChunkNr
);
}
else
{
TreeView
<
Renderable
>
view
;
List
<?
extends
CityObject
>
cos
;
AtomicInteger
chunkCounter
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment