[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.91, 1.92 SelectStrategy.java, 1.3, 1.4 AbstractPencil.java, 1.54, 1.55 AlternateMoveTool.java, 1.2, 1.3

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19188/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	AbstractTool.java SelectStrategy.java AbstractPencil.java 
	AlternateMoveTool.java 
Log Message:
Refactoring selection mechanism

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** AbstractPencil.java	9 Aug 2006 16:14:20 -0000	1.54
--- AbstractPencil.java	10 Aug 2006 13:08:01 -0000	1.55
***************
*** 174,178 ****
      intersection = 
        (Intersection) glv.getView().getObjectAtPoint(e.getX(), e.getY(),
!                                                   unwanted, true, work);
      if (constrain) {
        if (lockingEdge != null) {
--- 174,178 ----
      intersection = 
        (Intersection) glv.getView().getObjectAtPoint(e.getX(), e.getY(),
!                                                   unwanted, View.INTERSECTIONS, work);
      if (constrain) {
        if (lockingEdge != null) {
***************
*** 903,906 ****
--- 903,907 ----
      affected.addAll(edges);
      affected.addAll(surfaces);
+     affected.addAll(moveElements);
      
      {

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** AbstractTool.java	9 Aug 2006 15:15:03 -0000	1.91
--- AbstractTool.java	10 Aug 2006 13:08:01 -0000	1.92
***************
*** 375,379 ****
      previousPos[0] = pressPos[0];
      previousPos[1] = pressPos[1];
!     Object o = glv.getView().getObjectAtPoint(e.getX(), e.getY());    
      if (e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(dragCursor);
--- 375,379 ----
      previousPos[0] = pressPos[0];
      previousPos[1] = pressPos[1];
!     Object o = glv.getView().getObjectAtPoint(e.getX(), e.getY(), View.OBJECTS);
      if (e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(dragCursor);
***************
*** 524,534 ****
    /**
     * Find the object under the mouse and set target
     * @param event The MouseEvent
     */
!   protected void findTarget(MouseEvent event) {
      int x = event.getX();
      int y = event.getY();
      View view = glv.getView();
!     target = view.getObjectAtPoint(x, y);
    }
    
--- 524,543 ----
    /**
     * Find the object under the mouse and set target
+    * @param mode mode
     * @param event The MouseEvent
     */
!   protected void findTarget(MouseEvent event, int mode) {
      int x = event.getX();
      int y = event.getY();
      View view = glv.getView();
!     target = view.getObjectAtPoint(x, y, mode);
!   }
!   
!   /**
!    * 
!    * @param event The MouseEvent
!    */
!   protected void findTarget(MouseEvent event) {
!     findTarget(event, View.OBJECTS);
    }
    
***************
*** 542,546 ****
      int y = event.getY();
      View view = glv.getView();
!     target = view.getObjectAtPoint(x, y, ignore, false, new Plane(0, 0, 1, 0));
    }
    
--- 551,555 ----
      int y = event.getY();
      View view = glv.getView();
!     target = view.getObjectAtPoint(x, y, ignore, View.OBJECTS, new Plane(0, 0, 1, 0));
    }
    

Index: SelectStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SelectStrategy.java	9 Aug 2006 18:10:37 -0000	1.3
--- SelectStrategy.java	10 Aug 2006 13:08:01 -0000	1.4
***************
*** 100,104 ****
      y = e.getY();
      View view = glv.getView();
!     target = view.getObjectAtPoint(x, y);
      if (e.getClickCount() >= 2) {
        if (target instanceof Surface) {
--- 100,104 ----
      y = e.getY();
      View view = glv.getView();
!     target = view.getObjectAtPoint(x, y, View.OBJECTS);
      if (e.getClickCount() >= 2) {
        if (target instanceof Surface) {

Index: AlternateMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AlternateMoveTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AlternateMoveTool.java	9 Aug 2006 09:45:06 -0000	1.2
--- AlternateMoveTool.java	10 Aug 2006 13:08:01 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
+ import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
***************
*** 86,89 ****
--- 87,93 ----
          feedback.add(edge);
          feedback(feedback);
+         
+         Project.info("make current " + current);
+         
          makeTarget(current);
          updateConstructors();
***************
*** 107,111 ****
      if (start == null) {
        if (selection.isEmpty()) {
!         findTarget(e);
          glv.getView().makeTarget(target);
        } else {
--- 111,115 ----
      if (start == null) {
        if (selection.isEmpty()) {
!         findTarget(e, View.OBJECTS);
          glv.getView().makeTarget(target);
        } else {
***************
*** 120,123 ****
--- 124,128 ----
          active = prepare(e);
          if (active) {
+           Project.info("excluding " + affected);
            excluded(affected);
          }
***************
*** 148,151 ****
--- 153,157 ----
        } else {
          entities = new HashSet();
+         Project.info("adding selection " + selection);
          entities.addAll(selection);
        }