Index: DamClients/DamUI/trunk/src/Dam/Forms/SlipCircleDrawingObject.cs
===================================================================
diff -u -r3437 -r3451
--- DamClients/DamUI/trunk/src/Dam/Forms/SlipCircleDrawingObject.cs (.../SlipCircleDrawingObject.cs) (revision 3437)
+++ DamClients/DamUI/trunk/src/Dam/Forms/SlipCircleDrawingObject.cs (.../SlipCircleDrawingObject.cs) (revision 3451)
@@ -30,34 +30,29 @@
public class SlipCircleDrawingObject : DrawingObject
{
private StabilityResultSlices slipcircle;
- private Color color = Color.Salmon;
///
/// Initializes a new instance of the class.
///
public SlipCircleDrawingObject()
{
- this.Layer = -60;
+ Layer = -60;
}
///
/// Gets or sets the color.
///
///
/// The color.
///
- public Color Color
- {
- get { return color; }
- set { color = value; }
- }
+ public Color Color { get; set; } = Color.Salmon;
///
/// Sets the data object.
///
- /// The data object.
- public override void SetDataObject(object dataObject)
+ /// The data object.
+ public override void SetDataObject(object aDataObject)
{
- slipcircle = (StabilityResultSlices)dataObject;
+ slipcircle = (StabilityResultSlices)aDataObject;
}
///
@@ -80,7 +75,7 @@
DrawingSupport.Brush3D(Color.Black);
- DrawingSupport.Pen3D(System.Drawing.Drawing2D.DashStyle.Solid, 3, color);
+ DrawingSupport.Pen3D(System.Drawing.Drawing2D.DashStyle.Solid, 3, Color);
for (int i = 0; i < slipcircle.StabilityResultSlice.Count; i++)
{
@@ -135,8 +130,19 @@
GetScaled3DPoint(info.Projection, activeCenterPoint, ref activeCenterPoint);
DrawingSupport.Cross_Symbol3D(activeCenterPoint.X, activeCenterPoint.Z, 10);
- };
+ DrawingSupport.Pen3D(System.Drawing.Drawing2D.DashStyle.Solid, 1, Color);
+ var topLeftPoint = new Point3D()
+ {
+ X = slipcircle.StabilityResultSlice[0].BottomLeftPoint.X,
+ Y = 0,
+ Z = slipcircle.StabilityResultSlice[0].BottomLeftPoint.Y
+ };
+
+ GetScaled3DPoint(info.Projection, topLeftPoint, ref topLeftPoint);
+ DrawingSupport.Line3D(topLeftPoint, activeCenterPoint);
+ }
+
if (slipcircle.PassiveCenterPoint != null)
{
var passiveCenterPoint = new Point3D()
@@ -148,6 +154,18 @@
GetScaled3DPoint(info.Projection, passiveCenterPoint, ref passiveCenterPoint);
DrawingSupport.Cross_Symbol3D(passiveCenterPoint.X, passiveCenterPoint.Z, 10);
+
+ int sliceIndex = slipcircle.StabilityResultSlice.Count - 1;
+ DrawingSupport.Pen3D(System.Drawing.Drawing2D.DashStyle.Solid, 1, Color);
+ var topRightPoint = new Point3D()
+ {
+ X = slipcircle.StabilityResultSlice[sliceIndex].TopRightPoint.X,
+ Y = 0,
+ Z = slipcircle.StabilityResultSlice[sliceIndex].TopRightPoint.Y
+ };
+
+ GetScaled3DPoint(info.Projection, topRightPoint, ref topRightPoint);
+ DrawingSupport.Line3D(topRightPoint, passiveCenterPoint);
}
}
}