SELFOMAT/Application
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

*** MAYBE NOT WORKING ***

Browse Source 
Added Hostname for Booth identification while Upload

Removed Date Structure inside Images Folder
--> CHECK IN BACKUP IF FILES GET OVERWRITTEN

Changed Event date structure with upload Date structure in upload
--> ALSO TESTING NECCESSARY

Changed Splash Screen JPG for Logo PNG in Capture and Picture Panels
--> Testing
This commit is contained in:
Simon Gehrig
2016-12-12 21:07:55 +01:00
parent c459938a9a
commit c3db9d0166
15 changed files with 98 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/GUI/PictureCtl.java
+22 -6
View File
@@ -10,7 +10,7 @@ import javafx.scene.image.ImageView;
import javafx.scene.input.MouseEvent;
import javafx.scene.input.TouchEvent;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import model.SOMEvent;
import model.SOMImage;
import model.SOMLayout;
@@ -23,7 +23,7 @@ import java.util.List;
*/
public class PictureCtl {
@FXML
public Pane pane;
public StackPane pane;
@FXML
public GridPane grid;
@@ -55,7 +55,7 @@ public class PictureCtl {
private void setPane() {
pane.setPrefSize(SOMLayout.screenWidth, SOMLayout.screenHeight);
pane.setBackground(SOMLayout.WHITE_BG);
pane.setBackground(SOMLayout.BLACK_BG);
}
private void setGrid() {
@@ -240,15 +240,31 @@ public class PictureCtl {
}
private void setImage() {
// // Set the image aspect ratio to be preserved
// image.setPreserveRatio(true);
//
// // Set the image to the image View
// Image splash = SOMLayout.LOGO_IMAGE;
// image.setImage(splash);
//
// // make it fit the height of the Screen
// image.setFitWidth(SOMLayout.screenHeight/2);
// Set the image aspect ratio to be preserved
image.setPreserveRatio(true);
// Set the image to the image View
Image splash = SOMLayout.SPLASH_IMAGE;
image.setImage(splash);
image.setImage(SOMLayout.LOGO_IMAGE);
// make it fit the height of the Screen
image.setFitHeight(SOMLayout.screenHeight);
image.setFitWidth(SOMLayout.screenHeight / 2);
// Calculate the offset to center it horizontally if the image is wider than the screen (or narrower)
double aspect = image.getImage().getWidth() / image.getImage().getHeight();
double scaledWidth = aspect * SOMLayout.screenHeight;
double offset = (scaledWidth - SOMLayout.screenWidth) / 2;
image.setX(-offset);
// Get the Event Images
List<SOMImage> somImageList = SOMEvent.getInstance().getImages();