diff --git a/WebWindowComplex/Json/WindowConst.cs b/WebWindowComplex/Json/WindowConst.cs index 2eedc6f..da32eae 100644 --- a/WebWindowComplex/Json/WindowConst.cs +++ b/WebWindowComplex/Json/WindowConst.cs @@ -36,6 +36,7 @@ namespace WebWindowComplex.Json ARC_FULL = 12, FILLET = 13, DOUBLEARC = 14, + THREECENTERARC = 15, TRIANGLE = 21, CUSTOM = 100 } diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs index 4ef5eb4..3e231f5 100644 --- a/WebWindowComplex/Models/Frame.cs +++ b/WebWindowComplex/Models/Frame.cs @@ -137,6 +137,15 @@ namespace WebWindowComplex.Models break; } + case Shapes.THREECENTERARC: + { + DimensionList.Add(new FrameDimension(this, 1, "Width", 2000, true)); + DimensionList.Add(new FrameDimension(this, 2, "Height", 2400 - (0.4 * widthVal), true)); + DimensionList.Add(new FrameDimension(this, 3, "Full Height", 2400, true)); + DimensionList.Add(new FrameDimension(this, 4, "Radius", 200, true)); + break; + } + case Shapes.TRIANGLE: { DimensionList.Add(new FrameDimension(this, 1, "Width", widthVal, true)); @@ -180,6 +189,14 @@ namespace WebWindowComplex.Models break; } + case Shapes.THREECENTERARC: + { + JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType)); + JointList.Add(new Joint(this, 2, oldJointType[1].SelJointType)); + JointList.Add(new Joint(this, 3, Joints.ANGLED)); + JointList.Add(new Joint(this, 4, Joints.ANGLED)); + break; + } case Shapes.TRIANGLE: { JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType)); @@ -311,6 +328,15 @@ namespace WebWindowComplex.Models break; } + case Shapes.THREECENTERARC: + { + DimensionList.Add(new FrameDimension(this, 1, "Width", 800, true)); + DimensionList.Add(new FrameDimension(this, 2, "Height", 2100, true)); + DimensionList.Add(new FrameDimension(this, 3, "Full Height", 2400, true)); + DimensionList.Add(new FrameDimension(this, 4, "Radius", 100, true)); + break; + } + case Shapes.TRIANGLE: { DimensionList.Add(new FrameDimension(this, 1, "Width", 2000, true)); @@ -344,6 +370,7 @@ namespace WebWindowComplex.Models } case Shapes.ARC_FULL: + case Shapes.THREECENTERARC: { JointList.Add(new Joint(this, 1, Joints.FULL_H)); JointList.Add(new Joint(this, 2, Joints.FULL_H)); @@ -392,6 +419,7 @@ namespace WebWindowComplex.Models new IdNameStruct((int)Shapes.ARC, "Arc"), new IdNameStruct((int)Shapes.ARC_FULL, "Arc Full"), new IdNameStruct((int)Shapes.DOUBLEARC, "Double Arc"), + new IdNameStruct((int)Shapes.THREECENTERARC, "Three Center Arc"), new IdNameStruct((int)Shapes.TRIANGLE, "Triangle") }; diff --git a/WebWindowComplex/Models/FrameDimension.cs b/WebWindowComplex/Models/FrameDimension.cs index 66fa6a8..6c6feac 100644 --- a/WebWindowComplex/Models/FrameDimension.cs +++ b/WebWindowComplex/Models/FrameDimension.cs @@ -37,7 +37,7 @@ namespace WebWindowComplex.Models { m_dValue = MaxDim; } - else if (value < MinDim) + else if (value < MinDim && !m_sName.Equals("Radius")) { m_dValue = MinDim; }