[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.89, 1.90

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

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

Modified Files:
	Project.java 
Log Message:
Changed the default views to only contain current

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** Project.java	30 Oct 2006 14:19:37 -0000	1.89
--- Project.java	1 Nov 2006 14:32:45 -0000	1.90
***************
*** 51,57 ****
    /** The cameras */
    private HashMap cameras = new HashMap();
- 
-   /** The default un-changeable cameras */
-   private LinkedList defaultCams = new LinkedList();
    
    /** The domain id */
--- 51,54 ----
***************
*** 117,121 ****
      undoStack = new Stack();
      redoStack = new Stack();
!     addCams();
      observers = new LinkedList();
      world = new Space("Project", Space.FUNCTIONAL, Space.PROJECT_LEVEL, true);
--- 114,121 ----
      undoStack = new Stack();
      redoStack = new Stack();
!     currentCamera = new Camera("(Current)", 
!         new double[]{6, 3, 2}, 
!         new double[]{7, -12, 16},
!         new double[]{0, 0, 1}, Camera.PERSPECTIVE);
      observers = new LinkedList();
      world = new Space("Project", Space.FUNCTIONAL, Space.PROJECT_LEVEL, true);
***************
*** 218,222 ****
      this.setActiveCoordinateSystem(cs);
      this.cameras.clear();
-     addCams();
      this.cameraId = 0;
      cs.setActive(true);
--- 218,221 ----
***************
*** 225,254 ****
    
    /**
-    * Add the default cameras to cameras
-    */
-   private void addCams() {
-     Camera cam0 = Camera.create(Camera.VIEW_3D); // The starting cam (copy of 3d cam)
-     cam0.setId(new Long(cameraId++));
-     cam0.setName("Main view");
-     cameras.put(cam0.getId(), cam0);
-     defaultCams.add(cam0);
-     Camera cam2 = Camera.create(Camera.VIEW_XY); // Reset to 2D position XY with ortho
-     cam2.setId(new Long(cameraId++));
-     cameras.put(cam2.getId(), cam2);
-     defaultCams.add(cam2);
-     Camera cam3 = Camera.create(Camera.VIEW_XZ); // Reset to 2D position XZ with ortho
-     cam3.setId(new Long(cameraId++));
-     cameras.put(cam3.getId(), cam3);
-     defaultCams.add(cam3);
-     Camera cam4 = Camera.create(Camera.VIEW_YZ); // Reset to 2D position YZ with ortho
-     cam4.setId(new Long(cameraId++));
-     cameras.put(cam4.getId(), cam4);
-     defaultCams.add(cam4);
-     if (currentCamera == null) {
-       currentCamera = new Camera(cam0, "Current");
-     }
-   }
-   
-   /**
     * remove all elements in the collection from the project
     * @param c the collection of elements
--- 224,227 ----
***************
*** 459,470 ****
      return new HashSet(cameras.values());
    }
-   
-   /**
-    * Get all default cameras
-    * @return The cameras
-    */
-   public LinkedList getDefaultCameras() {
-     return defaultCams;
-   }
  
   /**
--- 432,435 ----