Bladeren bron

border color kann jetzt ausgeschaltet werden

dominik.rieder 8 jaren geleden
bovenliggende
commit
7ffe2342f5
2 gewijzigde bestanden met toevoegingen van 22 en 11 verwijderingen
  1. 8 4
      src/ui/view/MyCanvas.java
  2. 14 7
      src/ui/view/ShowedInformationPopUp.java

+ 8 - 4
src/ui/view/MyCanvas.java

@@ -64,7 +64,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	ArrayList<HolonElement> dataSelected = new ArrayList<HolonElement>();
 	ArrayList<AbstractCpsObject> tempSelected = new ArrayList<AbstractCpsObject>();
 
-	private boolean[] showedInformation = new boolean[3];
+	private boolean[] showedInformation = new boolean[4];
 	private boolean dragging = false; // for dragging
 	private boolean dragged = false; // if an object/objects was/were dragged
 	private boolean drawEdge = false; // for drawing edges
@@ -118,6 +118,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 		showedInformation[0] = true;
 		showedInformation[1] = true;
+		showedInformation[2] = false;
 		control.setMaxCapacity(10000);
 
 		popmenu.add(itemCut);
@@ -394,10 +395,11 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				controller.addSubNetColor(new Color((int) (Math.random() * 255), (int) (Math.random() * 255),
 						(int) (Math.random() * 255)));
 			}
-
+			if(showedInformation[2]){
 			for (HolonObject cps : s.getObjects()) {
 				cps.setBorderColor(model.getSubNetColors().get(i));
 			}
+			}
 			i++;
 		}
 
@@ -501,13 +503,14 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		// Objects
 		for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
 			// Border Highlighting
+			if(showedInformation[2]){
 			g2.setColor(cps.getBorderColor());
 			if (g2.getColor() != Color.WHITE) {
 				g2.fillRect((int) (cps.getPosition().x - scalediv20 - 3), (int) (cps.getPosition().y - scalediv20 - 3),
 						(int) (controller.getScale() + ((scalediv20 + 3) * 2)),
 						(int) (controller.getScale() + ((scalediv20 + 3) * 2)));
 			}
-
+			}
 			// node image
 			if (cps instanceof CpsNode && (cps == tempCps || model.getSelectedCpsObject() == cps
 					|| model.getSelectedCpsObjects().contains(cps) || tempSelected.contains(cps))) {
@@ -997,9 +1000,10 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	 * @param object
 	 *            boolean for objects
 	 */
-	public void setShowedInformation(boolean connection, boolean object) {
+	public void setShowedInformation(boolean connection, boolean object, boolean border) {
 		showedInformation[0] = connection;
 		showedInformation[1] = object;
+		showedInformation[2] = border;
 	}
 
 	/**

+ 14 - 7
src/ui/view/ShowedInformationPopUp.java

@@ -26,6 +26,7 @@ public class ShowedInformationPopUp extends JDialog {
 	private MyCanvas canvas;
 	private JCheckBox objectEnergyCheckbox;
 	private JCheckBox connectionCheckbox;
+	private JCheckBox colorizedBorderCheckbox;
 
 	/**
 	 * Constructor.
@@ -37,7 +38,7 @@ public class ShowedInformationPopUp extends JDialog {
 		super((java.awt.Frame) null, true);
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);
 		this.setTitle(Languages.getLanguage()[31]);
-		setBounds(100, 100, 400, 169);
+		setBounds(100, 100, 400, 220);
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel, BorderLayout.CENTER);
@@ -56,11 +57,12 @@ public class ShowedInformationPopUp extends JDialog {
 		connectionCheckbox.setSelected(canvas.getShowedInformation()[0]);
 		btnOk.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
-				setInformation(connectionCheckbox.isSelected(), objectEnergyCheckbox.isSelected());
+				setInformation(connectionCheckbox.isSelected(), objectEnergyCheckbox.isSelected(),
+						colorizedBorderCheckbox.isSelected());
 				dispose();
 			}
 		});
-		btnOk.setBounds(169, 98, 82, 23);
+		btnOk.setBounds(171, 147, 82, 23);
 		contentPanel.add(btnOk);
 
 		JButton btnCancel = new JButton(Languages.getLanguage()[34]);
@@ -70,20 +72,25 @@ public class ShowedInformationPopUp extends JDialog {
 				dispose();
 			}
 		});
-		btnCancel.setBounds(70, 98, 89, 23);
+		btnCancel.setBounds(72, 147, 89, 23);
 		contentPanel.add(btnCancel);
+		
+		colorizedBorderCheckbox = new JCheckBox("Show colorized Border for Objects");
+		colorizedBorderCheckbox.setBounds(19, 96, 195, 23);
+		contentPanel.add(colorizedBorderCheckbox);
+		colorizedBorderCheckbox.setSelected(canvas.getShowedInformation()[2]);
 	}
 
 	/**
 	 * Set the Information true or false.
 	 * 
 	 * @param connection
-	 *            conecction Information
+	 *            conection Information
 	 * @param object
 	 *            Object Information
 	 */
-	private void setInformation(boolean connection, boolean object) {
-		canvas.setShowedInformation(connection, object);
+	private void setInformation(boolean connection, boolean object, boolean borders) {
+		canvas.setShowedInformation(connection, object, borders);
 		canvas.repaint();
 	}
 }