Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
d215c650
Commit
d215c650
authored
2 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Style: Show indeterminate progress for ZIP parsing
parent
f123a7ac
master
dev
dev_gui_features_zip_loading
archive/dev_gui_features_zip_loading
2 merge requests
!28
Version 3.17.0 Release
,
!26
Add ZIP-archive support
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java
+3
-3
...e/hft/stuttgart/citydoctor2/gui/CityDoctorController.java
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java
+4
-0
...java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java
with
7 additions
and
3 deletions
+7
-3
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java
+
3
-
3
View file @
d215c650
...
...
@@ -91,7 +91,7 @@ public class CityDoctorController {
mainWindow
.
resetFilterComboBox
();
});
if
(
path
.
endsWith
(
".zip"
))
{
loadCityGmlZipFile
(
path
,
numberOfRoundingPlaces
,
l
,
useValidation
,
lowMemory
);
loadCityGmlZipFile
(
path
,
numberOfRoundingPlaces
,
useValidation
,
lowMemory
);
return
;
}
currentZipEntryManager
=
null
;
...
...
@@ -153,8 +153,8 @@ public class CityDoctorController {
}
}
private
void
loadCityGmlZipFile
(
String
path
,
int
numberOfRoundingPlaces
,
ProgressListener
l
,
boolean
useValidation
,
boolean
lowMemory
)
throws
CityGmlParseException
,
InvalidGmlFileException
{
private
void
loadCityGmlZipFile
(
String
path
,
int
numberOfRoundingPlaces
,
boolean
useValidation
,
boolean
lowMemory
)
{
currentConfig
=
new
ParserConfiguration
(
numberOfRoundingPlaces
,
useValidation
,
lowMemory
);
try
{
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java
+
4
-
0
View file @
d215c650
...
...
@@ -150,8 +150,12 @@ public class OpenFileDialog {
pathField
.
setDisable
(
true
);
selectBtn
.
setDisable
(
true
);
stage
.
setOnCloseRequest
(
Event:
:
consume
);
Thread
t
=
new
Thread
(()
->
{
try
{
if
(
path
.
endsWith
(
".zip"
))
{
Platform
.
runLater
(()
->
progress
.
setProgress
(-
1
));
}
controller
.
loadCityGml
(
path
,
numberOfRoundingPlaces
,
progress:
:
setProgress
,
useValidation
,
lowMemory
);
Platform
.
runLater
(()
->
stage
.
close
());
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Explore
Projects
Groups
Snippets