|
@@ -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);
|
|
|
}
|
|
|
}
|