Adds dragging of multiple devices at once

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

@@ -102,7 +102,7 @@ public class VisualisationInteractor implements MouseInputListener,
 	
 	public static final byte NOTHING = 0; 
 	public static final byte RIGHTCLICK_MENU = 1; 
-	public static final byte DRAG_DEVICE = 2;
+	public static final byte SELECTED_DRAG = 2;
 	public static final byte DRAG_CONNECTION = 3;
 	public static final byte DRAG_SELECT = 4; 
 	public static final byte SELECTED = 5;
@@ -240,7 +240,7 @@ public class VisualisationInteractor implements MouseInputListener,
 		clicked = getSmartDeviceAtPosition(e.getX(), e.getY());
 		
 		switch (mode) {
-		case DRAG_DEVICE:
+		case SELECTED_DRAG:
 			// Finish Drag Device operations
 			finishDrag();
 			break;
@@ -335,23 +335,27 @@ public class VisualisationInteractor implements MouseInputListener,
 				return;
 			} else if (e.getButton() == MouseEvent.BUTTON1){// && connectionFrom == null) {
 				// Recognize possible drag operation
+				if(!selectedDevices.contains(pressedOn)){
+					selectedDevices.clear();
+					selectedDevices.add(pressedOn);
+				}
 				dragged = pressedOn;
 				dragged_x = pressedOn.getX();
 				dragged_y = pressedOn.getY();
-				mode = DRAG_DEVICE;
+				mode = SELECTED_DRAG;
 			} else if (e.getButton() == MouseEvent.BUTTON3){// && dragged == null) {
 				connectionFrom = pressedOn;
 				mode = DRAG_CONNECTION;
 			}
 			break;
 		case DRAG_SELECT:
-			mode = SELECTED;
+			finishDragSelect();
 			break;
 		default:
 			mode = NOTHING;
 			break;
 		}
-		
+		panel.repaint();
 	}
 
 	@Override
@@ -359,23 +363,10 @@ public class VisualisationInteractor implements MouseInputListener,
 		// Finish operation
 		switch (mode) {
 		case DRAG_SELECT:
-			LinkedList<SmartDevice> merged = new LinkedList<SmartDevice>();
-			//XOR of selectedDevices and selectedDevices Drag
-			merged.addAll(selectedDevices);
-			merged.removeAll(selectedDevicesDrag);
-			selectedDevicesDrag.removeAll(selectedDevices);
-			merged.addAll(selectedDevicesDrag);
-			//clear sets
-			selectedDevices.clear();
-			selectedDevicesDrag.clear();
-			selectedDevices = merged;
-			if(selectedDevices.isEmpty())
-				mode = NOTHING;
-			else
-				mode = SELECTED;
+			finishDragSelect();
 			panel.repaint();
 			break;
-		case DRAG_DEVICE:
+		case SELECTED_DRAG:
 			finishDrag();
 			break;
 		case DRAG_CONNECTION:
@@ -386,6 +377,23 @@ public class VisualisationInteractor implements MouseInputListener,
 		}
 	}
 
+	private void finishDragSelect() {
+		LinkedList<SmartDevice> merged = new LinkedList<SmartDevice>();
+		//XOR of selectedDevices and selectedDevices Drag
+		merged.addAll(selectedDevices);
+		merged.removeAll(selectedDevicesDrag);
+		selectedDevicesDrag.removeAll(selectedDevices);
+		merged.addAll(selectedDevicesDrag);
+		//clear sets
+		selectedDevices.clear();
+		selectedDevicesDrag.clear();
+		selectedDevices = merged;
+		if(selectedDevices.isEmpty())
+			mode = NOTHING;
+		else
+			mode = SELECTED;
+	}
+
 	@Override
 	public void mouseEntered(MouseEvent e) {
 
@@ -436,7 +444,8 @@ public class VisualisationInteractor implements MouseInputListener,
 				}
 			}
 			break;
-		case DRAG_DEVICE:
+		case SELECTED_DRAG:
+			/**
 			if (e.getX() <= control.getDevice_visualization_radius())
 				dragged_x = control.getDevice_visualization_radius();
 			else if (e.getX() >= model.getWidth() - control.getDevice_visualization_radius())
@@ -449,7 +458,24 @@ public class VisualisationInteractor implements MouseInputListener,
 			else if (e.getY() >= model.getHeight() - control.getDevice_visualization_radius())
 				dragged_y = model.getHeight() - control.getDevice_visualization_radius();
 			else
-				dragged_y = e.getY();
+				dragged_y = e.getY();*/
+			dragged_x = e.getX();
+			dragged_y = e.getY();
+			int x_offset = dragged_x - dragged.getX();
+			int y_offset = dragged_y - dragged.getY();
+			//Validate for all moved devices
+			for(SmartDevice d:selectedDevices){
+				if (d.getX() + x_offset <= control.getDevice_visualization_radius())
+					x_offset = control.getDevice_visualization_radius()-d.getX();
+				else if (d.getX() + x_offset >= model.getWidth() - control.getDevice_visualization_radius())
+					x_offset = model.getWidth() - control.getDevice_visualization_radius()-d.getX();
+				if (d.getY() + y_offset <= control.getDevice_visualization_radius())
+					y_offset = control.getDevice_visualization_radius()-d.getY();
+				else if (d.getY() + y_offset >= model.getHeight() - control.getDevice_visualization_radius())
+					y_offset = model.getHeight() - control.getDevice_visualization_radius()-d.getY();
+			}
+			dragged_x =dragged.getX() + x_offset;
+			dragged_y =dragged.getY() + y_offset;
 			break;
 
 		default:
@@ -457,7 +483,7 @@ public class VisualisationInteractor implements MouseInputListener,
 		}
 		
 		// repaint the dragged smartDevice or new connection
-		if (mode == DRAG_DEVICE || mode == DRAG_CONNECTION || mode == DRAG_SELECT)
+		if (mode == SELECTED_DRAG || mode == DRAG_CONNECTION || mode == DRAG_SELECT)
 			panel.repaint();
 	}
 
@@ -471,13 +497,19 @@ public class VisualisationInteractor implements MouseInputListener,
 	 * panel and set dragged to null
 	 */
 	public void finishDrag() {
-		if (mode == DRAG_DEVICE){
+		if (mode == SELECTED_DRAG){
 			if(dragged != null
 				&& (dragged.getX() != dragged_x || dragged.getY() != dragged_y)) {
-				control.moveSmartDevice(dragged, dragged_x, dragged_y, dragged.getZ());
+				int x_offset = dragged_x-dragged.getX();
+				int y_offset = dragged_y-dragged.getY();
+				for(SmartDevice d: selectedDevices)
+					control.moveSmartDevice(d, d.getX()+x_offset, d.getY()+y_offset, d.getZ());
 			}
 			dragged = null;
-			mode = NOTHING;
+			if(selectedDevices.isEmpty())
+				mode = NOTHING;
+			else
+				mode = SELECTED;
 			panel.repaint();
 			model.notifyObservers();
 		}

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

@@ -111,7 +111,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 		case VisualisationInteractor.DRAG_CONNECTION:
 			modus="Drag Connection";
 			break;
-		case VisualisationInteractor.DRAG_DEVICE:
+		case VisualisationInteractor.SELECTED_DRAG:
 			modus="Drag Device";
 			break;
 		case VisualisationInteractor.DRAG_SELECT:
@@ -142,16 +142,23 @@ public class VisualisationPanel extends JPanel implements Observer {
 	 *            the Graphics object to visualize on
 	 */
 	public void paintDevices(Graphics g) {
-
+		//Values for dragging of multiple Devices
+		int x_offset = 0;
+		int y_offset = 0;
+		if(interactor.mode == VisualisationInteractor.SELECTED_DRAG && !interactor.selectedDevices.isEmpty()){
+			x_offset = interactor.dragged_x-interactor.dragged.getX();
+			y_offset = interactor.dragged_y-interactor.dragged.getY();
+		}
+		//Paint Devices
 		for (SmartDevice s: model.getDevices()) {
 			int x = s.getX();
 			int y = s.getY();
-			if(interactor.mode==VisualisationInteractor.DRAG_DEVICE && s == interactor.dragged) {
+			if(interactor.mode==VisualisationInteractor.SELECTED_DRAG && interactor.selectedDevices.contains(s)) {
 				// Update visualization of dragged object
-				x = interactor.dragged_x;
-				y = interactor.dragged_y;
+				x += x_offset;
+				y += y_offset;
 			}
-			if((interactor.mode==VisualisationInteractor.SELECTED||interactor.mode==VisualisationInteractor.DRAG_SELECT)&&(interactor.selectedDevices.contains(s)^interactor.selectedDevicesDrag.contains(s))){
+			if((interactor.mode==VisualisationInteractor.SELECTED||interactor.mode==VisualisationInteractor.DRAG_SELECT ||interactor.mode == VisualisationInteractor.SELECTED_DRAG)&&(interactor.selectedDevices.contains(s)^interactor.selectedDevicesDrag.contains(s))){
 				//HighlightSelected Devices
 				g.setColor(new Color(135,206,235));
 			}else
@@ -179,6 +186,13 @@ public class VisualisationPanel extends JPanel implements Observer {
 	 *            the Graphics object to visualize on
 	 */
 	private void paintConnections(Graphics g) {
+		//Values for dragging of multiple Devices
+		int x_offset = 0;
+		int y_offset = 0;
+		if(interactor.mode == VisualisationInteractor.SELECTED_DRAG && !interactor.selectedDevices.isEmpty()){
+			x_offset = interactor.dragged_x-interactor.dragged.getX();
+			y_offset = interactor.dragged_y-interactor.dragged.getY();
+		}
 		// For all Connections
 		for (Connection c : model.getConnections()) {
 			Color connectionState;
@@ -217,9 +231,9 @@ public class VisualisationPanel extends JPanel implements Observer {
 					 * if broker was removed, paint broker at the average position
 					 */
 					for(Port p: c.getParticipants()){
-						if(interactor.mode==VisualisationInteractor.DRAG_DEVICE && p.getOwner()==interactor.dragged){
-							broker_x+=interactor.dragged_x;
-							broker_y+=interactor.dragged_y;
+						if(interactor.mode==VisualisationInteractor.SELECTED_DRAG && interactor.selectedDevices.contains(p.getOwner())){
+							broker_x+=p.getOwner().getX()+x_offset;
+							broker_y+=p.getOwner().getY()+y_offset;
 						}else{
 
 							broker_x+=p.getOwner().getX();
@@ -230,8 +244,13 @@ public class VisualisationPanel extends JPanel implements Observer {
 					broker_y/=c.getParticipants().size();
 					g.fillOval(broker_x-control.getDevice_visualization_radius()/4, broker_y-control.getDevice_visualization_radius()/4, control.getDevice_visualization_radius()/2, control.getDevice_visualization_radius()/2);
 				}else{
-					broker_x=broker.getOwner().getX();
-					broker_y=broker.getOwner().getY();
+					if(interactor.mode==VisualisationInteractor.SELECTED_DRAG && interactor.selectedDevices.contains(broker.getOwner())){
+						broker_x=broker.getOwner().getX()+x_offset;
+						broker_y=broker.getOwner().getY()+y_offset;						
+					}else{
+						broker_x=broker.getOwner().getX();
+						broker_y=broker.getOwner().getY();
+					}
 				}
 				for(Port sd:d){
 					if(!model.getDevices().contains(sd.getOwner())){
@@ -245,22 +264,22 @@ public class VisualisationPanel extends JPanel implements Observer {
 					if (broker!= sd) {
 						// Check if dragged object
 						int s_x, s_y, sd_x, sd_y;
-						if (interactor.mode==VisualisationInteractor.DRAG_DEVICE && broker != null && broker.getOwner() == interactor.dragged) {
-							s_x = interactor.dragged_x;
-							s_y = interactor.dragged_y;
+						if (interactor.mode==VisualisationInteractor.SELECTED_DRAG && broker != null && interactor.selectedDevices.contains(broker.getOwner())) {
+							s_x = broker.getOwner().getX()+x_offset;
+							s_y = broker.getOwner().getY()+y_offset;
 						} else if(broker==null){
 							/**
 							 * if broker was removed, paint edges to the previously calculated average position
 							 */
-							s_x=broker_x;
-							s_y=broker_y;
+							s_x = broker_x;
+							s_y = broker_y;
 						}else{
 							s_x = broker_x;
 							s_y = broker_y;
 						}
-						if (interactor.mode==VisualisationInteractor.DRAG_DEVICE && sd.getOwner() == interactor.dragged) {
-							sd_x = interactor.dragged_x;
-							sd_y = interactor.dragged_y;
+						if (interactor.mode==VisualisationInteractor.SELECTED_DRAG && interactor.selectedDevices.contains(sd.getOwner())) {
+							sd_x = sd.getOwner().getX()+x_offset;
+							sd_y = sd.getOwner().getY()+y_offset;
 						} else {
 							sd_x = sd.getOwner().getX();
 							sd_y = sd.getOwner().getY();
@@ -282,16 +301,16 @@ public class VisualisationPanel extends JPanel implements Observer {
 					if (s != sd) {
 						// Check if dragged object
 						int s_x, s_y, sd_x, sd_y;
-						if (interactor.mode==VisualisationInteractor.DRAG_DEVICE && s.getOwner() == interactor.dragged) {
-							s_x = interactor.dragged_x;
-							s_y = interactor.dragged_y;
+						if (interactor.mode==VisualisationInteractor.SELECTED_DRAG && interactor.selectedDevices.contains(s.getOwner())) {
+							s_x = s.getOwner().getX()+x_offset;
+							s_y = s.getOwner().getY()+y_offset;
 						} else {
 							s_x = s.getOwner().getX();
 							s_y = s.getOwner().getY();
 						}
-						if (interactor.mode==VisualisationInteractor.DRAG_DEVICE && sd.getOwner() == interactor.dragged) {
-							sd_x = interactor.dragged_x;
-							sd_y = interactor.dragged_y;
+						if (interactor.mode==VisualisationInteractor.SELECTED_DRAG && interactor.selectedDevices.contains(sd.getOwner())) {
+							sd_x = sd.getOwner().getX()+x_offset;
+							sd_y = sd.getOwner().getY()+y_offset;
 						} else {
 							sd_x = sd.getOwner().getX();
 							sd_y = sd.getOwner().getY();