From 3a861fb5555d45c52ae944ea6925015df2cb4521 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 31 Oct 2012 15:55:53 +0000 Subject: [PATCH] Print X-Y Plots in the approprate color (Black or Red) Added logic to keep from failing if an item was not in the sibling list. --- PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs | 2 +- PROMS/Volian.Controls.Library/EditItem.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 12d7730f..40c90ff9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -892,7 +892,7 @@ namespace VEPROMS.CSLA.Library grfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; grfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; grfx.Clear(System.Drawing.Color.Transparent); - XYPlots.XYPlot.BlackColor = VlnSettings.DebugMode ? System.Drawing.Color.Red : System.Drawing.Color.Black; + XYPlots.XYPlot.BlackColor = MSWordToPDF.OverrideColor == Color.Red ? Color.Red : Color.Black; XYPlots.XYPlot myPlot = new XYPlots.XYPlot(xyPlot); myPlot.SetMargins(0, 0, 0, 0); myPlot.Process(new VG.VGOut_Graphics(grfx)); diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 067e3cc3..0510ada3 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -551,7 +551,10 @@ namespace Volian.Controls.Library { EditItem prevChild = nextEditItem.MyPreviousEditItem; EditItem parent = nextEditItem.MyParentEditItem; + if(siblingEditItems.Contains(nextEditItem)) siblingEditItems.Insert(siblingEditItems.IndexOf(nextEditItem), this); + else + siblingEditItems.Insert(0, this); MyStepPanel.ItemMoving++; _MyNextEditItem = nextEditItem; nextEditItem._MyPreviousEditItem = this;