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

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

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

Modified Files:
	ToolsEnergyActionListener.java 
Log Message:
Made energy calc work, made some minor tests which seems to work

Index: ToolsEnergyActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsEnergyActionListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ToolsEnergyActionListener.java	29 Mar 2007 22:02:37 -0000	1.7
--- ToolsEnergyActionListener.java	19 Sep 2007 09:28:28 -0000	1.8
***************
*** 35,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");
  
    }
--- 35,48 ----
     */
    public void actionPerformed(ActionEvent e) {
!     double lossoverarea = Double.NaN;
!     double loss = EnergyCalc.energyLoss();
!     double area = EnergyCalc.heatedArea();
!     if (area != 0) {
!       lossoverarea = loss / area;
      }
      JOptionPane.showMessageDialog(null, 
!         "The total energytransmission loss per year is: " + loss + " kWh"
          + "\n" +  "The total energytransmission loss per year per m2 is: " 
!         + lossoverarea + " kWh/m2");
  
    }