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
664abca9
Commit
664abca9
authored
Dec 10, 2025
by
Matthias Betz
Browse files
disable autopro
parent
667cac62
Pipeline
#12279
passed with stage
in 2 minutes and 17 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/Extensions/CityDoctorAutoPro/src/main/java/de/hft/stuttgart/citydoctor2/gui/AutoProWindow.java
View file @
664abca9
...
@@ -362,7 +362,7 @@ public class AutoProWindow extends JDialog implements ItemListener {
...
@@ -362,7 +362,7 @@ public class AutoProWindow extends JDialog implements ItemListener {
*/
*/
private
void
startCppAutoProMethods
()
throws
FileNotFoundException
{
private
void
startCppAutoProMethods
()
throws
FileNotFoundException
{
List
<
Building
>
buildings
=
this
.
model
.
getBuildings
();
List
<
Building
>
buildings
=
this
.
model
.
getBuildings
()
.
toList
()
;
List
<
Geometry
>
geometryList
=
getAllGeometriesOfSelectedBuildings
(
buildings
);
List
<
Geometry
>
geometryList
=
getAllGeometriesOfSelectedBuildings
(
buildings
);
setBuildingsToOrigin
(
geometryList
);
setBuildingsToOrigin
(
geometryList
);
...
@@ -525,12 +525,12 @@ public class AutoProWindow extends JDialog implements ItemListener {
...
@@ -525,12 +525,12 @@ public class AutoProWindow extends JDialog implements ItemListener {
Building
building
=
part
.
getParent
();
Building
building
=
part
.
getParent
();
building
.
getBuildingParts
().
remove
(
part
);
building
.
getBuildingParts
().
remove
(
part
);
if
(
building
.
getBuildingParts
().
isEmpty
()
&&
building
.
getGeometries
().
isEmpty
())
{
if
(
building
.
getBuildingParts
().
isEmpty
()
&&
building
.
getGeometries
().
isEmpty
())
{
model
.
getBuildings
().
remove
(
building
);
model
.
getBuildings
().
toList
().
remove
(
building
);
}
}
}
else
if
(
parent
instanceof
Building
&&
parent
.
getGeometries
().
isEmpty
())
{
}
else
if
(
parent
instanceof
Building
&&
parent
.
getGeometries
().
isEmpty
())
{
Building
building
=
(
Building
)
parent
;
Building
building
=
(
Building
)
parent
;
if
(
building
.
getBuildingParts
().
isEmpty
())
{
if
(
building
.
getBuildingParts
().
isEmpty
())
{
model
.
getBuildings
().
remove
(
building
);
model
.
getBuildings
().
toList
().
remove
(
building
);
}
}
}
}
}
}
...
...
CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml
View file @
664abca9
...
@@ -22,10 +22,10 @@
...
@@ -22,10 +22,10 @@
<groupId>
de.hft.stuttgart
</groupId>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorHealer
</artifactId>
<artifactId>
CityDoctorHealer
</artifactId>
</dependency>
</dependency>
<dependency>
<!--
<dependency>
<groupId>de.hft.stuttgart</groupId>
<groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorAutoPro</artifactId>
<artifactId>CityDoctorAutoPro</artifactId>
</dependency>
</dependency>
-->
<dependency>
<dependency>
<groupId>
org.openjfx
</groupId>
<groupId>
org.openjfx
</groupId>
<artifactId>
javafx-controls
</artifactId>
<artifactId>
javafx-controls
</artifactId>
...
...
CityDoctorParent/Extensions/CityDoctorHealerGUI/src/main/java/de/hft/stuttgart/citydoctor2/healer/gui/HealerController.java
View file @
664abca9
...
@@ -2,36 +2,33 @@ package de.hft.stuttgart.citydoctor2.healer.gui;
...
@@ -2,36 +2,33 @@ package de.hft.stuttgart.citydoctor2.healer.gui;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.EnumMap
;
import
java.util.EnumMap
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.Optional
;
import
java.util.Optional
;
import
java.util.Set
;
import
java.util.Set
;
import
de.hft.stuttgart.citydoctor2.check.Check
;
import
de.hft.stuttgart.citydoctor2.check.Check
;
import
de.hft.stuttgart.citydoctor2.check.CheckError
;
import
de.hft.stuttgart.citydoctor2.check.CheckError
;
import
de.hft.stuttgart.citydoctor2.check.CheckId
;
import
de.hft.stuttgart.citydoctor2.check.CheckId
;
import
de.hft.stuttgart.citydoctor2.check.RequirementType
;
import
de.hft.stuttgart.citydoctor2.check.Checker
;
import
de.hft.stuttgart.citydoctor2.check.Checker
;
import
de.hft.stuttgart.citydoctor2.check.Requirement
;
import
de.hft.stuttgart.citydoctor2.check.Requirement
;
import
de.hft.stuttgart.citydoctor2.check.RequirementType
;
import
de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding
;
import
de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding
;
import
de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface
;
import
de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface
;
import
de.hft.stuttgart.citydoctor2.datastructure.Building
;
import
de.hft.stuttgart.citydoctor2.datastructure.Building
;
import
de.hft.stuttgart.citydoctor2.datastructure.Installation
;
import
de.hft.stuttgart.citydoctor2.datastructure.BuildingPart
;
import
de.hft.stuttgart.citydoctor2.datastructure.BuildingPart
;
import
de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel
;
import
de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel
;
import
de.hft.stuttgart.citydoctor2.datastructure.CityObject
;
import
de.hft.stuttgart.citydoctor2.datastructure.CityObject
;
import
de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon
;
import
de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon
;
import
de.hft.stuttgart.citydoctor2.datastructure.Geometry
;
import
de.hft.stuttgart.citydoctor2.datastructure.Geometry
;
import
de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation
;
import
de.hft.stuttgart.citydoctor2.datastructure.GeometryType
;
import
de.hft.stuttgart.citydoctor2.datastructure.GeometryType
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlId
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlId
;
import
de.hft.stuttgart.citydoctor2.datastructure.Installation
;
import
de.hft.stuttgart.citydoctor2.datastructure.LinkedPolygon
;
import
de.hft.stuttgart.citydoctor2.datastructure.LinkedPolygon
;
import
de.hft.stuttgart.citydoctor2.datastructure.Lod
;
import
de.hft.stuttgart.citydoctor2.datastructure.Lod
;
import
de.hft.stuttgart.citydoctor2.datastructure.Opening
;
import
de.hft.stuttgart.citydoctor2.datastructure.Opening
;
import
de.hft.stuttgart.citydoctor2.datastructure.Polygon
;
import
de.hft.stuttgart.citydoctor2.datastructure.Polygon
;
import
de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation
;
import
de.hft.stuttgart.citydoctor2.gui.AutoProWindow
;
import
de.hft.stuttgart.citydoctor2.gui.HighlightController
;
import
de.hft.stuttgart.citydoctor2.gui.HighlightController
;
import
de.hft.stuttgart.citydoctor2.gui.ListErrorVisitor
;
import
de.hft.stuttgart.citydoctor2.gui.ListErrorVisitor
;
import
de.hft.stuttgart.citydoctor2.gui.TriangulatedGeometry
;
import
de.hft.stuttgart.citydoctor2.gui.TriangulatedGeometry
;
...
@@ -86,10 +83,10 @@ public class HealerController {
...
@@ -86,10 +83,10 @@ public class HealerController {
if
(
model
==
null
)
{
if
(
model
==
null
)
{
return
;
return
;
}
}
model
.
createFeatureStream
().
forEach
(
CityObject:
:
prepareForChecking
);
//
model.createFeatureStream().forEach(CityObject::prepareForChecking);
AutoProWindow
window
=
new
AutoProWindow
(
model
);
//
AutoProWindow window = new AutoProWindow(model);
window
.
setLocationRelativeTo
(
null
);
//
window.setLocationRelativeTo(null);
window
.
setVisible
(
true
);
//
window.setVisible(true);
}
}
public
void
setCurrentModel
(
CityDoctorModel
model
)
{
public
void
setCurrentModel
(
CityDoctorModel
model
)
{
...
...
CityDoctorParent/Extensions/CityDoctorHealerGUI/src/main/java/de/hft/stuttgart/citydoctor2/healer/gui/HealerToolbar.java
View file @
664abca9
...
@@ -74,6 +74,7 @@ public class HealerToolbar {
...
@@ -74,6 +74,7 @@ public class HealerToolbar {
saveBtn
.
setDisable
(
true
);
saveBtn
.
setDisable
(
true
);
saveImage
.
setImage
(
new
Image
(
MainWindow
.
class
.
getResourceAsStream
(
"icons/save.png"
)));
saveImage
.
setImage
(
new
Image
(
MainWindow
.
class
.
getResourceAsStream
(
"icons/save.png"
)));
simplyBtn
.
setOnAction
(
ae
->
controller
.
showSimplyfication
());
simplyBtn
.
setOnAction
(
ae
->
controller
.
showSimplyfication
());
simplyBtn
.
setDisable
(
true
);
}
}
public
HBox
getToolBar
()
{
public
HBox
getToolBar
()
{
...
...
CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/main/java/de/hft/stuttgart/citydoctor2/healer/genetic/gui/GeneticsGUI.java
View file @
664abca9
...
@@ -329,7 +329,7 @@ public class GeneticsGUI extends View {
...
@@ -329,7 +329,7 @@ public class GeneticsGUI extends View {
parserConfig
);
parserConfig
);
currentChecker
=
new
Checker
(
model1
);
currentChecker
=
new
Checker
(
model1
);
currentChecker
.
runChecks
();
currentChecker
.
runChecks
();
Building
building
=
model1
.
getBuildings
().
toLi
st
().
get
First
();
Building
building
=
model1
.
getBuildings
().
findFir
st
().
get
();
currentGeometry
=
building
.
getGeometries
().
get
(
0
);
currentGeometry
=
building
.
getGeometries
().
get
(
0
);
currentFeature
=
building
;
currentFeature
=
building
;
showCurrentGeometry
();
showCurrentGeometry
();
...
...
CityDoctorParent/pom.xml
View file @
664abca9
...
@@ -285,7 +285,6 @@
...
@@ -285,7 +285,6 @@
<dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-slf4j18-impl
</artifactId>
<artifactId>
log4j-slf4j18-impl
</artifactId>
<version>
2.18.0
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
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