Compare commits

..

7 Commits

Author SHA1 Message Date
9fe6f34ba3 Kleine Map für Report 2021-04-15 23:24:31 +02:00
3f60d618ff Static map -> Tour edit, del 2021-04-15 22:59:38 +02:00
39c4244668 Get Static Map -> Img speichern, öffnen, anzeigen, get von mapquest 2021-04-15 22:30:26 +02:00
34aa390f2c Merge branch 'reporter' 2021-04-15 19:28:29 +02:00
0e81b6ca24 Add itext 2021-04-15 19:27:01 +02:00
6cd6798609 Gitignore Log 2021-04-15 19:24:22 +02:00
be2bb0c6fa Report mit iText 4 2021-04-15 19:22:22 +02:00
16 changed files with 509 additions and 47 deletions

View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="iText-4.2.0-com.itextpdf">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/iText-4.2.0-com.itextpdf.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -10,7 +10,7 @@
<orderEntry type="library" name="lib" level="project" /> <orderEntry type="library" name="lib" level="project" />
<orderEntry type="library" name="org.ini4j:ini4j:0.5.4" level="project" /> <orderEntry type="library" name="org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" name="log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="org.apache.pdfbox:pdfbox:1.8.9" level="project" />
<orderEntry type="library" name="org.postgresql:postgresql:42.2.19" level="project" /> <orderEntry type="library" name="org.postgresql:postgresql:42.2.19" level="project" />
<orderEntry type="library" name="iText-4.2.0-com.itextpdf" level="project" />
</component> </component>
</module> </module>

View File

@ -20,3 +20,10 @@ path = ./reports/
gitrepo = https://git.dergeorg.at/dergeorg/tourplaner gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
javadoc = https://git.dergeorg.at/dergeorg/tourplaner javadoc = https://git.dergeorg.at/dergeorg/tourplaner
[map]
key =
size = 1500,400
sizePdf = 600,400
path = D:\\TourplanerImages\\
file_pre = file:///

Binary file not shown.

View File

@ -0,0 +1,51 @@
package tourplaner.business;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage;
import java.io.File;
import java.io.IOException;
public class DirectionMap {
private double dauer, strecke;
private String start, end, tourname, file, filepdf;
private Image map, mappdf;
/**
* Holt die Map als image und alle Daten zur berechneten Route
*
* @param start Startpunkt
* @param ende Endpunkt
* @param tourname Name der Aktuellen Tour
* @throws IOException Fehler beim Image der Map
*/
public DirectionMap (String start, String ende, String tourname) throws IOException {
this.map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
this.mappdf = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
this.start = start;
this.end = ende;
this.tourname = tourname;
this.file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + ".jpg";
this.filepdf = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + "_pdf.jpg";
FileHelper.saveImage(this.map, "jpg", new File(this.file));
FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf));
FileHelper.openDefault(file);
}
/**
* Downloadet die Map von Mapquest
* @param start Startpunkt
* @param ende Endpunkt
* @return Image von der Map
* @throws IOException Fehler beim Get der Map
*/
private Image getMap(String start, String ende, String size) throws IOException {
return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?start="+start+"&end="+ende+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
}
}

View File

@ -0,0 +1,62 @@
package tourplaner.business;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
public class FileHelper {
/**
* Öffnet ein File mit dem Standart Program
* @param f File Path als string
*/
public static void openDefault(String f){
// A reference to a text file
File file = new File(f);
try {
Desktop desktop = Desktop.getDesktop();
// Open a file using the default program for the file type. In the example
// we will launch a default registered program to open a text file. For
// example on Windows operating system this call might launch a notepad.exe
// to open the file.
desktop.open(file);
} catch (IOException e) {
e.printStackTrace();
}
}
/**
* Speichert ein Image
* @param img Das zu speichernde Bild
* @param type Dateityp z.b. jpg
* @param file Wo die datei zu speichern ist
* @throws IOException
*/
public static void saveImage(Image img, String type, File file) throws IOException {
ImageIO.write(ImgHelper.toBufferedImage(img), type, file);
}
/**
* Holt ein image von einem File
* @param file File mit dem image
* @return Das buffered image
* @throws IOException Fehler beim öffnen des bildes
*/
public static BufferedImage getImage(File file) throws IOException {
return ImageIO.read(file);
}
/**
* Löscht ein File
* @param file File das zu löschen ist
* @return false bei error
*/
public static boolean delFile(File file){
return file.delete();
}
}

View File

@ -0,0 +1,23 @@
package tourplaner.business;
import javax.imageio.ImageIO;
import java.awt.*;
import java.io.IOException;
import java.net.URL;
/**
* Http Hilfsfunktionen
*/
public class HttpHelper {
/**
* Holt ein Image von gegebener URL
* @param url Url als Sting
* @return Image von der Url
* @throws IOException Fehler beim Bild holen
*/
public static Image httpGetImage(String url) throws IOException {
URL urls = new URL(url);
return ImageIO.read(urls);
}
}

View File

@ -0,0 +1,35 @@
package tourplaner.business;
import java.awt.*;
import java.awt.image.BufferedImage;
/**
* Image Hilfsfunktionen
*/
public class ImgHelper {
/**
* Converts a given Image into a BufferedImage
*
* @param img The Image to be converted
* @return The converted BufferedImage
*/
public static BufferedImage toBufferedImage(Image img)
{
if (img instanceof BufferedImage)
{
return (BufferedImage) img;
}
// Create a buffered image with transparency
BufferedImage bimage = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_ARGB);
// Draw the image on to the buffered image
Graphics2D bGr = bimage.createGraphics();
bGr.drawImage(img, 0, 0, null);
bGr.dispose();
// Return the buffered image
return bimage;
}
}

View File

@ -33,6 +33,14 @@ public class LogHelper{
getLog(name).error(msg); getLog(name).error(msg);
} }
/**
* Log info in file und Console
* @param e Exception
*/
public static void error(Exception e){
getLog(e.getClass().getName()).error(e.getMessage());
}
/** /**
* Log info in file und Console * Log info in file und Console
* @param msg Nachricht in dem Log * @param msg Nachricht in dem Log

View File

@ -1,34 +1,223 @@
package tourplaner.business; package tourplaner.business;
import org.apache.pdfbox.exceptions.COSVisitorException; import com.itextpdf.text.*;
import org.apache.pdfbox.pdmodel.PDDocument; import com.itextpdf.text.Font;
import org.apache.pdfbox.pdmodel.PDPage; import com.itextpdf.text.Image;
import org.apache.pdfbox.pdmodel.edit.PDPageContentStream; import com.sun.scenario.effect.ImageData;
import org.apache.pdfbox.pdmodel.font.PDFont; import tourplaner.object.Log;
import org.apache.pdfbox.pdmodel.font.PDType1Font; import tourplaner.object.Tour;
import com.itextpdf.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfWriter;
import java.awt.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
/**
* https://github.com/ymasory/iText-4.2.0
*/
public class Reporter { public class Reporter {
public static void createTourReport(String tourname) throws IOException, COSVisitorException { private static Font catFont = new Font(Font.TIMES_ROMAN, 18,
PDDocument document = new PDDocument(); Font.BOLD);
PDPage page = new PDPage(); private static Font redFont = new Font(Font.TIMES_ROMAN, 12,
document.addPage(page); Font.NORMAL, Color.RED);
private static Font subFont = new Font(Font.TIMES_ROMAN, 16,
Font.BOLD);
private static Font smallBold = new Font(Font.TIMES_ROMAN, 12,
Font.BOLD);
PDFont font = PDType1Font.HELVETICA; public static void createTourReport(String tourname) {
PDPageContentStream contentStream = new PDPageContentStream(document, page); Tour tour = TourPlaner.getTour(tourname);
contentStream.beginText(); tour.setLog(TourPlaner.getLogs(tourname));
contentStream.setFont(font, 12); String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + tourname+".pdf";
contentStream.moveTextPositionByAmount(100,700); try {
contentStream.drawString(tourname); Document document = new Document();
// contentStream.drawString(); PdfWriter.getInstance(document, new FileOutputStream(file));
contentStream.endText(); document.open();
addMetaData(document, tour);
contentStream.close(); // addTitlePage(document, tour);
addContent(document, tour);
document.save(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "test.pdf"); document.close();
document.close(); } catch (DocumentException | FileNotFoundException e) {
LogHelper.error(e.getMessage(), e.getClass().getName());
}
FileHelper.openDefault(file);
} }
// iText allows to add metadata to the PDF which can be viewed in your Adobe
// Reader
// under File -> Properties
private static void addMetaData(Document document, Tour tour) {
document.addTitle("Tour Report -> " + tour.getName());
document.addSubject("Tourplaner by DerGeorg");
document.addKeywords("Tourplaner, Tour, Report");
document.addAuthor("Tourplaner");
document.addCreator("Tourplaner");
}
private static void addContent(Document document, Tour tour) throws DocumentException {
Anchor anchor = new Anchor("Tour Report von -> " + tour.getName(), catFont);
anchor.setName("Tour Report von -> " + tour.getName());
// Second parameter is the number of the chapter
Chapter catPart = new Chapter(new Paragraph(anchor), 1);
Paragraph subPara = new Paragraph("Tour", subFont);
Section subCatPart = catPart.addSection(subPara);
subCatPart.add(new Paragraph("Report erstellt von: " + System.getProperty("user.name") + ", " + new Date()));
subCatPart.add(new Paragraph("Startpunkt der Tour: " + tour.getStart()));
subCatPart.add(new Paragraph("Zielpunkt der Tour: " + tour.getZiel()));
subCatPart.add(new Paragraph("Berechnete Dauer der Tour: " + tour.getDauer()));
subCatPart.add(new Paragraph("Berechnete Strecke der Tour: " + tour.getStrecke()));
Paragraph emptyLine = new Paragraph();
addEmptyLine(emptyLine, 5);
subCatPart.add(emptyLine);
// now add all this to the document
document.add(catPart);
Image image1 = null;
try {
image1 = Image.getInstance(TourPlaner.getImagePdfPath(tour.getName()));
image1.setAlignment(Element.ALIGN_CENTER);
image1.scaleAbsolute(600, 400);
document.add(image1);
} catch (IOException e) {
LogHelper.error(e);
}
ArrayList<Log> logs = tour.getLogs();
// Second parameter is the number of the chapter
anchor = new Anchor("Logs", catFont);
anchor.setName("Logs");
catPart = new Chapter(new Paragraph(anchor), 2);
catPart.add(new Paragraph("Anzahl der Logeinträge: " + logs.size()));
for (Log log: logs) {
subPara = new Paragraph("Log vom: " + log.getDatum() , subFont);
subCatPart = catPart.addSection(subPara);
subCatPart.add(new Paragraph("Dauer: " + log.getDauer()));
subCatPart.add(new Paragraph("Davon Pause: " + log.getPause()));
subCatPart.add(new Paragraph("Davon gegangen: " + log.getGegangen()));
subCatPart.add(new Paragraph("Berechnete Durchschnittliche Geschwindigkeit: " + log.getAvgspeed()));
subCatPart.add(new Paragraph("Entfernung: " + log.getStrecke()));
subCatPart.add(new Paragraph("Höhenmeter: " + log.getHightmeter()));
subCatPart.add(new Paragraph("Bemerkung: " + log.getBemerkung()));
}
// now add all this to the document
document.add(catPart);
}
private static void createTable(Section subCatPart)
throws BadElementException {
PdfPTable table = new PdfPTable(5);
// t.setBorderColor(BaseColor.GRAY);
// t.setPadding(4);
// t.setSpacing(4);
// t.setBorderWidth(1);
PdfPCell c1 = new PdfPCell(new Phrase("NR"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Datum"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Entfernung"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Höhenmeter"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("AVG Geschwindigkeit"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
table.setHeaderRows(1);
table.addCell("1.0");
table.addCell("1.1");
table.addCell("1.2");
table.addCell("1.3");
table.addCell("1.4");
table.addCell("1.5");
table.addCell("2.0");
table.addCell("2.1");
table.addCell("2.2");
table.addCell("2.3");
table.addCell("2.4");
table.addCell("2.5");
subCatPart.add(table);
}
private static void createTable2(Section subCatPart)
throws BadElementException {
PdfPTable table = new PdfPTable(5);
// t.setBorderColor(BaseColor.GRAY);
// t.setPadding(4);
// t.setSpacing(4);
// t.setBorderWidth(1);
PdfPCell c1 = new PdfPCell(new Phrase("NR"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Dauer"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Davon Gegangen"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Davon Pause"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
c1 = new PdfPCell(new Phrase("Bemerkung"));
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(c1);
table.setHeaderRows(1);
table.addCell("1.0");
table.addCell("1.1");
table.addCell("1.2");
table.addCell("1.3");
table.addCell("1.4");
table.addCell("1.5");
table.addCell("2.0");
table.addCell("2.1");
table.addCell("2.2");
table.addCell("2.3");
table.addCell("2.4");
table.addCell("2.5");
subCatPart.add(table);
}
private static void addEmptyLine(Paragraph paragraph, int number) {
for (int i = 0; i < number; i++) {
paragraph.add(new Paragraph(" "));
}
}
} }

View File

@ -1,12 +1,12 @@
package tourplaner.business; package tourplaner.business;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.pdfbox.exceptions.COSVisitorException;
import tourplaner.data.DbConnect; import tourplaner.data.DbConnect;
import tourplaner.data.PostgresHelper;
import tourplaner.object.Log; import tourplaner.object.Log;
import tourplaner.object.Tour; import tourplaner.object.Tour;
import java.awt.*;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -37,36 +37,54 @@ public class TourPlaner{
* @param tour Neuer Tourname * @param tour Neuer Tourname
* @return false bei error * @return false bei error
*/ */
public static boolean editTour(String oldname, Tour tour){ public static boolean editTour(String oldname, Tour tour) throws IOException {
FileHelper.delFile(new File(getImagePath(oldname)));
FileHelper.delFile(new File(getImagePdfPath(oldname)));
new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
return new DbConnect().editTour(oldname, tour); return new DbConnect().editTour(oldname, tour);
} }
public static boolean delTour(String tourname){ public static boolean delTour(String tourname){
FileHelper.delFile(new File(getImagePath(tourname)));
FileHelper.delFile(new File(getImagePdfPath(tourname)));
return new DbConnect().delTour(tourname); return new DbConnect().delTour(tourname);
} }
/** /**
* Fügt eine Tour hinzu * Fügt eine Tour hinzu
* @param newTour Neue Tour * @param newTour Neue Tour
* @return false bei error * @return false bei error
*/ */
public static boolean addTour(Tour newTour){ public static boolean addTour(Tour newTour) throws IOException {
new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
return new DbConnect().addTour(newTour); return new DbConnect().addTour(newTour);
} }
public static Image getImage(String tourname) throws IOException {
return FileHelper.getImage(new File(getImagePath(tourname)));
}
public static String getImagePath(String tourname){
return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
}
public static String getImagePdfPath(String tourname){
return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg";
}
public static void openImage(String tourname){
FileHelper.openDefault(getImagePath(tourname));
}
public static ArrayList<Log> getLogs(String tourname){ public static ArrayList<Log> getLogs(String tourname){
return new DbConnect().getLogs(tourname); return new DbConnect().getLogs(tourname);
} }
public static void doReport(String tourname){ public static void doReport(String tourname){
try { Reporter.createTourReport(tourname);
Reporter.createTourReport(tourname); }
} catch (IOException e) {
LogHelper.error(e.getMessage(), e.getClass().getName()); public static Tour getTour(String tourname){
} catch (COSVisitorException e) { return new DbConnect().getTour(tourname);
LogHelper.error(e.getMessage(), e.getClass().getName());
}
} }
public static boolean addLog(String tourname, Log log){ public static boolean addLog(String tourname, Log log){

View File

@ -180,4 +180,41 @@ public class DbConnect {
} }
} }
/**
* Holt eine Tour aus der Datenbank
* @param tn Tourname
* @return Null bei fehler, sonst eine List aus den IDs
*/
public Tour getTour(String tn){
this.c = PostgresHelper.con();
String tourname, mapjson, start, ziel;
double dauer, strecke;
Tour touren = null;
try {
stmt = this.c.createStatement();
ResultSet rs = stmt.executeQuery("select * from tour where tourname = '"+tn+"';");
while (rs.next()) {
tourname = rs.getString("tourname");
mapjson = rs.getString("mapjson");
start = rs.getString("start");
ziel = rs.getString("ziel");
dauer = rs.getDouble("dauer");
strecke = rs.getDouble("strecke");
if (!tourname.isEmpty()) {
touren = new Tour(tourname, dauer + "", mapjson, strecke, start, ziel);
}else {
return null;
}
}
rs.close();
stmt.close();
this.c.close();
return touren;
} catch (Exception e) {
System.err.println(e.getClass().getName() + ": " + e.getMessage());
return null;
}
}
} }

View File

@ -31,6 +31,10 @@ public class Tour {
this.log = tour.getLogs(); this.log = tour.getLogs();
} }
public void setLog(ArrayList<Log> log) {
this.log = log;
}
/** /**
* Holt einen einzigen Log Eintrag anhand der Id * Holt einen einzigen Log Eintrag anhand der Id
* @param id Id des Eintrags der zu besorgen ist * @param id Id des Eintrags der zu besorgen ist

View File

@ -34,6 +34,7 @@
<?import javafx.geometry.*?> <?import javafx.geometry.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.paint.*?> <?import javafx.scene.paint.*?>
<?import javafx.scene.text.*?> <?import javafx.scene.text.*?>
@ -112,10 +113,11 @@
<children> <children>
<TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0"> <TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
<tabs> <tabs>
<Tab fx:id="kartenTab" text="Karte"> <Tab fx:id="kartenTab" text="Karte">
<content> <AnchorPane>
<AnchorPane /> <ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</content></Tab> </AnchorPane>
</Tab>
<Tab fx:id="beschreibungTab" text="Beschreibung"> <Tab fx:id="beschreibungTab" text="Beschreibung">
<content> <content>
<AnchorPane> <AnchorPane>

View File

@ -8,6 +8,7 @@ import javafx.scene.control.*;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.image.ImageView;
import javafx.scene.input.MouseEvent; import javafx.scene.input.MouseEvent;
import tourplaner.business.ConfigHelper; import tourplaner.business.ConfigHelper;
import tourplaner.business.LogHelper; import tourplaner.business.LogHelper;
@ -37,6 +38,7 @@ public class TourplanerController implements Initializable {
public TableView<Tour> beschreibungTableView; public TableView<Tour> beschreibungTableView;
public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol; public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
public TextField titleTextView, sucheInput; public TextField titleTextView, sucheInput;
public ImageView mapImageView;
//Log -> rechts unten //Log -> rechts unten
public TableView<Log> logTableView; public TableView<Log> logTableView;
public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol; public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
@ -49,7 +51,11 @@ public class TourplanerController implements Initializable {
@FXML @FXML
private void editTourBtn(){ private void editTourBtn(){
this.viewModel.editTour(); try {
this.viewModel.editTour();
} catch (IOException e) {
LogHelper.error(e);
}
syncTour(this.viewModel.getSelectedTour().getName()); syncTour(this.viewModel.getSelectedTour().getName());
} }
@ -88,6 +94,7 @@ public class TourplanerController implements Initializable {
private void syncTour(String selectedItem){ private void syncTour(String selectedItem){
beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem)); beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
mapImageView.setImage(this.viewModel.getImage(selectedItem));
} }
private void syncTourNamen(){ private void syncTourNamen(){
@ -129,6 +136,7 @@ public class TourplanerController implements Initializable {
logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen")); logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung")); logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
} }
/** /**
@ -147,6 +155,7 @@ public class TourplanerController implements Initializable {
@FXML @FXML
private void addTour(){ private void addTour(){
this.viewModel.addTour(); this.viewModel.addTour();
this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
} }
/** /**
@ -159,6 +168,7 @@ public class TourplanerController implements Initializable {
this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected")); this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
this.viewModel.delTour(); this.viewModel.delTour();
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected"))); logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
mapImageView.setImage(null);
} }
/** /**

View File

@ -2,10 +2,8 @@ package tourplaner.viewmodels;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import org.apache.pdfbox.exceptions.COSVisitorException; import javafx.scene.image.Image;
import tourplaner.business.Reporter;
import tourplaner.business.TourPlaner; import tourplaner.business.TourPlaner;
import tourplaner.data.DbConnect;
import tourplaner.ui.AlertHelper; import tourplaner.ui.AlertHelper;
import tourplaner.business.ConfigHelper; import tourplaner.business.ConfigHelper;
import tourplaner.business.LogHelper; import tourplaner.business.LogHelper;
@ -34,11 +32,15 @@ public class ViewModel {
public Image getImage(String tourname){
return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname));
}
/** /**
* Bearbeitet eine bereits bestehende Tour * Bearbeitet eine bereits bestehende Tour
* prüft ob eine tour ausgewählt ist * prüft ob eine tour ausgewählt ist
*/ */
public void editTour(){ public void editTour() throws IOException {
if (this.selectedTour == null){ if (this.selectedTour == null){
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
ConfigHelper.getLangIniString("keinetourselected"), ConfigHelper.getLangIniString("keinetourselected"),
@ -158,7 +160,12 @@ public class ViewModel {
Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel); Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
tourData.add(newTour); tourData.add(newTour);
tourNamen.add(this.neueTourName); tourNamen.add(this.neueTourName);
TourPlaner.addTour(newTour); this.selectedTour = newTour;
try {
TourPlaner.addTour(newTour);
} catch (IOException e) {
e.printStackTrace();
}
} }
this.neueTourStart = null; this.neueTourStart = null;
this.neueTourZiel = null; this.neueTourZiel = null;