bprocessor-commit — Commit

[Bprocessor-commit] /tools/checkstyle checkstyle.xml,1.6,1.7

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//tools/checkstyle
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28185/checkstyle

Modified Files:
	checkstyle.xml 
Log Message:
Made some minor changes and fixes to the factor chooser

Index: checkstyle.xml
===================================================================
RCS file: /cvsroot/bprocessor//tools/checkstyle/checkstyle.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** checkstyle.xml	2 Jan 2007 17:27:29 -0000	1.6
--- checkstyle.xml	14 Jan 2007 23:33:32 -0000	1.7
***************
*** 122,126 ****
      <module name="MethodLength">
        <property name="tokens" value="CTOR_DEF"/>
!       <property name="max" value="150"/>
      </module>
      <module name="FileLength">
--- 122,126 ----
      <module name="MethodLength">
        <property name="tokens" value="CTOR_DEF"/>
!       <property name="max" value="200"/>
      </module>
      <module name="FileLength">

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java, 1.70, 1.71

[rimestad <rim...@us...>]

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

Modified Files:
	ToolFactory.java 
Log Message:
made changes to the way factor is evaluated and the placement of the calcs. inserted a combobox with no functionallity yet...

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** ToolFactory.java	29 Dec 2006 13:33:42 -0000	1.70
--- ToolFactory.java	12 Jan 2007 17:52:27 -0000	1.71
***************
*** 269,272 ****
--- 269,273 ----
        public void actionPerformed(ActionEvent agr0) {
          Project.getInstance().getCurrentCamera().setType(Camera.ORTHOGRAPHIC);
+         Project.getInstance().getCurrentCamera().setFactor(glv.getView().calcFactor());
          glv.repaint();
        }
***************
*** 276,279 ****
--- 277,281 ----
        public void actionPerformed(ActionEvent agr0) {
          Project.getInstance().getCurrentCamera().setType(Camera.PERSPECTIVE);
+         glv.getView().invertFactor();
          glv.repaint();
        }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.170, 1.171

[rimestad <rim...@us...>]

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

Modified Files:
	View.java 
Log Message:
made changes to the way factor is evaluated and the placement of the calcs. inserted a combobox with no functionallity yet...

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** View.java	9 Jan 2007 10:12:06 -0000	1.170
--- View.java	12 Jan 2007 17:52:27 -0000	1.171
***************
*** 47,50 ****
--- 47,51 ----
  import java.util.HashMap;
  
+ import java.awt.Toolkit;
  import java.awt.event.ActionEvent;
  import java.awt.event.KeyEvent;
***************
*** 75,78 ****
--- 76,84 ----
   */
  public class View implements GLEventListener {
+   /**
+    * 
+    */
+   private static final int CONVETIONAL_WINDOW_HEIGHT = 600;
+ 
    /** The logger */
    private static Logger log = Logger.getLogger(View.class);
***************
*** 577,581 ****
  
      glu = new GLU();
!     gl.glViewport(0, 0, (int)width, (int)height);
      if (picking > 0) {
        selectBuffer = BufferUtil.newIntBuffer(selectionLength);
--- 583,587 ----
  
      glu = new GLU();
!     //gl.glViewport(0, 0, (int)width, (int)height);
      if (picking > 0) {
        selectBuffer = BufferUtil.newIntBuffer(selectionLength);
***************
*** 729,733 ****
  
      View.aspect = width / height;
!     /** fetch the current camera */
      Camera camera = Project.getInstance().getCurrentCamera();
      double[] eye = camera.getCamera();
--- 735,739 ----
  
      View.aspect = width / height;
!     /* fetch the current camera */
      Camera camera = Project.getInstance().getCurrentCamera();
      double[] eye = camera.getCamera();
***************
*** 742,751 ****
      far = far < 20 ? 20 : far;
      double focalwidth = camera.getFocalwidth();
      if (camera.getType() == Camera.ORTHOGRAPHIC) {
!       double tal = Math.tan(Math.toRadians(focalwidth / 2)) * length;
        gl.glOrtho(-tal * aspect, tal * aspect, -tal, tal, near, far);
      } else if (camera.getType() == Camera.PERSPECTIVE) {
        // fovy, aspect, near, far (relative to camera position)
!       glu.gluPerspective(focalwidth, aspect, near, far);
      }
  
--- 748,762 ----
      far = far < 20 ? 20 : far;
      double focalwidth = camera.getFocalwidth();
+     double d = View.height / CONVETIONAL_WINDOW_HEIGHT;
      if (camera.getType() == Camera.ORTHOGRAPHIC) {
!       int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
!       double relation = 2.54;
!       double dpm = (dpi / relation) * 100;
!       double windowInMeters = 600 / dpm;
!       double tal = d * camera.getFactor() * windowInMeters / 2;
        gl.glOrtho(-tal * aspect, tal * aspect, -tal, tal, near, far);
      } else if (camera.getType() == Camera.PERSPECTIVE) {
        // fovy, aspect, near, far (relative to camera position)
!       glu.gluPerspective(focalwidth * d, aspect, near, far);
      }
  
***************
*** 1790,1793 ****
--- 1801,1805 ----
      View.height = height;
      View.aspect = View.width / View.height;
+     gld.getGL().glViewport(0, 0, width, height);
    }
  
***************
*** 3347,3349 ****
--- 3359,3399 ----
      this.glObjects3D.add(glo);
    }
+ 
+   /**
+    * Calculate the 1 : factor ralationship with reality
+    * @return The to reality factor for the camera
+    */
+   public double calcFactor() {
+     Camera current = Project.getInstance().getCurrentCamera();
+     double[] camera = current.getCamera();
+     double[] center = current.getCenter();
+     double length = Math.sqrt((camera[0] - center[0]) * (camera[0] - center[0]) +
+         (camera[1] - center[1]) * (camera[1] - center[1]) +
+         (camera[2] - center[2]) * (camera[2] - center[2]));
+     double tal = Math.tan(Math.toRadians(current.getFocalwidth())) * length;
+     int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
+     double dpm = (dpi / 2.54) * 100;
+     double windowheight = CONVETIONAL_WINDOW_HEIGHT / dpm;
+     log.info("factor " + (tal / windowheight));
+     return tal / windowheight;
+   }
+ 
+   /**
+    * Calc position for the camera based on the given to reality factor
+    */
+   public void invertFactor() {
+     Camera current = Project.getInstance().getCurrentCamera();
+     int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
+     double dpm = (dpi / 2.54) * 100;
+     double window = CONVETIONAL_WINDOW_HEIGHT / dpm;
+     double length = current.getFactor() * window;
+     length /= Math.tan(Math.toRadians(current.getFocalwidth()));
+     double[] camera = current.getCamera();
+     double[] center = current.getCenter();
+     Vertex back = new Vertex(camera).minus(new Vertex(center));
+     back.scale(length / back.length());
+     camera[0] = center[0] + back.getX();
+     camera[1] = center[1] + back.getY();
+     camera[2] = center[2] + back.getZ();
+   }
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Camera.java, 1.33, 1.34

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22145/src/net/sourceforge/bprocessor/model

Modified Files:
	Camera.java 
Log Message:
made changes to the way factor is evaluated and the placement of the calcs. inserted a combobox with no functionallity yet...

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Camera.java	12 Jan 2007 11:48:16 -0000	1.33
--- Camera.java	12 Jan 2007 17:52:32 -0000	1.34
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
- import java.awt.Toolkit;
  import java.util.ArrayList;
  import java.util.Collection;
--- 7,10 ----
***************
*** 65,68 ****
--- 64,70 ----
    private double factor;
    
+   /** The ralation between cm and inches */
+   private static final double RELATION = 2.54;
+   
    /**
     * The constructor for the persistence layer
***************
*** 106,110 ****
      this.setFocalwidth(c.getFocalwidth());
      Iterator clips = c.getClipplanes().iterator();
!     c.factor = this.factor;
      while (clips.hasNext()) {
        ClippingPlane clip = (ClippingPlane)clips.next();
--- 108,112 ----
      this.setFocalwidth(c.getFocalwidth());
      Iterator clips = c.getClipplanes().iterator();
!     this.factor = c.factor;
      while (clips.hasNext()) {
        ClippingPlane clip = (ClippingPlane)clips.next();
***************
*** 166,173 ****
    public void setType(int type) {
      if (type == PERSPECTIVE) {
-       calcOrthoToPersp();
        this.type = type;
      } else if (type == ORTHOGRAPHIC) {
-       calcPerspToOrtho();
        this.type = type;
      } else {
--- 168,173 ----
***************
*** 175,198 ****
      }
    }
-   
-   /**
-    * Change the to reality factor from the camera settings
-    */
-   private void calcPerspToOrtho() {
-     double length = Math.sqrt((camera[0] - center[0]) * (camera[0] - center[0]) +
-         (camera[1] - center[1]) * (camera[1] - center[1]) +
-         (camera[2] - center[2]) * (camera[2] - center[2]));
-     double width = Math.tan(Math.toRadians(focalwidth)) * length;
-     factor = width * 100.0 * (96.0 / 100.0);
-     log.info("The factor is:" + factor + " for width " + width);
-   }
- 
-   /**
-    * Change the camera to corrospond the reality factor
-    */
-   private void calcOrthoToPersp() {
-     // TODO Auto-generated method stub
-     
-   }
  
    /**
--- 175,178 ----
***************
*** 346,350 ****
        } 
      } else {
!       factor *= 2;
      }
    }
--- 326,330 ----
        } 
      } else {
!       factor /= 2;
      }
    }
***************
*** 359,363 ****
        camera[2] += (camera[2] - center[2]) * 0.1;
      } else {
!       factor /= 2;
      }
    } 
--- 339,343 ----
        camera[2] += (camera[2] - center[2]) * 0.1;
      } else {
!       factor *= 2;
      }
    } 

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl GLView.java, 1.46, 1.47

[rimestad <rim...@us...>]

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

Modified Files:
	GLView.java 
Log Message:
made changes to the way factor is evaluated and the placement of the calcs. inserted a combobox with no functionallity yet...

Index: GLView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/GLView.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** GLView.java	19 Dec 2006 11:22:50 -0000	1.46
--- GLView.java	12 Jan 2007 17:52:27 -0000	1.47
***************
*** 29,32 ****
--- 29,33 ----
  
  
+ import javax.swing.JComboBox;
  import javax.swing.JTextField;
  import javax.swing.JPanel;
***************
*** 83,86 ****
--- 84,95 ----
      lengthField = new LengthField();
      lengthPanel.add(lengthField, BorderLayout.CENTER);
+     String init = "-";
+     String s1 = "1:1";
+     String s2 = "1:10";
+     String s3 = "1:100";
+     String s4 = "1:250";
+     String s5 = "1:500";
+     String s6 = "1:1000";
+     lengthPanel.add(new JComboBox(new Object[]{init, s1, s2, s3, s4, s5, s6}), BorderLayout.EAST);
      jp.add(lengthPanel, BorderLayout.SOUTH);
      GUI.getInstance().incrementPB();

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Camera.java, 1.32, 1.33

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29959/src/net/sourceforge/bprocessor/model

Modified Files:
	Camera.java 
Log Message:
added a orthographic factor to the camera

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Camera.java	2 Jan 2007 18:30:33 -0000	1.32
--- Camera.java	12 Jan 2007 11:48:16 -0000	1.33
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.model;
  
+ import java.awt.Toolkit;
  import java.util.ArrayList;
  import java.util.Collection;
***************
*** 60,63 ****
--- 61,67 ----
    /** The list of clipplanes to this camera*/
    private ArrayList<ClippingPlane> clipplanes;
+ 
+   /** The to reality size factor for orthographic cameras */
+   private double factor;
    
    /**
***************
*** 102,105 ****
--- 106,110 ----
      this.setFocalwidth(c.getFocalwidth());
      Iterator clips = c.getClipplanes().iterator();
+     c.factor = this.factor;
      while (clips.hasNext()) {
        ClippingPlane clip = (ClippingPlane)clips.next();
***************
*** 117,120 ****
--- 122,126 ----
      this.setRoll(new double[]{other.roll[0], other.roll[1], other.roll[2]});
      this.setType(other.getType());
+     this.factor = other.factor;
      this.setFocalwidth(other.getFocalwidth());
      Iterator clips = other.getClipplanes().iterator();
***************
*** 159,164 ****
     */
    public void setType(int type) {
!     if (type == PERSPECTIVE || type == ORTHOGRAPHIC) {
!       this.type = type;    
      } else {
        log.error("Wrong camera type should be either Camera.PERSPECTIVE or Camera.ORTHOGRAPIC");
--- 165,174 ----
     */
    public void setType(int type) {
!     if (type == PERSPECTIVE) {
!       calcOrthoToPersp();
!       this.type = type;
!     } else if (type == ORTHOGRAPHIC) {
!       calcPerspToOrtho();
!       this.type = type;
      } else {
        log.error("Wrong camera type should be either Camera.PERSPECTIVE or Camera.ORTHOGRAPIC");
***************
*** 167,170 ****
--- 177,200 ----
    
    /**
+    * Change the to reality factor from the camera settings
+    */
+   private void calcPerspToOrtho() {
+     double length = Math.sqrt((camera[0] - center[0]) * (camera[0] - center[0]) +
+         (camera[1] - center[1]) * (camera[1] - center[1]) +
+         (camera[2] - center[2]) * (camera[2] - center[2]));
+     double width = Math.tan(Math.toRadians(focalwidth)) * length;
+     factor = width * 100.0 * (96.0 / 100.0);
+     log.info("The factor is:" + factor + " for width " + width);
+   }
+ 
+   /**
+    * Change the camera to corrospond the reality factor
+    */
+   private void calcOrthoToPersp() {
+     // TODO Auto-generated method stub
+     
+   }
+ 
+   /**
     * Getter for camera.type
     * @return The camera type
***************
*** 309,316 ****
     */
    public void zoomin(double[] target) {
!     if (dist() >= 0.1) {
!       camera[0] -= (camera[0] - target[0]) * 0.1;
!       camera[1] -= (camera[1] - target[1]) * 0.1;
!       camera[2] -= (camera[2] - target[2]) * 0.1;
      }
    }
--- 339,350 ----
     */
    public void zoomin(double[] target) {
!     if (type == PERSPECTIVE) {
!       if (dist() >= 0.1) {
!         camera[0] -= (camera[0] - target[0]) * 0.1;
!         camera[1] -= (camera[1] - target[1]) * 0.1;
!         camera[2] -= (camera[2] - target[2]) * 0.1;
!       } 
!     } else {
!       factor *= 2;
      }
    }
***************
*** 320,327 ****
     */
    public void zoomout() {
!     camera[0] += (camera[0] - center[0]) * 0.1;
!     camera[1] += (camera[1] - center[1]) * 0.1;
!     camera[2] += (camera[2] - center[2]) * 0.1;
!   }
    
    /**
--- 354,365 ----
     */
    public void zoomout() {
!     if (type == PERSPECTIVE) {
!       camera[0] += (camera[0] - center[0]) * 0.1;
!       camera[1] += (camera[1] - center[1]) * 0.1;
!       camera[2] += (camera[2] - center[2]) * 0.1;
!     } else {
!       factor /= 2;
!     }
!   } 
    
    /**
***************
*** 642,645 ****
--- 680,699 ----
      c.add(s);
      currentCamera.zoomOn(c, 1.0);
+   }
+ 
+   /**
+    * Getter for the factor
+    * @return the factor
+    */
+   public double getFactor() {
+     return factor;
+   }
+   
+   /**
+    * Setter for the factor
+    * @param factor the factor
+    */
+   public void setFactor(double factor) {
+     this.factor = factor;
    }  
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.108, 1.109

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20810/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:
More supporting edges when editing space

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** Project.java	8 Jan 2007 12:31:26 -0000	1.108
--- Project.java	9 Jan 2007 10:12:09 -0000	1.109
***************
*** 1137,1140 ****
--- 1137,1141 ----
     */
    public void importCSV(File lfile) throws IOException {
+     System.out.println("import file");
      BufferedReader bf;
      bf = new BufferedReader(

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.169, 1.170

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

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

Modified Files:
	View.java 
Log Message:
More supporting edges when editing space

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** View.java	2 Jan 2007 17:45:39 -0000	1.169
--- View.java	9 Jan 2007 10:12:06 -0000	1.170
***************
*** 839,888 ****
    public Collection collectSupportingEdges(Space active) {
      Collection edges = new HashSet();
!     if (active != Project.getInstance().world()) {
!       Space empty = active.getOwner().getEmpty();
!       Collection envelope = active.getEnvelope();
!       Set spaces = new HashSet();
!       {
!         Iterator iter = envelope.iterator();
!         while (iter.hasNext()) {
!           Surface current = (Surface) iter.next();
!           Space other;
!           if (current.getFrontDomain() == active) {
!             other = current.getBackDomain();
!           } else {
!             other = current.getFrontDomain();
            }
!           if (other != empty) {
!             spaces.add(other);
            }
          }
!       }
!       Set surfaces = new HashSet();
!       surfaces.addAll(envelope);
!       {
!         Iterator iter = spaces.iterator();
!         while (iter.hasNext()) {
!           Space current = (Space) iter.next();
!           surfaces.addAll(current.getEnvelope());
          }
        }
        {
!         Set holes = new HashSet();
!         Iterator iter = surfaces.iterator();
          while (iter.hasNext()) {
!           Surface current = (Surface) iter.next();
!           holes.addAll(current.getHoles());
!         }
!         surfaces.addAll(holes);
!       }
!       edges.addAll(Surface.edges(surfaces));
!     }
!     {
!       Iterator iter = Selection.primary().iterator();
!       while (iter.hasNext()) {
!         Geometric current = (Geometric) iter.next();
!         if (current instanceof Space) {
!           Space space = (Space) current;
!           edges.addAll(space.getEdges());
          }
        }
--- 839,899 ----
    public Collection collectSupportingEdges(Space active) {
      Collection edges = new HashSet();
!     
!     if (DRAW_ALL) {
!       if (active != Project.getInstance().world()) {
!         Space current = active;
!         while (current != null) {
!           edges.addAll(current.getEdges());
!           current = current.getOwner();
!         }
!       }
!     } else {
!       if (active != Project.getInstance().world()) {
!         Space empty = active.getOwner().getEmpty();
!         Collection envelope = active.getEnvelope();
!         Set spaces = new HashSet();
!         {
!           Iterator iter = envelope.iterator();
!           while (iter.hasNext()) {
!             Surface current = (Surface) iter.next();
!             Space other;
!             if (current.getFrontDomain() == active) {
!               other = current.getBackDomain();
!             } else {
!               other = current.getFrontDomain();
!             }
!             if (other != empty) {
!               spaces.add(other);
!             }
            }
!         }
!         Set surfaces = new HashSet();
!         surfaces.addAll(envelope);
!         {
!           Iterator iter = spaces.iterator();
!           while (iter.hasNext()) {
!             Space current = (Space) iter.next();
!             surfaces.addAll(current.getEnvelope());
            }
          }
!         {
!           Set holes = new HashSet();
!           Iterator iter = surfaces.iterator();
!           while (iter.hasNext()) {
!             Surface current = (Surface) iter.next();
!             holes.addAll(current.getHoles());
!           }
!           surfaces.addAll(holes);
          }
+         edges.addAll(Surface.edges(surfaces));
        }
        {
!         Iterator iter = Selection.primary().iterator();
          while (iter.hasNext()) {
!           Geometric current = (Geometric) iter.next();
!           if (current instanceof Space) {
!             Space space = (Space) current;
!             edges.addAll(space.getEdges());
!           }
          }
        }
***************
*** 1976,1982 ****
    private void drawSelectionMode(GLAutoDrawable gld) {
      Space space = Project.getInstance().getActiveSpace();
- 
      Collection surfaces = new LinkedList();
!     //space.collectSurfaces(surfaces);
      surfaces.addAll(space.getSurfaces());
      surfaces.addAll(tempSurfaces);
--- 1987,1992 ----
    private void drawSelectionMode(GLAutoDrawable gld) {
      Space space = Project.getInstance().getActiveSpace();
      Collection surfaces = new LinkedList();
!     
      surfaces.addAll(space.getSurfaces());
      surfaces.addAll(tempSurfaces);

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.56, 1.57

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20338/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
Implemented import for csv files with points from landmålergården

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** GUI.java	19 Dec 2006 09:32:56 -0000	1.56
--- GUI.java	8 Jan 2007 12:31:48 -0000	1.57
***************
*** 194,198 ****
      fileImport.addActionListener(new FileImportActionListener());
      fileImport.setMnemonic(KeyEvent.VK_I);
!     fileImport.setEnabled(false);
      file.add(fileImport);
  
--- 194,198 ----
      fileImport.addActionListener(new FileImportActionListener());
      fileImport.setMnemonic(KeyEvent.VK_I);
!     fileImport.setEnabled(true);
      file.add(fileImport);
  

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions FileImportActionListener.java, 1.3, 1.4

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20338/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	FileImportActionListener.java 
Log Message:
Implemented import for csv files with points from landmålergården

Index: FileImportActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileImportActionListener.java	21 Nov 2006 17:29:34 -0000	1.3
--- FileImportActionListener.java	8 Jan 2007 12:31:48 -0000	1.4
***************
*** 8,11 ****
--- 8,16 ----
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
+ import java.io.File;
+ 
+ import javax.swing.JFileChooser;
+ 
+ import net.sourceforge.bprocessor.model.Project;
  
  import org.apache.log4j.Logger;
***************
*** 29,33 ****
     */
    public void actionPerformed(ActionEvent e) {
!     //TODO implement me
    }
  }
--- 34,50 ----
     */
    public void actionPerformed(ActionEvent e) {
!     JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath());
!     int lstate = loadChooser.showOpenDialog(null);
!     File lfile = loadChooser.getSelectedFile();
!     if (lfile != null &&
!         lstate == JFileChooser.APPROVE_OPTION) {
!       try {
!         Project.getInstance().importCSV(lfile);
!       } catch (Exception ex) {
!         log.error("Could not open file: " + lfile, ex);
!       }
!     }
    }
+   
+   
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.107, 1.108

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20304/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:
Implemented import for csv files with points from landmålergården

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** Project.java	6 Jan 2007 21:06:59 -0000	1.107
--- Project.java	8 Jan 2007 12:31:26 -0000	1.108
***************
*** 11,14 ****
--- 11,15 ----
  import java.io.File;
  import java.io.FileInputStream;
+ import java.io.IOException;
  import java.io.InputStreamReader;
  import java.util.ArrayList;
***************
*** 1128,1131 ****
--- 1129,1188 ----
      return copyBuffer;
    }
+ 
+   /**
+    * Load a file
+    * @param lfile The file to load
+    * @throws IOException 
+    * @exception IOException Thrown if an exception occurs
+    */
+   public void importCSV(File lfile) throws IOException {
+     BufferedReader bf;
+     bf = new BufferedReader(
+         new InputStreamReader(new FileInputStream(lfile)));
+     String current = "";
+     Vertex firstVer = null; 
+     Vertex fromVer = null;
+     Vertex toVer; 
+     double x = 0;
+     double y = 0;
+     double z = 0;
+     int curId = 0;
+     int lastId = 0;
+     int i = 0;
+     List<Edge> newEdges = new LinkedList<Edge>();
+     current = bf.readLine();
+     while (current != null) {
+       StringTokenizer st = new StringTokenizer(current, ";");
+       st.nextToken();
+       st.nextToken();
+       y = Double.parseDouble(st.nextToken());
+       x = Double.parseDouble(st.nextToken());
+       z = Double.parseDouble(st.nextToken());
+       st.nextToken();
+       curId = Integer.parseInt(st.nextToken());
+       
+       if (curId <= lastId) {
+         newEdges.add(new Edge(fromVer, firstVer));
+         lastId = 0;     
+       }
+       
+       if (curId == 1) {
+         firstVer = new Vertex(x, y, z);
+         fromVer = new Vertex(x, y, z);  
+         lastId = curId;
+       }
+       
+       if (curId >= lastId && curId > 1) {
+         toVer = new Vertex(x, y, z);
+         newEdges.add(new Edge(fromVer, toVer));
+         fromVer = toVer;
+         lastId = curId;
+       } 
+       current = bf.readLine();
+     }
+     for (Edge e : newEdges) {
+       Project.getInstance().world().insert(e);
+     }
+   }
    
  }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool CreateSpaceActionListener.java, 1.14, 1.15

[Nikolaj B. <nbr...@us...>]

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

Modified Files:
	CreateSpaceActionListener.java 
Log Message:
Fixed types so the id field is now correct aswell. Also added so types are saved and loaded.

Index: CreateSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CreateSpaceActionListener.java	17 Dec 2006 20:24:50 -0000	1.14
--- CreateSpaceActionListener.java	6 Jan 2007 21:11:08 -0000	1.15
***************
*** 22,26 ****
  import java.awt.event.MouseListener;
  
- import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
--- 22,25 ----
***************
*** 114,118 ****
      if (functional) {
        dialog = new JDialog(GUI.getInstance(), "Create Functional Space", true);
!       cta = new ClassificationTextAttribute(
            new Attribute("Classification", Project.getInstance().getFunctionalClas(), null, 1));
      } else {
--- 113,117 ----
      if (functional) {
        dialog = new JDialog(GUI.getInstance(), "Create Functional Space", true);
!       /*cta = new ClassificationTextAttribute(
            new Attribute("Classification", Project.getInstance().getFunctionalClas(), null, 1));
      } else {
***************
*** 120,123 ****
--- 119,123 ----
        cta = new ClassificationTextAttribute(
            new Attribute("Classification", Project.getInstance().getConstructionClas(), null, 1));
+           */    
      }
      Container dialogContent = dialog.getContentPane();

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/attrview ClassificationIdAttribute.java, 1.3, 1.4 GenericPanel.java, 1.30, 1.31

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31108/src/net/sourceforge/bprocessor/gui/attrview

Modified Files:
	ClassificationIdAttribute.java GenericPanel.java 
Log Message:
Fixed types so the id field is now correct aswell. Also added so types are saved and loaded.

Index: GenericPanel.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** GenericPanel.java	21 Dec 2006 14:22:28 -0000	1.30
--- GenericPanel.java	6 Jan 2007 21:10:46 -0000	1.31
***************
*** 214,218 ****
          if (a.getClassification() != null && 
              !a.getClassification().getId().equalsIgnoreCase("-1") &&
!             a.getLevel() != 4) {
            // Handles the id part of classification
            ClassificationIdAttribute caid = new ClassificationIdAttribute(a);
--- 214,218 ----
          if (a.getClassification() != null && 
              !a.getClassification().getId().equalsIgnoreCase("-1") &&
!             !a.getName().equalsIgnoreCase("Type")) {
            // Handles the id part of classification
            ClassificationIdAttribute caid = new ClassificationIdAttribute(a);

Index: ClassificationIdAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/ClassificationIdAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClassificationIdAttribute.java	16 Nov 2006 23:20:04 -0000	1.3
--- ClassificationIdAttribute.java	6 Jan 2007 21:10:46 -0000	1.4
***************
*** 65,69 ****
      if (!attribute.getClassification().getName().equalsIgnoreCase("Classification") &&
          !attribute.getClassification().getId().equalsIgnoreCase("-1")) {
!       component.add(createValueLabel(attribute.getClassification().getFullId()));  
      }
      Box header = Box.createHorizontalBox();
--- 65,70 ----
      if (!attribute.getClassification().getName().equalsIgnoreCase("Classification") &&
          !attribute.getClassification().getId().equalsIgnoreCase("-1")) {
!       component.add(createValueLabel(attribute.getClassification()
!           .getFullId(attribute.getLevel())));  
      }
      Box header = Box.createHorizontalBox();
***************
*** 190,194 ****
        if (attribute.getClassification() != null  
            && !attribute.getClassification().getName().equalsIgnoreCase("Classification")) {
!         editor = (JTextField) createValueEditor(attribute.getClassification().getFullId());
        } else {
          editor = (JTextField) createValueEditor("");
--- 191,196 ----
        if (attribute.getClassification() != null  
            && !attribute.getClassification().getName().equalsIgnoreCase("Classification")) {
!         editor = (JTextField) createValueEditor(attribute.getClassification()
!             .getFullId(attribute.getLevel()));
        } else {
          editor = (JTextField) createValueEditor("");
***************
*** 234,238 ****
        editor.removeKeyListener(this);
        editor = null;
!       component.add(createValueLabel(clas.getFullId()));
        component.revalidate();
        valueChanged();
--- 236,240 ----
        editor.removeKeyListener(this);
        editor = null;
!       component.add(createValueLabel(clas.getFullId(attribute.getLevel())));
        component.revalidate();
        valueChanged();

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Classification.java, 1.5, 1.6 Space.java, 1.108, 1.109 Project.java, 1.106, 1.107 Attribute.java, 1.15, 1.16 Persistence.java, 1.30, 1.31

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29473/src/net/sourceforge/bprocessor/model

Modified Files:
	Classification.java Space.java Project.java Attribute.java 
	Persistence.java 
Log Message:
Fixed types so the id field is now correct aswell. Also added so types are saved and loaded.

Index: Attribute.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Attribute.java	10 Nov 2006 13:48:45 -0000	1.15
--- Attribute.java	6 Jan 2007 21:06:59 -0000	1.16
***************
*** 30,35 ****
    private Classification classification;
    
!   /** The level of the space ie if its space, element or part level */
!   private int level;
    
    /** The precision of the object */
--- 30,35 ----
    private Classification classification;
    
!   /** The space the classification is for */
!   private Space level;
    
    /** The precision of the object */
***************
*** 97,101 ****
     * @param level the level of the space ie 1: space, 2: element or 3: part
     */
!   public Attribute(String name, Object value, Classification classification, int level) {
      setName(name);
      setValue(value);
--- 97,101 ----
     * @param level the level of the space ie 1: space, 2: element or 3: part
     */
!   public Attribute(String name, Object value, Classification classification, Space  level) {
      setName(name);
      setValue(value);
***************
*** 216,220 ****
     * @return Returns the level.
     */
!   public int getLevel() {
      return level;
    }
--- 216,220 ----
     * @return Returns the level.
     */
!   public Space getLevel() {
      return level;
    }
***************
*** 223,227 ****
     * @param level The level of the space.
     */
!   public void setLevel(int level) {
      this.level = level;
    }
--- 223,227 ----
     * @param level The level of the space.
     */
!   public void setLevel(Space level) {
      this.level = level;
    }

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Persistence.java	5 Jan 2007 13:54:48 -0000	1.30
--- Persistence.java	6 Jan 2007 21:06:59 -0000	1.31
***************
*** 210,213 ****
--- 210,215 ----
            space.setClassification(Project.getInstance().
                getClassification(xml.getClassification(), 0));
+           space.setTypeClassification(Project.getInstance().
+               getProduktType(xml.getClassification()));
          } else {
            Classification newclas = new Classification("-1", xml.getClassification(), 
***************
*** 821,825 ****
          xml.setClassification(space.getClassification().getName());
        } else {
!         xml.setClassification(space.getClassification().getFullId());
        }
      } else {
--- 823,827 ----
          xml.setClassification(space.getClassification().getName());
        } else {
!         xml.setClassification(space.getClassification().getFullId(space));
        }
      } else {

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** Space.java	2 Jan 2007 17:48:58 -0000	1.108
--- Space.java	6 Jan 2007 21:06:59 -0000	1.109
***************
*** 1505,1512 ****
        if (isConstructionSpace()) { 
          res.add(new Attribute("Classification", 
!             Project.getInstance().getConstructionClas(), getClassification(), 1));
        } else {
          res.add(new Attribute("Classification", 
!             Project.getInstance().getFunctionalClas(), getClassification(), 1));
        }
      } else {
--- 1505,1512 ----
        if (isConstructionSpace()) { 
          res.add(new Attribute("Classification", 
!             Project.getInstance().getConstructionClas(), getClassification(), this));
        } else {
          res.add(new Attribute("Classification", 
!             Project.getInstance().getFunctionalClas(), getClassification(), this));
        }
      } else {
***************
*** 1516,1531 ****
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), 2));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getConstructionClas(), getClassification(), 2));
            }
          } else {
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), 2));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getFunctionalClas(), getClassification(), 2));
            }
          }
--- 1516,1531 ----
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), this));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getConstructionClas(), getClassification(), this));
            }
          } else {
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), this));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getFunctionalClas(), getClassification(), this));
            }
          }
***************
*** 1534,1549 ****
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), 3));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getConstructionClas(), getClassification(), 3));
            }
          } else {
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), 3));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getFunctionalClas(), getClassification(), 3));
            }
          }
--- 1534,1549 ----
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), this));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getConstructionClas(), getClassification(), this));
            }
          } else {
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), this));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getFunctionalClas(), getClassification(), this));
            }
          }
***************
*** 1552,1556 ****
      if (getClassification() != null && !getClassification().getProdukt().equalsIgnoreCase("")) {
        res.add(new Attribute("Type", Project.getInstance().
!           getType(getClassification().getName()), getTypeClassification(), 4));
      }
      res.add(new Attribute("ID", getId().toString(), false));
--- 1552,1556 ----
      if (getClassification() != null && !getClassification().getProdukt().equalsIgnoreCase("")) {
        res.add(new Attribute("Type", Project.getInstance().
!           getType(getClassification().getName()), getTypeClassification(), this));
      }
      res.add(new Attribute("ID", getId().toString(), false));

Index: Classification.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Classification.java	17 Dec 2006 20:23:36 -0000	1.5
--- Classification.java	6 Jan 2007 21:06:59 -0000	1.6
***************
*** 151,163 ****
    /**
     * Generates the full id for this classification
     * @return the full id
     */
!   public String getFullId() {
      String fullId = id.toString();
      Classification par = parent;
      if (par != null) {
!       while (!par.getName().equalsIgnoreCase("Classification")) {
!         fullId = par.getId() + "." + fullId;
!         par = par.getParent();
        }
      }
--- 151,193 ----
    /**
     * Generates the full id for this classification
+    * @param cur the Space that the full id is generated for
     * @return the full id
     */
!   public String getFullId(Space cur) {
!     Space current = cur;
      String fullId = id.toString();
+     if (current.getTypeClassification() != null) {
+       if (!("" + fullId.charAt(0)).equalsIgnoreCase("-")) {
+         if (!current.getTypeClassification().getId().equalsIgnoreCase("0")) {
+           fullId = current.getTypeClassification().getId() + fullId; 
+         }
+       } else {
+         if (!current.getTypeClassification().getId().equalsIgnoreCase("0")) {
+           fullId = "-" + current.getTypeClassification().getId() + fullId.replaceFirst("-", ""); 
+         }
+       }
+     }
      Classification par = parent;
      if (par != null) {
!       if (cur.getOwner().getLevel() != 2) {
!         current = cur.getOwner();
!         if (current.getClassification() == par) {
!           if (current.getTypeClassification() != null) {
!             fullId = current.getClassification().getFullId(current) + "." + fullId; 
!           } else {
!             fullId = current.getClassification().getFullId(current) + "." + fullId;
!           }
!           par = par.getParent();
!           current = current.getOwner();
!         } else {
!           fullId = current.getClassification().getFullId(current) + "." + fullId;
!           par = par.getParent();
!         }
!           
!       } else {
!         while (!par.getName().equalsIgnoreCase("Classification")) {
!           fullId = par.getId() + "." + fullId;
!           par = par.getParent();
!         }
        }
      }

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** Project.java	2 Jan 2007 18:30:55 -0000	1.106
--- Project.java	6 Jan 2007 21:06:59 -0000	1.107
***************
*** 932,935 ****
--- 932,953 ----
        while (st.hasMoreTokens()) {
          curid = st.nextToken();
+         if (("" + curid.charAt(0)).equalsIgnoreCase("-")) {
+           if (!Character.isDigit(curid.charAt(1))) {
+             if (!Character.isDigit(curid.charAt(2))) {
+               curid = "-" + curid.substring(3);
+             } else {
+               curid = "-" + curid.substring(2);
+             }
+           }
+         } else {
+           if (!Character.isDigit(curid.charAt(0))) {
+             if (!Character.isDigit(curid.charAt(1))) {
+               curid = curid.substring(2);
+             } else {
+               curid = curid.substring(1);
+             }
+           }
+         }
+ 
          Iterator it = cl.getChildren().iterator();
          while (it.hasNext()) {
***************
*** 966,980 ****
    }
    
-   
    /**
     *  this method returns the produkt type
     *  @param id the id of the type wanted
!    *  @param clas is the classification the type is for
!    *  @return tmep the produkt type
     *  */
!   public Classification getProduktType(Classification clas, String id) {
!     Classification temp = getType(clas.getProdukt());
      
!     return temp;
    }
    
--- 984,1031 ----
    }
    
    /**
     *  this method returns the produkt type
     *  @param id the id of the type wanted
!    *  @return temp the produkt type
     *  */
!   public Classification getProduktType(String id) {
!     Classification temp = getClassification(id, 0);
!     Classification pt = Project.getInstance().getType(temp.getName());
!     StringTokenizer st = new StringTokenizer(id, ".");
!     String last = "";
!     while (st.hasMoreElements()) {
!       last = st.nextToken();
!     }
!     if (("" + last.charAt(0)).equalsIgnoreCase("-")) {
!       if (!Character.isDigit(last.charAt(1))) {
!         if (!Character.isDigit(last.charAt(2))) {
!           last = last.charAt(1) + "." + last.charAt(2);
!         } else {
!           last = last.charAt(1) + "";
!         }
!       }
!     } else {
!       if (!Character.isDigit(last.charAt(0))) {
!         if (!Character.isDigit(last.charAt(1))) {
!           last = last.charAt(0) + "." + last.charAt(1);
!         } else {
!           last = last.charAt(0) + "";
!         }
!       }
!     }
!     StringTokenizer s = new StringTokenizer(last, ".");
!     while (s.hasMoreTokens()) {
! 
!       String curid = s.nextToken();
!       Iterator it = pt.getChildren().iterator();
!       while (it.hasNext()) {
!         Classification current = (Classification) it.next();
!         if (curid.equalsIgnoreCase(current.getId())) {
!           pt = current;
!         } 
!       }
!     }
      
!     return pt;
    }
    

[Bprocessor-commit] test/reference directions.out, 1.3, 1.4 normals.out, 1.2, 1.3

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

Update of /cvsroot/bprocessor/test/reference
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10356/reference

Modified Files:
	directions.out normals.out 
Log Message:
Updated output from normals and directions to reflect changes in Vertex.toString()

Index: normals.out
===================================================================
RCS file: /cvsroot/bprocessor/test/reference/normals.out,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** normals.out	8 Dec 2006 10:55:21 -0000	1.2
--- normals.out	5 Jan 2007 13:55:40 -0000	1.3
***************
*** 3,14 ****
  S2 normal: V[-1.0, 0.0, 0.0]
  S3 normal: V[0.0, 1.0, 0.0]
! S4 normal: V[1.0, 0.0, -0.0]
  S5 normal: V[0.0, -1.0, 0.0]
  S6 normal: V[0.0, 0.0, 1.0]
  -- normal2 --
  S1 normal: V[0.0, 0.0, -1.0]
! S2 normal: V[1.0, -0.0, 0.0]
  S3 normal: V[0.0, -1.0, 0.0]
! S4 normal: V[-1.0, -0.0, -0.0]
  S5 normal: V[0.0, 1.0, 0.0]
  S6 normal: V[0.0, 0.0, 1.0]
--- 3,14 ----
  S2 normal: V[-1.0, 0.0, 0.0]
  S3 normal: V[0.0, 1.0, 0.0]
! S4 normal: V[1.0, 0.0, 0.0]
  S5 normal: V[0.0, -1.0, 0.0]
  S6 normal: V[0.0, 0.0, 1.0]
  -- normal2 --
  S1 normal: V[0.0, 0.0, -1.0]
! S2 normal: V[1.0, 0.0, 0.0]
  S3 normal: V[0.0, -1.0, 0.0]
! S4 normal: V[-1.0, 0.0, 0.0]
  S5 normal: V[0.0, 1.0, 0.0]
  S6 normal: V[0.0, 0.0, 1.0]
***************
*** 16,19 ****
  S1 normal: V[0.0, 0.0, -1.0]
  S2 normal: V[0.0, 0.0, -1.0]
! S3 normal: V[-0.0, 0.0, 1.0]
  S4 normal: V[0.0, 0.0, 1.0]
--- 16,19 ----
  S1 normal: V[0.0, 0.0, -1.0]
  S2 normal: V[0.0, 0.0, -1.0]
! S3 normal: V[0.0, 0.0, 1.0]
  S4 normal: V[0.0, 0.0, 1.0]

Index: directions.out
===================================================================
RCS file: /cvsroot/bprocessor/test/reference/directions.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** directions.out	8 Dec 2006 16:43:20 -0000	1.3
--- directions.out	5 Jan 2007 13:55:40 -0000	1.4
***************
*** 1,8 ****
  -- normal1 --
    in own coordinate system:
!     S1 direction: LEFT in [i = V[0.0, 1.0, 0.0] j = V[1.0, -0.0, 0.0] n = V[0.0, 0.0, -1.0] o = V1[1.0, 1.0, 0.0]]
!     S2 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[0.0, 1.0, -0.0] n = V[-1.0, 0.0, 0.0] o = V1[1.0, 1.0, 0.0]]
      S3 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[1.0, 0.0, 0.0] n = V[0.0, 1.0, 0.0] o = V2[1.0, 6.0, 0.0]]
!     S4 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[0.0, -1.0, 0.0] n = V[1.0, 0.0, -0.0] o = V3[6.0, 6.0, 0.0]]
      S5 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[-1.0, 0.0, 0.0] n = V[0.0, -1.0, 0.0] o = V4[6.0, 1.0, 0.0]]
      S6 direction: LEFT in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V5[1.0, 1.0, 5.0]]
--- 1,8 ----
  -- normal1 --
    in own coordinate system:
!     S1 direction: LEFT in [i = V[0.0, 1.0, 0.0] j = V[1.0, 0.0, 0.0] n = V[0.0, 0.0, -1.0] o = V1[1.0, 1.0, 0.0]]
!     S2 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[0.0, 1.0, 0.0] n = V[-1.0, 0.0, 0.0] o = V1[1.0, 1.0, 0.0]]
      S3 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[1.0, 0.0, 0.0] n = V[0.0, 1.0, 0.0] o = V2[1.0, 6.0, 0.0]]
!     S4 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[0.0, -1.0, 0.0] n = V[1.0, 0.0, 0.0] o = V3[6.0, 6.0, 0.0]]
      S5 direction: LEFT in [i = V[0.0, 0.0, 1.0] j = V[-1.0, 0.0, 0.0] n = V[0.0, -1.0, 0.0] o = V4[6.0, 1.0, 0.0]]
      S6 direction: LEFT in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V5[1.0, 1.0, 5.0]]
***************
*** 44,51 ****
  -- normal2 --
    in own coordinate system:
!     S1 direction: LEFT in [i = V[0.0, 1.0, 0.0] j = V[1.0, -0.0, 0.0] n = V[0.0, 0.0, -1.0] o = V2[1.0, 1.0, 5.0]]
!     S2 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[0.0, 1.0, 0.0] n = V[1.0, -0.0, 0.0] o = V2[1.0, 1.0, 5.0]]
      S3 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[1.0, 0.0, 0.0] n = V[0.0, -1.0, 0.0] o = V3[1.0, 6.0, 5.0]]
!     S4 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[0.0, -1.0, 0.0] n = V[-1.0, -0.0, -0.0] o = V4[6.0, 6.0, 5.0]]
      S5 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[-1.0, 0.0, 0.0] n = V[0.0, 1.0, 0.0] o = V5[6.0, 1.0, 5.0]]
      S6 direction: LEFT in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V6[1.0, 1.0, 0.0]]
--- 44,51 ----
  -- normal2 --
    in own coordinate system:
!     S1 direction: LEFT in [i = V[0.0, 1.0, 0.0] j = V[1.0, 0.0, 0.0] n = V[0.0, 0.0, -1.0] o = V2[1.0, 1.0, 5.0]]
!     S2 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[0.0, 1.0, 0.0] n = V[1.0, 0.0, 0.0] o = V2[1.0, 1.0, 5.0]]
      S3 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[1.0, 0.0, 0.0] n = V[0.0, -1.0, 0.0] o = V3[1.0, 6.0, 5.0]]
!     S4 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[0.0, -1.0, 0.0] n = V[-1.0, 0.0, 0.0] o = V4[6.0, 6.0, 5.0]]
      S5 direction: LEFT in [i = V[0.0, 0.0, -1.0] j = V[-1.0, 0.0, 0.0] n = V[0.0, 1.0, 0.0] o = V5[6.0, 1.0, 5.0]]
      S6 direction: LEFT in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V6[1.0, 1.0, 0.0]]
***************
*** 89,93 ****
      S1 direction: LEFT in [i = V[-1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, -1.0] o = V4[5.0, 1.0, 0.0]]
      S2 direction: LEFT in [i = V[-1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, -1.0] o = V10[10.0, 1.0, 0.0]]
!     S3 direction: LEFT in [i = V[0.0, -1.0, 0.0] j = V[1.0, 0.0, 0.0] n = V[-0.0, 0.0, 1.0] o = V14[11.0, 5.0, 0.0]]
      S4 direction: LEFT in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V20[16.0, 1.0, 0.0]]
    in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V[0.0, 0.0, 0.0]]:
--- 89,93 ----
      S1 direction: LEFT in [i = V[-1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, -1.0] o = V4[5.0, 1.0, 0.0]]
      S2 direction: LEFT in [i = V[-1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, -1.0] o = V10[10.0, 1.0, 0.0]]
!     S3 direction: LEFT in [i = V[0.0, -1.0, 0.0] j = V[1.0, 0.0, 0.0] n = V[0.0, 0.0, 1.0] o = V14[11.0, 5.0, 0.0]]
      S4 direction: LEFT in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V20[16.0, 1.0, 0.0]]
    in [i = V[1.0, 0.0, 0.0] j = V[0.0, 1.0, 0.0] n = V[0.0, 0.0, 1.0] o = V[0.0, 0.0, 0.0]]:

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.69, 1.70 Vertex.java, 1.53, 1.54 Surface.java, 1.128, 1.129 Geometry.java, 1.41, 1.42 Persistence.java, 1.29, 1.30

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9923/src/net/sourceforge/bprocessor/model

Modified Files:
	Edge.java Vertex.java Surface.java Geometry.java 
	Persistence.java 
Log Message:
Implemented a new normal computation function
Changed Vertex.toString() to round values  to get rid of -0 etc.

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** Surface.java	2 Jan 2007 17:48:58 -0000	1.128
--- Surface.java	5 Jan 2007 13:54:47 -0000	1.129
***************
*** 1399,1402 ****
--- 1399,1493 ----
      return Geometry.normal(getVertices());
    }
+   
+   /**
+    * 
+    * @return value
+    */
+   public Vertex normal0() {
+     int size = edges.size();
+     Edge[] e = new Edge[size];
+     double[] xs = new double[size];
+     double[] ys = new double[size];
+     double[] zs = new double[size];
+     final double eps = 0.0000000001; 
+     edges.toArray(e);
+     Edge e0 = e[0];
+     Edge e1 = e[1];
+     Vertex current;
+     if (e0.to == e1.from || e0.to == e1.to) {
+       current = e0.from;
+     } else {
+       current = e0.to;
+     }
+     for (int i = 0; i < e.length; i++) {
+       xs[i] = current.x;
+       ys[i] = current.y;
+       zs[i] = current.z;
+       if (current == e[i].from) {
+         current = e[i].to;
+       } else {
+         current = e[i].from;
+       }
+     }
+     double vx = xs[1] - xs[0];
+     double vy = ys[1] - ys[0];
+     double vz = zs[1] - zs[0];
+     double x = 0.0;
+     double y = 0.0;
+     double z = 0.0;
+     for (int i = 2; i < e.length; i++) {
+       double ux = xs[i] - xs[i - 1];
+       double uy = ys[i] - ys[i - 1];
+       double uz = zs[i] - zs[i - 1];
+       x = Math.abs(vy * uz - vz * uy);
+       y = Math.abs(vz * ux - vx * uz);
+       z = Math.abs(vx * uy - vy * ux);
+       if (x > eps || y > eps || z > eps) {
+         break;
+       }
+     }
+     double[] coord;
+     if (y > x) {
+       if (y > z) {
+         coord = xs;
+       } else {
+         coord = ys;
+       }
+     } else {
+       if (x > z) {
+         coord = zs;
+       } else {
+         coord = ys;
+       }
+     }
+     double min = Double.MAX_VALUE;
+     int inx1 = -1;
+     for (int i = 0; i < e.length; i++) {
+       if (coord[i] <= min) {
+         inx1 = i;
+         min = coord[i];
+       }
+     }
+     int inx0 = inx1 == 0 ? e.length - 1 : inx1 - 1;
+     int inx2 = (inx1 + 1) % e.length;
+     
+     vx = xs[inx1] - xs[inx0];
+     vy = ys[inx1] - ys[inx0];
+     vz = zs[inx1] - zs[inx0];
+     
+     double ux = xs[inx2] - xs[inx1];
+     double uy = ys[inx2] - ys[inx1];
+     double uz = zs[inx2] - zs[inx1];
+     
+     x = vy * uz - vz * uy;
+     y = vz * ux - vx * uz;
+     z = vx * uy - vy * ux;
+     double length = Math.sqrt(x * x + y * y + z * z);
+     x = x / length;
+     y = y / length;
+     z = z / length;
+     
+     return new Vertex(x, y, z);
+   }
  
    /**

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** Edge.java	2 Jan 2007 17:48:58 -0000	1.69
--- Edge.java	5 Jan 2007 13:54:47 -0000	1.70
***************
*** 36,43 ****
  
    /** The start vertex */
!   private Vertex from;
  
    /** The end vertex */
!   private Vertex to;
  
    /** Constructor */
--- 36,43 ----
  
    /** The start vertex */
!   protected Vertex from;
  
    /** The end vertex */
!   protected Vertex to;
  
    /** Constructor */

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Vertex.java	2 Jan 2007 17:48:58 -0000	1.53
--- Vertex.java	5 Jan 2007 13:54:47 -0000	1.54
***************
*** 33,43 ****
  
    /** The x coordinate */
!   private double x;
    
    /** The y coordinate */
!   private double y;
    
    /** The z coordinate */
!   private double z;
    
    /**
--- 33,43 ----
  
    /** The x coordinate */
!   protected double x;
    
    /** The y coordinate */
!   protected double y;
    
    /** The z coordinate */
!   protected double z;
    
    /**
***************
*** 402,407 ****
     */
    public String toString() {
!     return getName() + "[" + x + ", " + y +
!       ", " + z + "]";
    }
  
--- 402,410 ----
     */
    public String toString() {
!     return getName() + 
!       "[" + Geometry.round(x) + 
!       ", " + Geometry.round(y) +
!       ", " + Geometry.round(z) + 
!       "]";
    }
  

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Geometry.java	2 Jan 2007 18:30:33 -0000	1.41
--- Geometry.java	5 Jan 2007 13:54:47 -0000	1.42
***************
*** 22,29 ****
   */
  public class Geometry {
-   
-   /** The logger */
    private static Logger log = Logger.getLogger(Geometry.class);
    
    /**
     * Find all edges in given space and all its subspaces that are active parts,
--- 22,43 ----
   */
  public class Geometry {
    private static Logger log = Logger.getLogger(Geometry.class);
    
+   /** Epsilon value used to judge if a double value considered zero */
+   public static final double EPS = 0.0000000001;
+   
+   /**
+    * 
+    * @param value double
+    * @return rounded value
+    */
+   public static double round(double value) {
+     double factor = 10000000000.0;
+     double d = value * factor;
+     long l = Math.round(d);
+     double result = (double) l / factor;
+     return result; 
+   }
+   
    /**
     * Find all edges in given space and all its subspaces that are active parts,
***************
*** 451,453 ****
--- 465,475 ----
      }
    }
+   
+   /**
+    * Display info on the log
+    * @param object An object to print as info on the log
+    */
+   public static void info(Object object) {
+     log.info(object);
+   }
  }

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Persistence.java	18 Dec 2006 09:11:47 -0000	1.29
--- Persistence.java	5 Jan 2007 13:54:48 -0000	1.30
***************
*** 1058,1074 ****
    }
    
-   
-   /**
-    * 
-    * @param value double
-    * @return rounded value
-    */
-   private static double round(double value) {
-     double factor = 10000000000.0;
-     double d = value * factor;
-     long l = Math.round(d);
-     return (double) l / factor; 
-   }
-   
    /**
     * Create an xml VertexImpl and place it in the map
--- 1058,1061 ----
***************
*** 1084,1090 ****
      }
      map.put(vertex, xml);
!     xml.setX(round(vertex.getX()));
!     xml.setY(round(vertex.getY()));
!     xml.setZ(round(vertex.getZ()));
      return xml;
    }
--- 1071,1077 ----
      }
      map.put(vertex, xml);
!     xml.setX(Geometry.round(vertex.getX()));
!     xml.setY(Geometry.round(vertex.getY()));
!     xml.setZ(Geometry.round(vertex.getZ()));
      return xml;
    }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.105, 1.106

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5559/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:
changed the way new works a bit

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** Project.java	2 Jan 2007 17:48:58 -0000	1.105
--- Project.java	2 Jan 2007 18:30:55 -0000	1.106
***************
*** 698,706 ****
    public void close() {
      Selection.primary().clear();
!     clear();
!     makeClean();
!     setName("new project");
!     resetHistory();
!     setSavePath(null);
    }
  
--- 698,702 ----
    public void close() {
      Selection.primary().clear();
!     instance = new Project();
    }
  

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions FileNewActionListener.java, 1.9, 1.10

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5550/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	FileNewActionListener.java 
Log Message:
changed the way new works a bit

Index: FileNewActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileNewActionListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FileNewActionListener.java	21 Nov 2006 17:29:34 -0000	1.9
--- FileNewActionListener.java	2 Jan 2007 18:30:51 -0000	1.10
***************
*** 32,35 ****
--- 32,36 ----
      Project.getInstance().close();
      Project.getInstance().changed(Project.getInstance());
+     Project.getInstance().makeClean();
    }
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.40, 1.41 Camera.java, 1.31, 1.32

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5541/src/net/sourceforge/bprocessor/model

Modified Files:
	Geometry.java Camera.java 
Log Message:
made a bit generic

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Camera.java	29 Dec 2006 13:31:55 -0000	1.31
--- Camera.java	2 Jan 2007 18:30:33 -0000	1.32
***************
*** 59,63 ****
    
    /** The list of clipplanes to this camera*/
!   private ArrayList clipplanes;
    
    /**
--- 59,63 ----
    
    /** The list of clipplanes to this camera*/
!   private ArrayList<ClippingPlane> clipplanes;
    
    /**
***************
*** 65,69 ****
     */
    Camera() {
!     this.clipplanes = new ArrayList();
    }
    
--- 65,69 ----
     */
    Camera() {
!     this.clipplanes = new ArrayList<ClippingPlane>();
    }
    
***************
*** 82,86 ****
      this.roll = roll;
      this.focalwidth = 35;
!     this.clipplanes = new ArrayList();
      if (type == ORTHOGRAPHIC || type == PERSPECTIVE) {
        this.type = type;
--- 82,86 ----
      this.roll = roll;
      this.focalwidth = 35;
!     this.clipplanes = new ArrayList<ClippingPlane>();
      if (type == ORTHOGRAPHIC || type == PERSPECTIVE) {
        this.type = type;
***************
*** 426,434 ****
     */
    public void zoomOn(Collection c, double aspect) {
!     Set allVertices = Geometry.collect(c);
      
      if (!allVertices.isEmpty()) {
        //Computing center and radius of the minimal bounding sphere
!       Set notTested = new HashSet(allVertices);
        double radius = 0;
        Vertex p1 = null;
--- 426,434 ----
     */
    public void zoomOn(Collection c, double aspect) {
!     Set<Vertex> allVertices = Geometry.collect(c);
      
      if (!allVertices.isEmpty()) {
        //Computing center and radius of the minimal bounding sphere
!       Set<Vertex> notTested = new HashSet<Vertex>(allVertices);
        double radius = 0;
        Vertex p1 = null;
***************
*** 538,542 ****
     */
    public List getAttributes() {
!     ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName()));
      Attribute a = new Attribute("Type", type == ORTHOGRAPHIC ? "Orthographic" : "Perspective");
--- 538,542 ----
     */
    public List getAttributes() {
!     ArrayList<Attribute> res = new ArrayList<Attribute>();
      res.add(new Attribute("Name", getName()));
      Attribute a = new Attribute("Type", type == ORTHOGRAPHIC ? "Orthographic" : "Perspective");
***************
*** 544,558 ****
      res.add(a);
      
!     ArrayList cam = new ArrayList(3);
      cam.add(new Attribute("X", new Double(getCamera()[0])));
      cam.add(new Attribute("Y", new Double(getCamera()[1])));
      cam.add(new Attribute("Z", new Double(getCamera()[2])));
      res.add(new Attribute("Eye", cam));
!     ArrayList cen = new ArrayList(3);
      cen.add(new Attribute("X", new Double(getCenter()[0])));
      cen.add(new Attribute("Y", new Double(getCenter()[1])));
      cen.add(new Attribute("Z", new Double(getCenter()[2])));    
      res.add(new Attribute("Look-at", cen));
!     ArrayList roll = new ArrayList(3);
      roll.add(new Attribute("X", new Double(getRoll()[0])));
      roll.add(new Attribute("Y", new Double(getRoll()[1])));
--- 544,558 ----
      res.add(a);
      
!     ArrayList<Attribute> cam = new ArrayList<Attribute>(3);
      cam.add(new Attribute("X", new Double(getCamera()[0])));
      cam.add(new Attribute("Y", new Double(getCamera()[1])));
      cam.add(new Attribute("Z", new Double(getCamera()[2])));
      res.add(new Attribute("Eye", cam));
!     ArrayList<Attribute> cen = new ArrayList<Attribute>(3);
      cen.add(new Attribute("X", new Double(getCenter()[0])));
      cen.add(new Attribute("Y", new Double(getCenter()[1])));
      cen.add(new Attribute("Z", new Double(getCenter()[2])));    
      res.add(new Attribute("Look-at", cen));
!     ArrayList<Attribute> roll = new ArrayList<Attribute>(3);
      roll.add(new Attribute("X", new Double(getRoll()[0])));
      roll.add(new Attribute("Y", new Double(getRoll()[1])));
***************
*** 639,643 ****
      currentCamera.setCamera(new double[]{cen.getX() + n.getX(), 
          cen.getY() + n.getY(), cen.getZ() + n.getZ()});
!     Collection < Surface > c = new LinkedList < Surface > ();
      c.add(s);
      currentCamera.zoomOn(c, 1.0);
--- 639,643 ----
      currentCamera.setCamera(new double[]{cen.getX() + n.getX(), 
          cen.getY() + n.getY(), cen.getZ() + n.getZ()});
!     Collection<Surface> c = new LinkedList<Surface>();
      c.add(s);
      currentCamera.zoomOn(c, 1.0);

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Geometry.java	13 Dec 2006 17:43:29 -0000	1.40
--- Geometry.java	2 Jan 2007 18:30:33 -0000	1.41
***************
*** 399,405 ****
     * @return Set of vertices
     */
!   public static Set collect(Collection geometrics) {
      Iterator it = geometrics.iterator();
!     Set result = new  HashSet();
      while (it.hasNext()) {
        Object o = it.next();
--- 399,405 ----
     * @return Set of vertices
     */
!   public static Set<Vertex> collect(Collection geometrics) {
      Iterator it = geometrics.iterator();
!     Set<Vertex> result = new  HashSet<Vertex>();
      while (it.hasNext()) {
        Object o = it.next();

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool RotationTool.java, 1.24, 1.25

[rimestad <rim...@us...>]

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

Modified Files:
	RotationTool.java 
Log Message:
added some feedback and removed drawing of snap lines for 15degree angles

Index: RotationTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** RotationTool.java	2 Jan 2007 17:45:40 -0000	1.24
--- RotationTool.java	2 Jan 2007 18:29:50 -0000	1.25
***************
*** 236,239 ****
--- 236,243 ----
            edges.addAll(Selection.primary());
          }
+       } else {
+         Line l = new Line(p1, current.vertex().minus(p1));
+         l.setActive(true);
+         edges.add(l);
        }
      }
***************
*** 381,385 ****
  
        //draw lines
!       gl.glColor3d(0.2, 0.2, 0.2);
        gl.glLineWidth(1.0f);
        Iterator < Line > iter = edges.iterator();
--- 385,389 ----
  
        //draw lines
!       /*gl.glColor3d(0.2, 0.2, 0.2);
        gl.glLineWidth(1.0f);
        Iterator < Line > iter = edges.iterator();
***************
*** 392,396 ****
          gl.glVertex3d(to.getX(), to.getY(), to.getZ());
          gl.glEnd();
!       }
      }
  
--- 396,400 ----
          gl.glVertex3d(to.getX(), to.getY(), to.getZ());
          gl.glEnd();
!       }*/
      }
  

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Line.java, 1.29, 1.30 Project.java, 1.104, 1.105 CoordinateSystem.java, 1.32, 1.33 Entity.java, 1.12, 1.13 Edge.java, 1.68, 1.69 Vertex.java, 1.52, 1.53 ClippingPlane.java, 1.15, 1.16 Cylinder.java, 1.1, 1.2 Surface.java, 1.127, 1.128 Space.java, 1.107, 1.108 Point.java, 1.13, 1.14 Plane.java, 1.27, 1.28 Constructor.java, 1.14, 1.15

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20432/src/net/sourceforge/bprocessor/model

Modified Files:
	Line.java Project.java CoordinateSystem.java Entity.java 
	Edge.java Vertex.java ClippingPlane.java Cylinder.java 
	Surface.java Space.java Point.java Plane.java Constructor.java 
Log Message:
Changed the javadoc to use inheritdoc and not see

Index: Constructor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Constructor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Constructor.java	12 Nov 2006 22:57:06 -0000	1.14
--- Constructor.java	2 Jan 2007 17:48:58 -0000	1.15
***************
*** 103,109 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Geometric#collect()
!    */
    public Set collect() {
      Set res = new HashSet();
--- 103,107 ----
    }
    
!   /** {@inheritDoc} */
    public Set collect() {
      Set res = new HashSet();
***************
*** 119,130 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#center()
!    */
    public abstract Vertex center();
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#delete()
!    */
    public abstract void delete();
  
--- 117,124 ----
    }
    
!   /** {@inheritDoc} */
    public abstract Vertex center();
    
!   /** {@inheritDoc} */
    public abstract void delete();
  
***************
*** 185,189 ****
    }  
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public void move(double x, double y, double z) {
      Iterator it = collect().iterator();
--- 179,183 ----
    }  
    
!   /** {@inheritDoc} */
    public void move(double x, double y, double z) {
      Iterator it = collect().iterator();
***************
*** 235,239 ****
      }
      
!     /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
      public void move(double x, double y, double z) {
        parent().move(x, y, z);
--- 229,233 ----
      }
      
!     /** {@inheritDoc} */
      public void move(double x, double y, double z) {
        parent().move(x, y, z);
***************
*** 241,245 ****
      }
      
!     /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
      public Vertex canMove(double x, double y, double z, Collection entities) {
        return parent().canMove(x, y, z, entities);
--- 235,239 ----
      }
      
!     /** {@inheritDoc} */
      public Vertex canMove(double x, double y, double z, Collection entities) {
        return parent().canMove(x, y, z, entities);

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CoordinateSystem.java	11 Dec 2006 10:44:47 -0000	1.32
--- CoordinateSystem.java	2 Jan 2007 17:48:58 -0000	1.33
***************
*** 80,84 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 80,84 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
***************
*** 312,332 ****
    }
  
!    /**
!    * @see net.sourceforge.bprocessor.model.Entity#center()
!    */
    public Vertex center() {
      return getOrigin();
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#delete()
!    */
    public void delete() {
      getOwner().remove(this);
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes()
!    */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
--- 312,326 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex center() {
      return getOrigin();
    }
  
!   /** {@inheritDoc} */
    public void delete() {
      getOwner().remove(this);
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
***************
*** 365,371 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 359,363 ----
    }
    
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 401,407 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      if (onlyPlane()) {
--- 393,397 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      if (onlyPlane()) {
***************
*** 456,460 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
    public String getName() {
      return "CS-" + getId();
--- 446,450 ----
    }
  
!   /** {@inheritDoc} */
    public String getName() {
      return "CS-" + getId();

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** Surface.java	12 Dec 2006 13:59:14 -0000	1.127
--- Surface.java	2 Jan 2007 17:48:58 -0000	1.128
***************
*** 1165,1169 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      Vertex dir = new Vertex(x, y, z);
--- 1165,1169 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      Vertex dir = new Vertex(x, y, z);
***************
*** 1698,1704 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      if (getOwner() == Project.getInstance().world()) {
--- 1698,1702 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      if (getOwner() == Project.getInstance().world()) {

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** Edge.java	29 Dec 2006 15:17:59 -0000	1.68
--- Edge.java	2 Jan 2007 17:48:58 -0000	1.69
***************
*** 298,302 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 298,302 ----
    }
    
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
***************
*** 607,613 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Edge";
--- 607,611 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Edge";

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ClippingPlane.java	18 Dec 2006 09:11:46 -0000	1.15
--- ClippingPlane.java	2 Jan 2007 17:48:58 -0000	1.16
***************
*** 300,304 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public void move(double x, double y, double z) {
      center().move(x, y, z);
--- 300,304 ----
    }
  
!   /** {@inheritDoc} */
    public void move(double x, double y, double z) {
      center().move(x, y, z);
***************
*** 306,317 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#canMove(double, double, double, Collection) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      return new Vertex(x, y, z).projectOnto(plane.normal());
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 306,315 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      return new Vertex(x, y, z).projectOnto(plane.normal());
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 330,336 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      String s = "Clippingplane";
--- 328,332 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      String s = "Clippingplane";
***************
*** 338,344 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes(List)
!    */
    public void setAttributes(List attributes) {
      Iterator iter = attributes.iterator();
--- 334,338 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Iterator iter = attributes.iterator();

Index: Point.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Point.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Point.java	3 Dec 2006 17:51:23 -0000	1.13
--- Point.java	2 Jan 2007 17:48:58 -0000	1.14
***************
*** 30,35 ****
      super();
    }
! 
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 30,35 ----
      super();
    }
!   
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
***************
*** 52,58 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes()
!    */
    public void setAttributes(List attributes) {
      Vertex orig = getOrigin();
--- 52,56 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Vertex orig = getOrigin();
***************
*** 62,68 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 60,64 ----
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 73,84 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "B-Point";
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
    public String getName() {
      return "P-" + getId();
--- 69,78 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "B-Point";
    }
    
!   /** {@inheritDoc} */
    public String getName() {
      return "P-" + getId();

Index: Plane.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Plane.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Plane.java	13 Dec 2006 17:45:17 -0000	1.27
--- Plane.java	2 Jan 2007 17:48:58 -0000	1.28
***************
*** 256,265 ****
        result = Y;
        coefficient = Math.abs(b);
!     };
      
      if (Math.abs(c) > coefficient) {
        result = Z;
        coefficient = Math.abs(c);
!     };
      
      return result;
--- 256,265 ----
        result = Y;
        coefficient = Math.abs(b);
!     }
      
      if (Math.abs(c) > coefficient) {
        result = Z;
        coefficient = Math.abs(c);
!     }
      
      return result;

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** Project.java	30 Dec 2006 15:30:35 -0000	1.104
--- Project.java	2 Jan 2007 17:48:58 -0000	1.105
***************
*** 769,775 ****
  
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Project";
--- 769,773 ----
  
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Project";
***************
*** 827,838 ****
      BufferedReader bf;
      if (construction) {
!       bf = new BufferedReader
!         (new InputStreamReader(new FileInputStream("construction2.txt"), "ISO-8859-1"));
        clas = new Classification(0);
        parent  = new Classification(0);
        last = new Classification(0); 
      } else {
!       bf = new BufferedReader
!         (new InputStreamReader(new FileInputStream("functionals.txt"), "ISO-8859-1"));
        clas = new Classification(1);
        parent  = new Classification(1);
--- 825,836 ----
      BufferedReader bf;
      if (construction) {
!       bf = new BufferedReader(
!           new InputStreamReader(new FileInputStream("construction2.txt"), "ISO-8859-1"));
        clas = new Classification(0);
        parent  = new Classification(0);
        last = new Classification(0); 
      } else {
!       bf = new BufferedReader(
!           new InputStreamReader(new FileInputStream("functionals.txt"), "ISO-8859-1"));
        clas = new Classification(1);
        parent  = new Classification(1);

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** Space.java	17 Dec 2006 20:23:36 -0000	1.107
--- Space.java	2 Jan 2007 17:48:58 -0000	1.108
***************
*** 1583,1589 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      if (proto != null) {
--- 1583,1587 ----
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      if (proto != null) {
***************
*** 2280,2285 ****
      }
    }
! 
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double)*/
    public void move(double x, double y, double z) {
      Iterator iter = collect().iterator();
--- 2278,2283 ----
      }
    }
!   
!   /** {@inheritDoc} */
    public void move(double x, double y, double z) {
      Iterator iter = collect().iterator();
***************
*** 2289,2293 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 2287,2291 ----
    }
    
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through

Index: Line.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Line.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Line.java	13 Dec 2006 17:44:16 -0000	1.29
--- Line.java	2 Jan 2007 17:48:58 -0000	1.30
***************
*** 127,133 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes()
!    */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
--- 127,131 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
***************
*** 149,155 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 147,151 ----
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 188,194 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "B-Line";
--- 184,188 ----
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "B-Line";
***************
*** 203,216 ****
    }
  
!   /**
!    * @see @see net.sourceforge.bprocessor.model.Geometry#degreesAboutY(Vertex)
!    */
    public double degreesAboutY() {
      return Geometry.degreesAboutY(dir);
    }
  
!   /**
!    * @see @see net.sourceforge.bprocessor.model.Geometry#degreesAboutZ(Vertex)
!    */
    public double degreesAboutZ() {
      return Geometry.degreesAboutZ(dir);
--- 197,206 ----
    }
  
!   /** {@inheritDoc} */
    public double degreesAboutY() {
      return Geometry.degreesAboutY(dir);
    }
  
!   /** {@inheritDoc} */
    public double degreesAboutZ() {
      return Geometry.degreesAboutZ(dir);
***************
*** 405,414 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
    public String getName() {
      return "L-" + getId();
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 395,404 ----
    }
  
!   /** {@inheritDoc} */
    public String getName() {
      return "L-" + getId();
    }
    
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Vertex.java	8 Dec 2006 10:53:31 -0000	1.52
--- Vertex.java	2 Jan 2007 17:48:58 -0000	1.53
***************
*** 458,464 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Vertex";
--- 458,462 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Vertex";
***************
*** 534,538 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 532,536 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through

Index: Cylinder.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Cylinder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Cylinder.java	30 Oct 2006 10:34:21 -0000	1.1
--- Cylinder.java	2 Jan 2007 17:48:58 -0000	1.2
***************
*** 119,128 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Parametric#setAttributes(List) */
    public void setAttributes(List attributes) {
      // TODO Auto-generated method stub
    }
  
!   /** @see net.sourceforge.bprocessor.model.Parametric#getGeneralName() */
    public List getAttributes() {
      // TODO Auto-generated method stub
--- 119,128 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      // TODO Auto-generated method stub
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      // TODO Auto-generated method stub
***************
*** 130,134 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#newInstance(Space) */
    public Modellor newInstance(Space s) {
      // TODO Auto-generated method stub
--- 130,134 ----
    }
    
!   /** {@inheritDoc} */
    public Modellor newInstance(Space s) {
      // TODO Auto-generated method stub
***************
*** 136,140 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */
    public void setContent(Map m) {
      axisDivisions = ((Integer)m.get("Axis")).intValue();
--- 136,140 ----
    }
    
!   /** {@inheritDoc} */
    public void setContent(Map m) {
      axisDivisions = ((Integer)m.get("Axis")).intValue();
***************
*** 142,147 ****
      radius = ((Double)m.get("Radius")).doubleValue();
    }
! 
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */
    public Map getContent() {
      Map m = new HashMap();
--- 142,147 ----
      radius = ((Double)m.get("Radius")).doubleValue();
    }
!   
!   /** {@inheritDoc} */
    public Map getContent() {
      Map m = new HashMap();

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Entity.java	21 Dec 2006 14:21:26 -0000	1.12
--- Entity.java	2 Jan 2007 17:48:58 -0000	1.13
***************
*** 66,73 ****
      final Comparator comparator = 
        new Comparator() {
!       public int compare(Object s1, Object s2) {
!         return ((Entity) s1).getId().compareTo(((Entity) s2).getId());
!       }
!     };      
      Collections.sort(entities, comparator);
    }
--- 66,73 ----
      final Comparator comparator = 
        new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Entity) s1).getId().compareTo(((Entity) s2).getId());
!         }
!       };      
      Collections.sort(entities, comparator);
    }

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model/modellor LayerModellor.java, 1.9, 1.10 Modellor.java, 1.3, 1.4

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20432/src/net/sourceforge/bprocessor/model/modellor

Modified Files:
	LayerModellor.java Modellor.java 
Log Message:
Changed the javadoc to use inheritdoc and not see

Index: Modellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Modellor.java	10 Oct 2006 14:02:32 -0000	1.3
--- Modellor.java	2 Jan 2007 17:48:58 -0000	1.4
***************
*** 98,104 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Modellor";
--- 98,102 ----
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Modellor";

Index: LayerModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/LayerModellor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LayerModellor.java	30 Oct 2006 06:49:25 -0000	1.9
--- LayerModellor.java	2 Jan 2007 17:48:58 -0000	1.10
***************
*** 177,181 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#newInstance(Space) */
    public Modellor newInstance(Space s) {
      Iterator iter = s.getEnvelope().iterator();
--- 177,181 ----
    }
  
!   /** {@inheritDoc} */
    public Modellor newInstance(Space s) {
      Iterator iter = s.getEnvelope().iterator();
***************
*** 212,225 ****
  
      
!     /**
!      * @see net.sourceforge.bprocessor.model.Entity#getName()
!      */
      public String getName() {
        return "Layer";
      }
      
!     /**
!      * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!      */
      public String getGeneralName() {
        return "Layer";
--- 212,221 ----
  
      
!     /** {@inheritDoc} */
      public String getName() {
        return "Layer";
      }
      
!     /** {@inheritDoc} */
      public String getGeneralName() {
        return "Layer";
***************
*** 227,231 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */
    public void setContent(Map m) {
      space = (Space)m.get("Space");
--- 223,227 ----
    }
  
!   /** {@inheritDoc} */
    public void setContent(Map m) {
      space = (Space)m.get("Space");
***************
*** 234,238 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */
    public Map getContent() {
      Map m = new HashMap();
--- 230,234 ----
    }
  
!   /** {@inheritDoc} */
    public Map getContent() {
      Map m = new HashMap();

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui/attrview LinkAttribute.java, 1.15, 1.16

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/attrview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20014/src/net/sourceforge/bprocessor/gui/attrview

Modified Files:
	LinkAttribute.java 
Log Message:
indent correct and made use inheritdoc and not see in javadoc

Index: LinkAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/attrview/LinkAttribute.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LinkAttribute.java	10 Nov 2006 13:47:41 -0000	1.15
--- LinkAttribute.java	2 Jan 2007 17:47:50 -0000	1.16
***************
*** 409,423 ****
          final Comparator alpha = 
            new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Space) s1).getName().compareToIgnoreCase(((Space) s2).getName());
!           }
!         };
          
          final Comparator num = 
            new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Space) s1).getId().compareTo(((Space) s2).getId());
!           }
!         };
          LinkedList sort =  new LinkedList(Project.getInstance().getSpaces());
          Collections.sort(sort, alpha);
--- 409,423 ----
          final Comparator alpha = 
            new Comparator() {
!             public int compare(Object s1, Object s2) {
!               return ((Space) s1).getName().compareToIgnoreCase(((Space) s2).getName());
!             }
!           };
          
          final Comparator num = 
            new Comparator() {
!             public int compare(Object s1, Object s2) {
!               return ((Space) s1).getId().compareTo(((Space) s2).getId());
!             }
!           };
          LinkedList sort =  new LinkedList(Project.getInstance().getSpaces());
          Collections.sort(sort, alpha);

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.67, 1.68

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20014/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	GenericTreeView.java 
Log Message:
indent correct and made use inheritdoc and not see in javadoc

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** GenericTreeView.java	30 Nov 2006 22:03:51 -0000	1.67
--- GenericTreeView.java	2 Jan 2007 17:47:50 -0000	1.68
***************
*** 784,791 ****
        final Comparator num = 
          new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Surface) s1).getId().compareTo(((Surface) s2).getId());
!         }
!       };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
--- 784,791 ----
        final Comparator num = 
          new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Surface) s1).getId().compareTo(((Surface) s2).getId());
!           }
!         };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
***************
*** 839,846 ****
        final Comparator num = 
          new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Space) s1).getId().compareTo(((Space) s2).getId());
!         }
!       };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
--- 839,846 ----
        final Comparator num = 
          new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Space) s1).getId().compareTo(((Space) s2).getId());
!           }
!         };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
***************
*** 938,945 ****
        final Comparator num = 
          new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Constructor) s1).getId().compareTo(((Constructor) s2).getId());
!         }
!       };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
--- 938,945 ----
        final Comparator num = 
          new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Constructor) s1).getId().compareTo(((Constructor) s2).getId());
!           }
!         };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
***************
*** 1042,1049 ****
        final Comparator num = 
          new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Space) s1).getId().compareTo(((Space) s2).getId());
!         }
!       };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
--- 1042,1049 ----
        final Comparator num = 
          new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Space) s1).getId().compareTo(((Space) s2).getId());
!           }
!         };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
***************
*** 1128,1135 ****
        final Comparator num = 
          new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Vertex) s1).getId().compareTo(((Vertex) s2).getId());
!         }
!       };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);
--- 1128,1135 ----
        final Comparator num = 
          new Comparator() {
!           public int compare(Object s1, Object s2) {
!             return ((Vertex) s1).getId().compareTo(((Vertex) s2).getId());
!           }
!         };      
        LinkedList sort =  new LinkedList(elem);
        Collections.sort(sort, num);

[Bprocessor-commit] /facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.8, 1.9 FacadeModellor.java, 1.29, 1.30 WindowModellor.java, 1.14, 1.15

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19838/src/net/sourceforge/bprocessor/facade/modellor

Modified Files:
	NetFacadeModellor.java FacadeModellor.java WindowModellor.java 
Log Message:
Changed the javadoc to use inheritdoc and not see

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NetFacadeModellor.java	30 Dec 2006 15:33:57 -0000	1.8
--- NetFacadeModellor.java	2 Jan 2007 17:47:05 -0000	1.9
***************
*** 59,63 ****
    
    /** Window spaces for the double facade */
!   private Set < Space > windows = new HashSet < Space > ();
    
    /** The logger */
--- 59,63 ----
    
    /** Window spaces for the double facade */
!   private Set<Space> windows = new HashSet<Space>();
    
    /** The logger */
***************
*** 170,176 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Net Facade Modellor";
--- 170,174 ----
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Net Facade Modellor";
***************
*** 522,529 ****
    }
    
!   /**
!    * See getgeneralname
!    * @return the general name
!    */
    public String getName() {
      return getGeneralName();
--- 520,524 ----
    }
    
!   /** {@inheritDoc} */
    public String getName() {
      return getGeneralName();

Index: WindowModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor/WindowModellor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** WindowModellor.java	14 Oct 2006 23:37:40 -0000	1.14
--- WindowModellor.java	2 Jan 2007 17:47:05 -0000	1.15
***************
*** 129,135 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Modellor#update(Object)
!    */
    public void update(Object entity) {
      if (entity == space || entity == surface) {
--- 129,133 ----
    }
    
!   /** {@inheritDoc} */
    public void update(Object entity) {
      if (entity == space || entity == surface) {
***************
*** 171,177 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Modellor#newInstance(Space)
!    */
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.SPACE_LEVEL) {
--- 169,173 ----
    }
    
!   /** {@inheritDoc} */
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.SPACE_LEVEL) {
***************
*** 183,189 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#delete()
!    */
    public void delete() {
      space.setModellor(null);
--- 179,183 ----
    }
  
!   /** {@inheritDoc} */
    public void delete() {
      space.setModellor(null);
***************
*** 197,203 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes(List)
!    */
    public void setAttributes(List attributes) {
      framewidth = ((Double)((Attribute)attributes.get(1)).getValue()).doubleValue();
--- 191,195 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      framewidth = ((Double)((Attribute)attributes.get(1)).getValue()).doubleValue();
***************
*** 216,222 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      List res = new LinkedList();
--- 208,212 ----
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      List res = new LinkedList();
***************
*** 229,247 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#getName()
!    */
    public String getName() {
      return "Window";
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Window modellor";
    }
    
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */
    public void setContent(Map m) {
      framewidth = ((Double)m.get("Framewidth")).doubleValue();
--- 219,233 ----
    }
  
!   /** {@inheritDoc} */
    public String getName() {
      return "Window";
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Window modellor";
    }
    
!   /** {@inheritDoc} */
    public void setContent(Map m) {
      framewidth = ((Double)m.get("Framewidth")).doubleValue();
***************
*** 253,257 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */
    public Map getContent() {
      Map what = new HashMap();
--- 239,243 ----
    }
  
!   /** {@inheritDoc} */
    public Map getContent() {
      Map what = new HashMap();

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** FacadeModellor.java	16 Nov 2006 14:28:32 -0000	1.29
--- FacadeModellor.java	2 Jan 2007 17:47:05 -0000	1.30
***************
*** 333,339 ****
      return name;
    }
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Facade Modellor";
--- 333,338 ----
      return name;
    }
! 
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Facade Modellor";
***************
*** 776,780 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */
    public void setContent(Map m) {
      bottomBound = (Line)m.get("bottomBound");
--- 775,779 ----
    }
    
!   /** {@inheritDoc} */
    public void setContent(Map m) {
      bottomBound = (Line)m.get("bottomBound");
***************
*** 794,798 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */
    public Map getContent() {
      Map m = new HashMap();
--- 793,797 ----
    }
  
!   /** {@inheritDoc} */
    public Map getContent() {
      Map m = new HashMap();