|
@@ -132,7 +132,7 @@ public class Algorithm {
|
132
|
132
|
// "18,7,17.88 - 19,6,28.88 - 17,4,39.88" 垂直角度,水平角度,返回距离 -
|
133
|
133
|
String[] split = rotationxy.split(";");
|
134
|
134
|
for (int i = 0; i < split.length; i++) {
|
135
|
|
- System.out.println("split[i]是:"+split[i]);
|
|
135
|
+ //System.out.println("split[i]是:"+split[i]);
|
136
|
136
|
String[] split1 = split[i].split(",");
|
137
|
137
|
verticalAngle = new BigDecimal(split1[0]).divide(baseNumber,0,RoundingMode.HALF_UP).doubleValue();
|
138
|
138
|
levelAngle = new BigDecimal(split1[1]).divide(baseNumber,0,RoundingMode.HALF_UP).doubleValue();
|
|
@@ -162,17 +162,12 @@ public class Algorithm {
|
162
|
162
|
String verticalAngleC = String.format("%.2f%n", Math.cos(verticalAngleRadians));
|
163
|
163
|
double cosc = new Double(verticalAngleC);
|
164
|
164
|
double A1C = realHypotenuse * cosc;
|
165
|
|
- z = AC - A1C;
|
166
|
|
-
|
167
|
|
-
|
|
165
|
+ zList.add(A1C);
|
168
|
166
|
// logger.info("zHeight - z√√√√√√z z z z z {} ",z);
|
169
|
167
|
|
170
|
|
- zList.add(z);
|
171
|
168
|
}
|
172
|
169
|
}
|
173
|
|
-
|
174
|
|
- zMax = Collections.max(zList);
|
175
|
|
- zHigh = AC - zMax;
|
|
170
|
+ zHigh = Collections.min(zList);
|
176
|
171
|
return zHigh;
|
177
|
172
|
|
178
|
173
|
|