Jelajahi Sumber

Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop

Edgardo Palza 8 tahun lalu
induk
melakukan
7f290735d7
8 mengubah file dengan 19 tambahan dan 8 penghapusan
  1. TEMPAT SAMPAH
      bin/ui/view/GUI$1.class
  2. TEMPAT SAMPAH
      bin/ui/view/GUI$2.class
  3. TEMPAT SAMPAH
      bin/ui/view/GUI$3.class
  4. TEMPAT SAMPAH
      bin/ui/view/GUI$4.class
  5. TEMPAT SAMPAH
      bin/ui/view/GUI$5.class
  6. TEMPAT SAMPAH
      bin/ui/view/GUI$6.class
  7. TEMPAT SAMPAH
      bin/ui/view/GUI.class
  8. 19 8
      src/ui/view/GUI.java

TEMPAT SAMPAH
bin/ui/view/GUI$1.class


TEMPAT SAMPAH
bin/ui/view/GUI$2.class


TEMPAT SAMPAH
bin/ui/view/GUI$3.class


TEMPAT SAMPAH
bin/ui/view/GUI$4.class


TEMPAT SAMPAH
bin/ui/view/GUI$5.class


TEMPAT SAMPAH
bin/ui/view/GUI$6.class


TEMPAT SAMPAH
bin/ui/view/GUI.class


+ 19 - 8
src/ui/view/GUI.java

@@ -95,6 +95,10 @@ public class GUI implements CategoryListener {
 	private final JButton btnDel = new JButton("-");
 
 	private final JToolBar toolBar = new JToolBar();
+	
+	//variables
+	boolean dragging = false;
+	
 
 	/**
 	 * Create the application.
@@ -209,10 +213,13 @@ public class GUI implements CategoryListener {
 		tree.addMouseListener(new MouseAdapter(){
             public void mouseReleased(MouseEvent e){
                 	try {
-                		HolonObject h = new HolonObject("House");
-                		h.setPos((int)canvas.getMousePosition().getX(),(int)canvas.getMousePosition().getY());
-                		canvas.choords.add(h);
-                		canvas.repaint();
+                		if(dragging){
+                			HolonObject h = new HolonObject("House");
+                			h.setPos((int)canvas.getMousePosition().getX(),(int)canvas.getMousePosition().getY());
+                			canvas.choords.add(h);
+                			canvas.repaint();
+                			dragging = false;
+                		}
 					} catch (Exception e2) {}
                 	frmCyberPhysical.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
 	            }
@@ -220,13 +227,17 @@ public class GUI implements CategoryListener {
 		
 		
 		tree.addTreeSelectionListener(new TreeSelectionListener() {
-			
 			@Override
 			public void valueChanged(TreeSelectionEvent e) {
-				// TODO Auto-generated method stub
 				try {
-                	Cursor cursor = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(0,0), "red Cursor"); 
-                    frmCyberPhysical.setCursor(cursor);
+					String name = tree.getLastSelectedPathComponent().toString();
+					System.out.println(name);
+                    tree.clearSelection();
+                    if(name.compareTo("Power Plant")==0 || name.compareTo("House")==0 || name.compareTo("Switch")==0 || name.compareTo("Transformer")==0){
+                    	dragging = true;
+                		Cursor cursor = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(0,0), "red Cursor"); 
+                    	frmCyberPhysical.setCursor(cursor);
+                    }
 				} catch (Exception e2) {
 					// TODO: handle exception
 				}