bprocessor-commit

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

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

Modified Files:
	Project.java 
Log Message:
experiment with display of envelope in treeview

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** Project.java	9 Dec 2007 08:26:38 -0000	1.147
--- Project.java	10 Dec 2007 23:10:04 -0000	1.148
***************
*** 62,65 ****
--- 62,68 ----
    
    private static Collection<Component> library;
+   
+   private static boolean doDisplayGeometry;
+   private static boolean doDebugGeometry;
      
    /** The cameras */
***************
*** 121,124 ****
--- 124,144 ----
    
    /**
+    * 
+    * @return boolean
+    */
+   public static boolean doDisplayGeometry() {
+     return Project.doDisplayGeometry;
+   }
+   
+   /**
+    * 
+    * @return boolean
+    */
+   public static boolean doDebugGeometry() {
+     return Project.doDebugGeometry;
+   }
+   
+   
+   /**
     * Get the instance
     * @return The instance
***************
*** 804,808 ****
          setName((String)a.getValue());
        } else if (a.getName().equals("Script")) {
!         script = new Description(((String)a.getValue().toString()));
        }
      }
--- 824,832 ----
          setName((String)a.getValue());
        } else if (a.getName().equals("Script")) {
!         script = new Description(a.getValue().toString());
!       } else if (a.getName().equals("Display Geometry")) {
!         doDisplayGeometry = ((Boolean) a.getValue()).booleanValue();
!       } else if (a.getName().equals("Debug Geometry")) {
!         doDebugGeometry = ((Boolean) a.getValue()).booleanValue();
        }
      }
***************
*** 817,826 ****
      ArrayList<Attribute> res = new ArrayList<Attribute>();
      res.add(new Attribute("Name", getName()));
-     //res.add(new Attribute("Energyloss", new Double(EnergyCalc.energyLoss()), false));
      res.add(new Attribute("Heated area", new Double(EnergyCalc.heatedArea()), false));
!     /*if (EnergyCalc.heatedArea() != 0) {
!       res.add(new Attribute("loss per m2", 
!           new Double(EnergyCalc.energyLoss() / EnergyCalc.heatedArea()), false));
!     }*/
      res.add(new Attribute("Script", script));
      return res;
--- 841,847 ----
      ArrayList<Attribute> res = new ArrayList<Attribute>();
      res.add(new Attribute("Name", getName()));
      res.add(new Attribute("Heated area", new Double(EnergyCalc.heatedArea()), false));
!     res.add(new Attribute("Display Geometry", Boolean.valueOf(doDisplayGeometry)));
!     res.add(new Attribute("Debug Geometry", Boolean.valueOf(doDebugGeometry)));
      res.add(new Attribute("Script", script));
      return res;