소스 검색

Edge Highlighting again :)

Kevin Trometer 8 년 전
부모
커밋
21ad84602f
3개의 변경된 파일12개의 추가작업 그리고 5개의 파일을 삭제
  1. BIN
      bin/ui/model/IdCounter.class
  2. BIN
      bin/ui/view/MyCanvas.class
  3. 12 5
      src/ui/view/MyCanvas.java

BIN
bin/ui/model/IdCounter.class


BIN
bin/ui/view/MyCanvas.class


+ 12 - 5
src/ui/view/MyCanvas.java

@@ -98,17 +98,26 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		
 		//Selection
 		if(selectRect != null){
-			g2.setColor(new Color(100, 255, 100));
+			g2.setColor(Color.GREEN);
 		    g2.fillRect((int)selectRect.getX(), (int)selectRect.getY(), (int)selectRect.getWidth(), (int)selectRect.getHeight());
 		}
 		
 		//drawEdges
-		g.setColor(Color.BLACK);
+		g2.setColor(Color.BLACK);
 		if(drawEdge)g2.drawLine(tempCps.getPos().x+GlobalVariables.SCALE_DIVIDED2, tempCps.getPos().y+GlobalVariables.SCALE_DIVIDED2, x, y);
 		
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			for (CpsObject con : cps.getConnectedTo()) {
-				g.drawLine(cps.getPos().x+GlobalVariables.SCALE_DIVIDED2, cps.getPos().y+GlobalVariables.SCALE_DIVIDED2, con.getPos().x+GlobalVariables.SCALE_DIVIDED2, con.getPos().y+GlobalVariables.SCALE_DIVIDED2);
+				if(con.getID() != model.getSelectedObjectID())
+				g2.drawLine(cps.getPos().x+GlobalVariables.SCALE_DIVIDED2, cps.getPos().y+GlobalVariables.SCALE_DIVIDED2, con.getPos().x+GlobalVariables.SCALE_DIVIDED2, con.getPos().y+GlobalVariables.SCALE_DIVIDED2);
+			}
+		}
+		
+		g2.setColor(Color.GREEN);		
+		for (CpsObject cps : model.getObjectsOnCanvas()) {
+			for (CpsObject con : cps.getConnectedTo()) {
+				if(con.getID() == model.getSelectedObjectID())
+				g2.drawLine(cps.getPos().x+GlobalVariables.SCALE_DIVIDED2, cps.getPos().y+GlobalVariables.SCALE_DIVIDED2, con.getPos().x+GlobalVariables.SCALE_DIVIDED2, con.getPos().y+GlobalVariables.SCALE_DIVIDED2);
 			}
 		}
 		
@@ -244,11 +253,9 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		if(tempCps != null){
 			selectRect.setBounds(tempCps.getPos().x-(GlobalVariables.SCALE/20), tempCps.getPos().y-(GlobalVariables.SCALE/20), GlobalVariables.SCALE+GlobalVariables.SCALE/10, GlobalVariables.SCALE+GlobalVariables.SCALE/10);
 			controller.setSelectedObjectID(tempCps.getID());
-			System.out.println("Select");
 		}else {
 			controller.setSelectedObjectID(0);
 			selectRect.setRect(0, 0, 0, 0);
-			System.out.println("Unselect");
 		}
 	}
 }