|
|
@@ -544,6 +544,9 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
|
|
|
infraredDemo.ResetCenterOffset();
|
|
|
//清除白线数据
|
|
|
infraredDemo.ResetPositioningData();
|
|
|
+ //上面应该清空了 ScreenLocate.Main.ScreenIdentification.QuadAuto
|
|
|
+ onClearCurrentUILineGenerator();
|
|
|
+
|
|
|
SetScreenPositioningStepState(ScreenPositioningStep.Start);
|
|
|
}
|
|
|
/// <summary>
|
|
|
@@ -565,7 +568,9 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
|
|
|
/// </summary>
|
|
|
public void OnClick_BackByScreenPositioningStep()
|
|
|
{
|
|
|
- SetScreenPositioningStepState(ScreenPositioningStep.Marker);
|
|
|
+ SetScreenPositioningStepState(ScreenPositioningStep.LightCtrl);
|
|
|
+ //清空两个绘制线
|
|
|
+ onClearSuccessfullLineGenerator();
|
|
|
//if(perStepView == ScreenPositioningStep.Manual)
|
|
|
// SetScreenPositioningStepState(ScreenPositioningStep.Manual);
|
|
|
//else
|
|
|
@@ -684,7 +689,20 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
|
|
|
Debug.LogError("screenSemiAuto 不存在！");
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ /// <summary>
|
|
|
+ /// 清空白线数据
|
|
|
+ /// </summary>
|
|
|
+ void onClearCurrentUILineGenerator() {
|
|
|
+ if (CurrentUILineGenerator.Points.Length != 0) CurrentUILineGenerator.Points = new Vector2[0];//System.Array.Clear(CurrentUILineGenerator.Points, 0, CurrentUILineGenerator.Points.Length);
|
|
|
+ }
|
|
|
+ /// <summary>
|
|
|
+ /// 清空最后识别的两个自动和半自动数据线
|
|
|
+ /// </summary>
|
|
|
+ void onClearSuccessfullLineGenerator()
|
|
|
+ {
|
|
|
+ if(FirstUILineGenerator.Points.Length !=0) FirstUILineGenerator.Points = new Vector2[0]; //System.Array.Clear(FirstUILineGenerator.Points, 0, FirstUILineGenerator.Points.Length);
|
|
|
+ if (SecondUILineGenerator.Points.Length !=0) SecondUILineGenerator.Points = new Vector2[0]; //System.Array.Clear(SecondUILineGenerator.Points, 0, SecondUILineGenerator.Points.Length);
|
|
|
+ }
|
|
|
#region 绘制线段部分
|
|
|
|
|
|
|
