|
|
@ -318,9 +318,7 @@ export class Arc extends Curve
|
|
|
|
else if (equaln(sa, this.m_EndAngle))//this终点对起点
|
|
|
|
else if (equaln(sa, this.m_EndAngle))//this终点对起点
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (eaAllan < allAn || equaln(ea, this.m_StartAngle))
|
|
|
|
if (eaAllan < allAn || equaln(ea, this.m_StartAngle))
|
|
|
|
{
|
|
|
|
|
|
|
|
return Status.ConverToCircle;
|
|
|
|
return Status.ConverToCircle;
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
else
|
|
|
|
this.EndAngle = ea;
|
|
|
|
this.EndAngle = ea;
|
|
|
|
|
|
|
|
|
|
|
@ -329,9 +327,7 @@ export class Arc extends Curve
|
|
|
|
else if (equaln(ea, this.StartAngle))//this起点对终点
|
|
|
|
else if (equaln(ea, this.StartAngle))//this起点对终点
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (saAllan < allAn)
|
|
|
|
if (saAllan < allAn)
|
|
|
|
{
|
|
|
|
|
|
|
|
return Status.ConverToCircle;
|
|
|
|
return Status.ConverToCircle;
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
else
|
|
|
|
this.StartAngle = sa;
|
|
|
|
this.StartAngle = sa;
|
|
|
|
return Status.True;
|
|
|
|
return Status.True;
|
|
|
@ -345,9 +341,7 @@ export class Arc extends Curve
|
|
|
|
else if (this.ParamOnCurve(this.GetParamAtAngle(sa)))
|
|
|
|
else if (this.ParamOnCurve(this.GetParamAtAngle(sa)))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (eaAllan < saAllan)
|
|
|
|
if (eaAllan < saAllan)
|
|
|
|
{
|
|
|
|
|
|
|
|
return Status.ConverToCircle;
|
|
|
|
return Status.ConverToCircle;
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (eaAllan > allAn)
|
|
|
|
else if (eaAllan > allAn)
|
|
|
|
this.EndAngle = ea;
|
|
|
|
this.EndAngle = ea;
|
|
|
|
return Status.True;
|
|
|
|
return Status.True;
|
|
|
|