|
|
@ -89,7 +89,7 @@ public class SprayTaskExecutor { |
|
|
|
sprayTask.setSprayTimes(sprayTimes); |
|
|
|
Double[] slide = slideArr[sprayTaskParam.getIndex()];//获取玻片的坐标 |
|
|
|
|
|
|
|
List<SprayTaskStep> sprayTaskStepList = getSprayPath(sprayTaskParam.getIndex(), sprayTimes);//计算本次喷涂的路线 |
|
|
|
List<SprayTaskStep> sprayTaskStepList = getSprayPath(sprayTimes);//计算本次喷涂的路线 |
|
|
|
//先移动到玻片左上角位置 |
|
|
|
DeviceCommand motorXPositionSetCommand = DeviceCommandGenerator.motorXPositionSet(slideArr[sprayTaskParam.getIndex()][0], 20.0); |
|
|
|
DeviceCommand motorYPositionSetCommand = DeviceCommandGenerator.motorYPositionSet(slideArr[sprayTaskParam.getIndex()][1], 20.0); |
|
|
@ -254,7 +254,7 @@ public class SprayTaskExecutor { |
|
|
|
.get(); |
|
|
|
} |
|
|
|
|
|
|
|
private List<SprayTaskStep> getSprayPath(Integer index, SprayTimes sprayTimes) { |
|
|
|
private List<SprayTaskStep> getSprayPath(SprayTimes sprayTimes) { |
|
|
|
String matrixPathType = sprayTimes.getMatrixPathType(); |
|
|
|
double left = sprayTimes.getX1(); |
|
|
|
double right = sprayTimes.getX2(); |
|
|
|