[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions ToolsEnergyActionListener.java, 1.6, 1.7

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

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

Modified Files:
	ToolsEnergyActionListener.java 
Log Message:
Made alot changes regarding DBK, and energycalc

Index: ToolsEnergyActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsEnergyActionListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ToolsEnergyActionListener.java	11 Sep 2006 09:19:54 -0000	1.6
--- ToolsEnergyActionListener.java	29 Mar 2007 22:02:37 -0000	1.7
***************
*** 36,41 ****
    public void actionPerformed(ActionEvent e) {
      
      JOptionPane.showMessageDialog(null, 
!         "The total energytransmission loss is: " + EnergyCalc.energyLoss());
  
    }
--- 36,47 ----
    public void actionPerformed(ActionEvent e) {
      
+     Double loss = 0.0;
+     if (EnergyCalc.heatedArea() != 0) {
+       loss = EnergyCalc.energyLoss() / EnergyCalc.heatedArea();
+     }
      JOptionPane.showMessageDialog(null, 
!         "The total energytransmission loss per year is: " + EnergyCalc.energyLoss() + "kWh"
!         + "\n" +  "The total energytransmission loss per year per m2 is: " 
!         + loss + "kWh/m2");
  
    }