[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.73, 1.74

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

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

Modified Files:
	Persistence.java 
Log Message:
current view saved

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** Persistence.java	30 Dec 2007 23:29:06 -0000	1.73
--- Persistence.java	5 Feb 2008 13:34:20 -0000	1.74
***************
*** 164,195 ****
      }
      {
        Iterator iter = document.getCamera().iterator();
        while (iter.hasNext()) {
!         CameraType ct = (CameraType) iter.next();
!         Camera cam = new Camera();
!         cam.setName(ct.getName());
!         TripletType campos = ct.getCamera();
!         cam.setCamera(new double[]{campos.getX(), campos.getY(), campos.getZ()});
!         TripletType cenpos = ct.getCenter();
!         cam.setCenter(new double[]{cenpos.getX(), cenpos.getY(), cenpos.getZ()});
!         TripletType up = ct.getRoll();
!         cam.setRoll(new double[]{up.getX(), up.getY(), up.getZ()});
!         cam.setFactor(ct.getScalefactor());
!         Collection clips = ct.getClipplanes();
!         Iterator clipit = clips.iterator();
!         while (clipit.hasNext()) {
!           ClipplaneType cpt = (ClipplaneType)clipit.next();
!           CoordinateSystemType cst = cpt.getCoordinateSystem();
!           CoordinateSystem cs = internalizeCoordinateSystem(cst, new HashMap(), new LinkedList());
!           ClippingPlane cp = new ClippingPlane(cs);
!           cp.setId(new Long(cpt.getId()));
!           cp.setActive(cpt.isActive());
!           cp.setNumber(cpt.getNumber());
!           cp.setSlice(cpt.isSlice());
!           cam.addClipplane(cp);
!         }
!         cam.setFocalwidth(ct.getFocalwidth());
!         cam.setId(new Long(ct.getProgid()));
!         cam.setType(ct.getType());
          p.add(cam);
        }
--- 164,177 ----
      }
      {
+       CameraType current = document.getView();
+       if (current != null) {
+         Project.getInstance().setCurrentCamera(internalizeCamera(current));
+       }
+     }
+     {
        Iterator iter = document.getCamera().iterator();
        while (iter.hasNext()) {
!         CameraType current = (CameraType) iter.next();
!         Camera cam = internalizeCamera(current);
          p.add(cam);
        }
***************
*** 230,233 ****
--- 212,244 ----
    }
    
+   private static Camera internalizeCamera(CameraType xml) {
+     Camera cam = new Camera();
+     cam.setName(xml.getName());
+     TripletType campos = xml.getCamera();
+     cam.setCamera(new double[]{campos.getX(), campos.getY(), campos.getZ()});
+     TripletType cenpos = xml.getCenter();
+     cam.setCenter(new double[]{cenpos.getX(), cenpos.getY(), cenpos.getZ()});
+     TripletType up = xml.getRoll();
+     cam.setRoll(new double[]{up.getX(), up.getY(), up.getZ()});
+     cam.setFactor(xml.getScalefactor());
+     Collection clips = xml.getClipplanes();
+     Iterator clipit = clips.iterator();
+     while (clipit.hasNext()) {
+       ClipplaneType cpt = (ClipplaneType)clipit.next();
+       CoordinateSystemType cst = cpt.getCoordinateSystem();
+       CoordinateSystem cs = internalizeCoordinateSystem(cst, new HashMap(), new LinkedList());
+       ClippingPlane cp = new ClippingPlane(cs);
+       cp.setId(new Long(cpt.getId()));
+       cp.setActive(cpt.isActive());
+       cp.setNumber(cpt.getNumber());
+       cp.setSlice(cpt.isSlice());
+       cam.addClipplane(cp);
+     }
+     cam.setFocalwidth(xml.getFocalwidth());
+     cam.setId(new Long(xml.getProgid()));
+     cam.setType(xml.getType());
+     return cam;
+   }
+   
    private static Classification internalizeClassifaction(String string, int type) {
      Classification classification = null;
***************
*** 843,891 ****
      document.setName(Project.getInstance().getName());
      {
        Collection cams = document.getCamera();
        Iterator iter = Project.getInstance().getCameras().iterator();
        while (iter.hasNext()) {
!         Camera c = (Camera) iter.next();
!         CameraType cam = new CameraTypeImpl();
!         cam.setName(c.getName());
!         TripletType campos = new TripletTypeImpl();
!         campos.setX(c.getCamera()[0]);
!         campos.setY(c.getCamera()[1]);
!         campos.setZ(c.getCamera()[2]);
!         cam.setCamera(campos);
!         TripletType cenpos = new TripletTypeImpl();
!         cenpos.setX(c.getCenter()[0]);
!         cenpos.setY(c.getCenter()[1]);
!         cenpos.setZ(c.getCenter()[2]);
!         cam.setCenter(cenpos);
!         TripletType up = new TripletTypeImpl();
!         up.setX(c.getRoll()[0]);
!         up.setY(c.getRoll()[1]);
!         up.setZ(c.getRoll()[2]);
!         cam.setRoll(up);
!         cam.setScalefactor((int)c.getFactor());
!         Collection clips = c.getClipplanes();
!         Iterator clipit = clips.iterator();
!         while (clipit.hasNext()) {
!           ClippingPlane cp = (ClippingPlane)clipit.next();
!           ClipplaneType cpt = new ClipplaneTypeImpl();
!           CoordinateSystemType cst = 
!             externalizeCoordinateSystem(cp.getCoordinateSystem(), new HashMap());
!           cpt.setCoordinateSystem(cst);
!           cpt.setId(counter++);
!           if (cp.getId() != null) {
!             cpt.setProgid(cp.getId().longValue());
!           }
!           cpt.setNumber(cp.getNumber());
!           cpt.setSlice(cp.isSlice());
!           cpt.setActive(cp.isActive());
!           cam.getClipplanes().add(cpt);
!         }
!         cam.setFocalwidth(c.getFocalwidth());
!         if (c.getId() != null) {
!           cam.setProgid(c.getId().longValue());
!         }
!         cam.setId(counter++);
!         cam.setType(c.getType());
          cams.add(cam);
        }
--- 854,866 ----
      document.setName(Project.getInstance().getName());
      {
+       Camera current = Project.getInstance().getCurrentCamera();
+       document.setView(externalizeCamera(current));
+     }
+     {
        Collection cams = document.getCamera();
        Iterator iter = Project.getInstance().getCameras().iterator();
        while (iter.hasNext()) {
!         Camera current = (Camera) iter.next();
!         CameraType cam = externalizeCamera(current);
          cams.add(cam);
        }
***************
*** 933,936 ****
--- 908,957 ----
    }
    
+   
+   private static CameraType externalizeCamera(Camera c) {
+     CameraType xml = new CameraTypeImpl();
+     xml.setName(c.getName());
+     TripletType campos = new TripletTypeImpl();
+     campos.setX(c.getCamera()[0]);
+     campos.setY(c.getCamera()[1]);
+     campos.setZ(c.getCamera()[2]);
+     xml.setCamera(campos);
+     TripletType cenpos = new TripletTypeImpl();
+     cenpos.setX(c.getCenter()[0]);
+     cenpos.setY(c.getCenter()[1]);
+     cenpos.setZ(c.getCenter()[2]);
+     xml.setCenter(cenpos);
+     TripletType up = new TripletTypeImpl();
+     up.setX(c.getRoll()[0]);
+     up.setY(c.getRoll()[1]);
+     up.setZ(c.getRoll()[2]);
+     xml.setRoll(up);
+     xml.setScalefactor((int)c.getFactor());
+     Collection clips = c.getClipplanes();
+     Iterator clipit = clips.iterator();
+     while (clipit.hasNext()) {
+       ClippingPlane cp = (ClippingPlane)clipit.next();
+       ClipplaneType cpt = new ClipplaneTypeImpl();
+       CoordinateSystemType cst = 
+         externalizeCoordinateSystem(cp.getCoordinateSystem(), new HashMap());
+       cpt.setCoordinateSystem(cst);
+       cpt.setId(counter++);
+       if (cp.getId() != null) {
+         cpt.setProgid(cp.getId().longValue());
+       }
+       cpt.setNumber(cp.getNumber());
+       cpt.setSlice(cp.isSlice());
+       cpt.setActive(cp.isActive());
+       xml.getClipplanes().add(cpt);
+     }
+     xml.setFocalwidth(c.getFocalwidth());
+     if (c.getId() != null) {
+       xml.setProgid(c.getId().longValue());
+     }
+     xml.setId(counter++);
+     xml.setType(c.getType());
+     return xml;
+   }
+   
    /**
     * Save the modellor