Merge branch 'master' of git@git.tk.informatik.tu-darmstadt.de:andreas.meyer-berg/SmartHomeNetworkSim.git

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/MainFrame.java

@@ -13,7 +13,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
 
 /**
- * Main class of the GUI, which combines the UserInterface and visualisation of the simulation.
+ * Main class of the GUI, which combines the UserInterface and visualization of the simulation.
  *
  * @author Andreas T. Meyer-Berg
  */
@@ -48,7 +48,7 @@ public class MainFrame extends JFrame {
 		
 		setTitle("Smart Home Network Simulator");	
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		this.setIconImage(Utility.loadFile("images/SmartHomeNetworkSim_icon.jpeg"));
+		this.setIconImage(Utility.loadFile("images/smartHome_icon.png"));
 		setLayout(new FlowLayout());
 		
 		//Set initial size of the frame
@@ -59,7 +59,7 @@ public class MainFrame extends JFrame {
 		this.setMinimumSize(new Dimension(640, 480));
 		
 		/*
-		 * Add Visualisation Panel
+		 * Add Visualization Panel
 		 */
 		//Could be a more complex panel later on (TabbedPanel, ScrollPanel, SplitPanel
 		panel = new VisualisationPanel(model, control);

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationPanel.java

@@ -165,13 +165,13 @@ public class VisualisationPanel extends JPanel implements Observer {
 		/**
 		 * Angle per Link in "linkSlice degrees"
 		 */
-		int linkSlice = Math.min((int) Math.round(360.0 / numberOfLinks),90);
+		double linkSlice = Math.min(360.0 / numberOfLinks,90.0);
 		/**
 		 * Map of links to Colors and position of the Color
 		 */
 		HashMap<Link, Pair<Integer,Color>> linkColors = null;
 		/**
-		 * Dimension of the link ring
+		 * Dimension in pixels of the link ring
 		 */
 		int linkDim = 6;
 		
@@ -244,7 +244,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 					g.setColor(linkPos.getRight());
 					g.fillArc(x - config.getDeviceVisualizationRadius() - linkDim, y - config.getDeviceVisualizationRadius() - linkDim,
 							2 * config.getDeviceVisualizationRadius() - 1 + 2 * linkDim, 2 * config.getDeviceVisualizationRadius() - 1 + 2*linkDim,
-							linkPos.getLeft()*linkSlice, linkSlice);
+							(int)Math.round(linkPos.getLeft()*linkSlice), (int)Math.ceil(linkSlice));
 				}
 			
 			}

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/AboutPopUp.java

@@ -31,7 +31,7 @@ public class AboutPopUp extends JFrame {
 		this.setPreferredSize(new Dimension(500, 400));
 		setIconImage(Toolkit.getDefaultToolkit().getImage(
 				AboutPopUp.class
-						.getResource("/images/SmartHomeNetworkSim_icon.jpeg")));
+						.getResource("/images/smartHome_icon.png")));
 		setTitle("SmartHomeNetworkSim: About");
 		setFont(new Font("Roboto", Font.PLAIN, 42));
 		getContentPane().setLayout(null);

src/main/resources/images/imageSources.txt

@@ -0,0 +1 @@
+smartHome_icon.png from https://pixabay.com/en/icon-smart-home-house-technology-3317456/ under https://pixabay.com/en/service/license/