Browse Source

no message

Edgardo Palza 8 năm trước cách đây
mục cha
commit
3070892c55
2 tập tin đã thay đổi với 13 bổ sung14 xóa
  1. 10 10
      src/ui/view/GUI.java
  2. 3 4
      src/ui/view/MyCanvas.java

+ 10 - 10
src/ui/view/GUI.java

@@ -421,6 +421,7 @@ public class GUI<E> implements CategoryListener {
 		tableHolonElement.addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
 				HolonObject obj = (HolonObject) getActualCps();
+				
 				yValueElements = e.getY();
 				HolonElement ele = getActualHolonElement(obj, yValueElements);
 				if (e.isControlDown() && ele != null) {
@@ -452,13 +453,13 @@ public class GUI<E> implements CategoryListener {
 					selectedElements.clear();
 					holonEleNamesDisplayed = "None ";
 				}
-				for (int i = 0; i < selectedElements.size(); i++) {
-					if (i == 0) {
-						System.out.println("Selected Items: " + selectedElements.get(i).getEleName());
-					} else {
-						System.out.println(selectedElements.get(i).getEleName());
-					}
-				}
+//				for (int i = 0; i < selectedElements.size(); i++) {
+//					if (i == 0) {
+//						System.out.println("Selected Items: " + selectedElements.get(i).getEleName());
+//					} else {
+//						System.out.println(selectedElements.get(i).getEleName());
+//					}
+//				}
 				elementGraph.setText(holonEleNamesDisplayed);
 				yBTHIS = e.getY();
 				xBTHIS = e.getX();
@@ -790,7 +791,6 @@ public class GUI<E> implements CategoryListener {
 				// Update of the Information about the Properties - only for
 				// CpsObjects
 				// Erase old data
-				System.out.println(model.getSelectedCpsObjects());
 				if (tableModelProperties.getRowCount() > 0) {
 					for (int i = tableModelProperties.getRowCount() - 1; i > -1; i--) {
 						tableModelProperties.removeRow(i);
@@ -1244,7 +1244,6 @@ public class GUI<E> implements CategoryListener {
 		// HolonObjects
 
 		deleteRows();
-		System.out.println(model.getSelectedCpsObjects());
 		if (model.getSelectedCpsObjects() != null) {
 			fillElementTable(model.getSelectedCpsObjects());
 		}
@@ -1273,7 +1272,8 @@ public class GUI<E> implements CategoryListener {
 		for (CpsObject o : objects) {
 			if (o instanceof HolonObject) {
 				for (HolonElement he : ((HolonObject) o).getElements()) {
-					Object[] temp = { o.getName(), he.getEleName(), he.getEnergy(), he.getAmount(), he.getActive() };
+					Object[] temp = { o.getName() + ", " + o.getID(), he.getEleName(), he.getEnergy(), he.getAmount(),
+							he.getActive() };
 					tableModelHolonElement.addRow(temp);
 				}
 			}

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

@@ -349,7 +349,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				controller.addSelectedObject(tempCps);
 			}
 		}
-		System.out.println("test");
 		if (dragging) {
 			try {
 				dragged = true;
@@ -390,7 +389,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							x = 0;
 						else if (x > this.getWidth() - controller.getScale())
 							x = this.getWidth() - controller.getScale();
-						if (y <=0)
+						if (y <= 0)
 							y = 0;
 						else if (y > this.getHeight() - controller.getScale())
 							y = this.getHeight() - controller.getScale();
@@ -405,7 +404,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		}
 
 		// Mark Objects
-		if (doMark){
+		if (doMark) {
 			for (CpsObject cps : model.getObjectsOnCanvas()) {
 				int x1 = sx, x2 = x, y1 = sy, y2 = y;
 
@@ -552,7 +551,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			e = new CpsEdge(n, tempCps, edgeCapacity);
 
 			controller.AddEdgeOnCanvas(e);
-			System.out.println("node ID: " + n.getID());
+//			System.out.println("node ID: " + n.getID());
 		}
 
 		// Wenn ein Node ohne Connections da ist