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
3bb33aa5
Commit
3bb33aa5
authored
4 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Feat: Add zipButton to GUI
parent
04e0792e
master
dev
dev_cpp_code_conversion
dev_gui_features_zip_loading
dev_visitor_rework
test-environment
3.17.2
3.17.1
3.17.0
archive/dev_visitor_rework
archive/dev_gui_features_zip_loading
2 merge requests
!28
Version 3.17.0 Release
,
!26
Add ZIP-archive support
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java
+19
-0
...in/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java
+1
-0
...java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java
CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
+12
-3
...sources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/icons/zip.png
+0
-0
.../resources/de/hft/stuttgart/citydoctor2/gui/icons/zip.png
with
32 additions
and
3 deletions
+32
-3
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java
+
19
-
0
View file @
3bb33aa5
...
...
@@ -85,6 +85,12 @@ public class MainToolBar {
@FXML
private
ImageView
lod4View
;
@FXML
private
Button
zipBtn
;
@FXML
private
ImageView
zipView
;
@FXML
private
Button
aboutBtn
;
...
...
@@ -147,6 +153,7 @@ public class MainToolBar {
setupReportButton
();
setupResetCameraButton
();
setupHideRoofButton
();
setupZipButton
();
loadImages
();
gridButton
.
setOnAction
(
ae
->
renderer
.
showWireFrame
(
gridButton
.
isSelected
()));
...
...
@@ -225,6 +232,10 @@ public class MainToolBar {
Image
img
=
new
Image
(
inStream
);
hideRoofView
.
setImage
(
img
);
}
try
(
InputStream
inStream
=
MainWindow
.
class
.
getResourceAsStream
(
"icons/zip.png"
))
{
Image
img
=
new
Image
(
inStream
);
zipView
.
setImage
(
img
);
}
}
catch
(
IOException
e
)
{
// ignore close exception
}
...
...
@@ -336,6 +347,14 @@ public class MainToolBar {
}
private
void
setupZipButton
()
{
zipBtn
.
setDisable
(
true
);
zipBtn
.
setTooltip
(
new
Tooltip
(
Localization
.
getText
(
"MainToolBar.zip"
)));
zipBtn
.
setOnAction
(
ae
->
{
//TODO: Implement Zipfile viewer
});
}
public
Button
getCheckButton
()
{
return
checkBtn
;
}
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java
+
1
-
0
View file @
3bb33aa5
...
...
@@ -121,6 +121,7 @@ public class OpenFileDialog {
fc
=
new
FileChooser
();
fc
.
setTitle
(
Localization
.
getText
(
"OpenFileDialog.select"
));
fc
.
getExtensionFilters
().
add
(
new
ExtensionFilter
(
"GML/XML"
,
"*.gml"
,
"*.xml"
));
fc
.
getExtensionFilters
().
add
(
new
ExtensionFilter
(
"ZIP"
,
"*.zip"
));
fc
.
getExtensionFilters
().
add
(
new
ExtensionFilter
(
Localization
.
getText
(
"MainWindow.all"
),
"*.*"
));
}
File
dir
=
new
File
(
Settings
.
get
(
Settings
.
LAST_OPEN_FOLDER
,
""
));
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
+
12
-
3
View file @
3bb33aa5
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.ToggleButton?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.HBox?>
<HBox
maxHeight=
"1.7976931348623157E308"
maxWidth=
"1.7976931348623157E308"
spacing=
"5.0"
xmlns=
"http://javafx.com/javafx/22"
xmlns:fx=
"http://javafx.com/fxml/1"
>
<children>
<HBox
spacing=
"5.0"
HBox.hgrow=
"NEVER"
>
...
...
@@ -75,6 +78,12 @@
</HBox>
<HBox
fx:id=
"spacer"
alignment=
"TOP_RIGHT"
maxHeight=
"1.7976931348623157E308"
maxWidth=
"1.7976931348623157E308"
spacing=
"5.0"
HBox.hgrow=
"ALWAYS"
>
<children>
<Button
id=
"loadBtn"
fx:id=
"zipBtn"
disable=
"true"
mnemonicParsing=
"false"
>
<graphic>
<ImageView
fx:id=
"zipView"
fitHeight=
"32.0"
fitWidth=
"32.0"
pickOnBounds=
"true"
preserveRatio=
"true"
/>
</graphic>
</Button>
<Separator
orientation=
"VERTICAL"
/>
<Button
id=
"loadBtn"
fx:id=
"saveBtn"
disable=
"true"
mnemonicParsing=
"false"
>
<graphic>
<ImageView
fx:id=
"saveView"
fitHeight=
"32.0"
fitWidth=
"32.0"
pickOnBounds=
"true"
preserveRatio=
"true"
/>
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/icons/zip.png
0 → 100644
+
0
-
0
View file @
3bb33aa5
18.2 KB
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