From 2b3fc57150f16cd0bd6bc3065d9373fee2081e06 Mon Sep 17 00:00:00 2001
From: Harald Wolff <haraldwolff@hwo-macbook>
Date: Thu, 25 Jun 2015 01:38:22 +0200
Subject: [PATCH] Erste Zeichnung von Objekten

---
 .classpath                                    |  1 -
 src/org/hwo/ui/netplan/JNetPlan.java          | 21 ++++++++++++-------
 .../hwo/ui/netplan/JNetPlanTestDialog.java    | 11 ++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.classpath b/.classpath
index 2ec183e..0eb4515 100644
--- a/.classpath
+++ b/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.hwo"/>
-	<classpathentry kind="lib" path="miglayout15-swing.jar" sourcepath="miglayout-src.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/org/hwo/ui/netplan/JNetPlan.java b/src/org/hwo/ui/netplan/JNetPlan.java
index de0e24e..d48693c 100644
--- a/src/org/hwo/ui/netplan/JNetPlan.java
+++ b/src/org/hwo/ui/netplan/JNetPlan.java
@@ -118,7 +118,7 @@ public class JNetPlan extends JComponent {
 	
 	@Override
 	public void paint(Graphics _g) {
-		Graphics2D g = (Graphics2D)_g;
+ 		Graphics2D g = (Graphics2D)_g;
 		
 		int n;
 		
@@ -149,12 +149,19 @@ public class JNetPlan extends JComponent {
 		}
 		
 		for (INetPlanObject object: netPlanObjects){
+			int pos = 2 + (object.getStartTime().getDate().daysAfter(firstDate) * dayColumnWidth);
+			int width = (object.getEndTime().getDate().daysAfter(object.getStartTime().getDate()) * dayColumnWidth) + dayColumnWidth - 4;
 			
-			
-			
-			g.setColor(Color.RED);
-			//g.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
-			
+			for (INetPlanResource res: object.getResources()){
+				int vpos = 6 + (netPlanResources.indexOf(res) * lineHeight);
+				g.setColor(Color.RED);
+				g.fillRoundRect(pos, vpos, width, lineHeight - 4, 8, 8);
+				g.drawRoundRect(pos, vpos, width, lineHeight - 4, 8, 8);
+				g.setColor(Color.WHITE);
+				g.drawString(object.getShortLabel(), pos + 4, vpos + lineHeight - 8);
+				
+				//System.err.println(String.format("[%d/%d] [%d/%d]",pos,vpos,width,lineHeight - 4));
+			}			
 		}
 		
 		
@@ -169,7 +176,7 @@ public class JNetPlan extends JComponent {
 		FontMetrics fm = getFontMetrics(getFont());
 		
 		//lineHeight = (int)(getFont().getSize2D()*72) + 4;
-		lineHeight = getFont().getSize() + 4;
+		lineHeight = getFont().getSize() + 8;
 		
 		resourceBaseHeight = lineHeight * 3;
 		
diff --git a/src/org/hwo/ui/netplan/JNetPlanTestDialog.java b/src/org/hwo/ui/netplan/JNetPlanTestDialog.java
index 72e478d..5dacc4a 100644
--- a/src/org/hwo/ui/netplan/JNetPlanTestDialog.java
+++ b/src/org/hwo/ui/netplan/JNetPlanTestDialog.java
@@ -61,7 +61,7 @@ public class JNetPlanTestDialog extends JDialog {
 			{
 				netPlan = new JNetPlan();
 				netPlan.setDays(45);
-				netPlan.setFont(new Font("Courier 10 Pitch", Font.PLAIN, 12));
+				netPlan.setFont(new Font("DejaVu Sans", Font.PLAIN, 16));
 				netPlan.setBackground(Color.WHITE);
 				scrollPane.setViewportView(netPlan);
 			}
@@ -95,8 +95,6 @@ public class JNetPlanTestDialog extends JDialog {
 	private void initialize(){
 		for (int i=0;i<10;i++){
 			BaseNetPlanResource res = new BaseNetPlanResource(String.format("Resource %d",i), "-");
-			if (i == 3)
-				res.setMaxParallelUsage(2);
 			netPlan.addNetPlanResource(res);
 		}
 		
@@ -104,12 +102,17 @@ public class JNetPlanTestDialog extends JDialog {
 		
 		d.addDays(3);
 		
+		Date d2 = new Date(d);
+		d2.addDays(4);
+		
 		BaseNetPlanObject o = new BaseNetPlanObject();
 		o.setStartTime(new DateTime(d, new TimeOfDay()));
-		o.setEndTime(new DateTime(d, TimeOfDay.beforeMidnight()));
+		o.setEndTime(new DateTime(d2, TimeOfDay.beforeMidnight()));
 		
 		o.setShortLabel("Eine Aufgabe");
+		o.addResource(netPlan.getNetPlanResources()[0]);
 		o.addResource(netPlan.getNetPlanResources()[3]);
+		o.addResource(netPlan.getNetPlanResources()[7]);
 		
 		netPlan.addNetPlanObject(o);