diff --git a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java index 1bca436..458a947 100644 --- a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java +++ b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java @@ -6,8 +6,8 @@ package a8k.appbean.cfg; public class LargeBottleBufferPos { public Pos2d topLelf; - public Integer xinterval; //x间隔 - public Integer yinterval; //y间隔 + public Integer xSpacing; //x间隔 + public Integer ySpacing; //y间隔 public Integer scancodeRelaPos; //扫码相对每个大屏缓冲液的位置,第一排 -dy,第二排dy public Integer sampleZPos; //取样开始位置 diff --git a/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java b/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java index 61ff0fc..e7eddc2 100644 --- a/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java +++ b/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java @@ -5,7 +5,7 @@ package a8k.appbean.cfg; */ public class Plates2dCodeScanPos { public Pos2d ch0ScanPos; //通道1扫码位置 - public Integer scanYInterval; //扫码间隔 + public Integer scanYSpacing; //扫码间隔 } diff --git a/src/main/java/a8k/appbean/cfg/Pos2d.java b/src/main/java/a8k/appbean/cfg/Pos2d.java index 62d2cef..111fc05 100644 --- a/src/main/java/a8k/appbean/cfg/Pos2d.java +++ b/src/main/java/a8k/appbean/cfg/Pos2d.java @@ -10,4 +10,9 @@ public class Pos2d { this.y = y; } + public Pos2d() { + this.x = 0; + this.y = 0; + } + } diff --git a/src/main/java/a8k/appbean/cfg/Pos3d.java b/src/main/java/a8k/appbean/cfg/Pos3d.java index 5d61171..b958017 100644 --- a/src/main/java/a8k/appbean/cfg/Pos3d.java +++ b/src/main/java/a8k/appbean/cfg/Pos3d.java @@ -4,10 +4,4 @@ public class Pos3d { public Integer x; public Integer y; public Integer z; - - public Pos3d(Integer x, Integer y, Integer z) { - this.x = x; - this.y = y; - this.z = z; - } } diff --git a/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java index 7b86973..1e54c63 100644 --- a/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java +++ b/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java @@ -30,8 +30,8 @@ public class SmallBottleBufferPos { public Pos2d g4TopLelf; public Pos2d g5TopLelf; - public Integer xInterval; //x间隔 - public Integer yInterval; //y间隔 + public Integer xSpacing; //x间隔 + public Integer ySpacing; //y间隔 public Integer sampleZPos; //取样开始位置 public Integer sampleZDepth; //取样深度 diff --git a/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java b/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java index 14e4ed7..5f746d3 100644 --- a/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java +++ b/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java @@ -6,8 +6,8 @@ public class TipPickUpPosInfo { public Pos2d g1tl; public Pos2d g2tl; - public Integer xInterval; //x间隔 - public Integer yInterval; //y间隔 + public Integer xSpacing; //x间隔 + public Integer ySpacing; //y间隔 public Integer pickUpZPos; //拾取高度