From d70c2feedbf0a8c896fd6cf4e905551dc880dbd9 Mon Sep 17 00:00:00 2001 From: Georg-Notebook Date: Sun, 6 Jun 2021 14:13:11 +0200 Subject: [PATCH] =?UTF-8?q?Map=20Path=20update=20f=C3=BCr=20Abgabe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- src/tourplaner/business/TourPlaner.java | 1 + src/tourplaner/viewmodels/ViewModel.java | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 791f8ec..414031b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ log/ reports/ .idea/dataSources* doxygendoc/ -javadoc/ \ No newline at end of file +javadoc/ +TourplanerImages/ diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index a915317..eea4d29 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -102,6 +102,7 @@ public class TourPlaner{ * @return Path zu dem Bild für die GUI */ public static String getImagePath(String tourname){ + System.out.println(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg"); return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg"; } diff --git a/src/tourplaner/viewmodels/ViewModel.java b/src/tourplaner/viewmodels/ViewModel.java index 6843037..60b8993 100644 --- a/src/tourplaner/viewmodels/ViewModel.java +++ b/src/tourplaner/viewmodels/ViewModel.java @@ -11,6 +11,7 @@ import tourplaner.object.Tour; import tourplaner.ui.ProgressBar; import java.awt.*; +import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -33,7 +34,9 @@ public class ViewModel { public Image getImage(String tourname){ - return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname)); + System.out.println(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + new File(TourPlaner.getImagePath(tourname)).getAbsolutePath()); + return new Image(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + new File(TourPlaner.getImagePath(tourname)).getAbsolutePath()); +// return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname)); } /**