From d6228e86122d807e6c68c323fd257c94f25ab55c Mon Sep 17 00:00:00 2001
From: Jianbo Qi <jianboqi@gmail.com>
Date: Thu, 25 Apr 2019 19:11:50 +0800
Subject: [PATCH] Fixed bug for LAI Calculation

---
 .../less/gui/helper/LAICaculatorThread.java   | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/java/lessgui/src/less/gui/helper/LAICaculatorThread.java b/java/lessgui/src/less/gui/helper/LAICaculatorThread.java
index 7355bb3e..886b520f 100644
--- a/java/lessgui/src/less/gui/helper/LAICaculatorThread.java
+++ b/java/lessgui/src/less/gui/helper/LAICaculatorThread.java
@@ -149,22 +149,39 @@ private void LAICalculate(){
  		this.bdConsole.log("INFO: LAI Resolution: "+laiRows+" \u00D7 "+laiCols+" \u00D7 "+laiHeight+" \n");
  		double width = Double.parseDouble(this.laiController.mwController.sceneXSizeField.getText().replaceAll(",", ""));
  		double height = Double.parseDouble(this.laiController.mwController.sceneYSizeField.getText().replaceAll(",", ""));
- 		//get Z bounding
- 		LSBoundingbox sceneBounds = new LSBoundingbox();
+ 		//get Z height
+ 		double Depth = 0;
  		for(Map.Entry<String, ObservableList<PositionXY>> entry: this.laiController.mwController.objectAndPositionMap.entrySet()){
  			String objName = entry.getKey();
  			ObservableList<PositionXY> positionXYZs = entry.getValue();
  			LSBoundingbox objBoundingbox = this.laiController.mwController.objectAndBoundingboxMap.get(objName);
  			for(int i=0;i<positionXYZs.size();i++){ //component
  				PositionXY posxyz = positionXYZs.get(i);
- 				double x = Double.parseDouble(posxyz.getPos_x());
- 				double y = Double.parseDouble(posxyz.getPos_y());
  				double z = Double.parseDouble(posxyz.getPos_z());
- 				//x, y is not correct here, we only take the value of z
- 				sceneBounds = LSBoundingbox.merge(sceneBounds, objBoundingbox.getOffsetedBoundingbox(x, z, y));
+ 				double tmp = z + objBoundingbox.getHeight();
+ 				if(tmp > Depth)
+ 					Depth = tmp;
  			}
  		}
- 		double Depth = sceneBounds.getHeight(); 		
+ 		
+ 		
+// 		LSBoundingbox sceneBounds = new LSBoundingbox();
+// 		for(Map.Entry<String, ObservableList<PositionXY>> entry: this.laiController.mwController.objectAndPositionMap.entrySet()){
+// 			String objName = entry.getKey();
+// 			ObservableList<PositionXY> positionXYZs = entry.getValue();
+// 			LSBoundingbox objBoundingbox = this.laiController.mwController.objectAndBoundingboxMap.get(objName);
+// 			for(int i=0;i<positionXYZs.size();i++){ //component
+// 				PositionXY posxyz = positionXYZs.get(i);
+// 				double x = Double.parseDouble(posxyz.getPos_x());
+// 				double y = Double.parseDouble(posxyz.getPos_y());
+// 				double z = Double.parseDouble(posxyz.getPos_z());
+// 				//x, y is not correct here, we only take the value of z
+// 				sceneBounds = LSBoundingbox.merge(sceneBounds, objBoundingbox.getOffsetedBoundingbox(x, z, y));
+// 			}
+// 		}
+// 		double Depth = sceneBounds.getHeight(); 
+ 		System.out.println("Scene Depth [m]: "+Depth);
+ 		
  		
  		double [][][] lais = new double [laiRows][laiCols][laiHeight];
  		double rowResolution = height/laiRows;
@@ -222,7 +239,6 @@ private void LAICalculate(){
  						lais[up_index][left_index][bottom_index] += objectArea.get(objName).area;
  					}else{
  						ObjectAreaAndMesh objectAreaAndMesh = this.getObjectArea(objectMeshes);
- 						System.out.println("INFO: "+objName+" Area[m2]: "+objectAreaAndMesh.area);
  						lais[up_index][left_index][bottom_index] += objectAreaAndMesh.area;
  						objectArea.put(objName, objectAreaAndMesh);
  					}