Aggiunta forma al frame: Arco a tre centri
This commit is contained in:
@@ -36,6 +36,7 @@ namespace WebWindowComplex.Json
|
||||
ARC_FULL = 12,
|
||||
FILLET = 13,
|
||||
DOUBLEARC = 14,
|
||||
THREECENTERARC = 15,
|
||||
TRIANGLE = 21,
|
||||
CUSTOM = 100
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user