From 1463ec8853ffa1bd872107bcb2f3d8fedb6c31dd Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 29 May 2015 00:09:39 +0000 Subject: [PATCH] Remove Unnecessary debug message Fixed logic to find external transition when attempting to delete a procedure Turn-on Table Shrinking Generically --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 2 +- PROMS/Volian.Controls.Library/DisplayText.cs | 6 +++--- PROMS/Volian.Controls.Library/StepRTB.cs | 2 +- PROMS/Volian.Controls.Library/vlnTreeView.cs | 2 +- PROMS/Volian.Print.Library/Grid2Pdf.cs | 4 ++-- PROMS/Volian.Print.Library/Rtf2Pdf.cs | 5 +++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index d1446de3..27428cd5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2631,7 +2631,7 @@ namespace VEPROMS.CSLA.Library #region Lookups and More Related private ItemInfoList Lookup(int fromType, ref ItemInfoList itemInfoList) { - Console.WriteLine(itemInfoList); + //Console.WriteLine(itemInfoList); if (itemInfoList == null) itemInfoList = Lookup(fromType); return itemInfoList; diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index 3e2f5b7b..ea753924 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -379,8 +379,8 @@ namespace Volian.Controls.Library { if (rs.ReplaceWord.Contains("{RO}")) { - if (_MyItemInfo.InList(34770,34771,34782,34882,34886,34916,34891,35121,36361)) - Console.WriteLine("FixDiffUnitROReplaceWords jcb"); + //if (_MyItemInfo.InList(34770,34771,34782,34882,34886,34916,34891,35121,36361)) + // Console.WriteLine("FixDiffUnitROReplaceWords jcb"); string oldvalue = text; string replaceWord = rs.ReplaceWord; string replaceWord2 = Regex.Replace( replaceWord,@"(\{RO\})([0-9,]+)(\{RO\})",@"\\v -1 && preceedingText.Length>(ndxBold+2) && preceedingText[ndxBold + 2] != '0' && with.Contains(@"\b ")) + if (ndxBold > -1 && preceedingText.Length>( ndxBold + 2) && preceedingText[ndxBold + 2] != '0' && with.Contains(@"\b ")) { with = with.Replace(@"\b ",""); with = with.Replace(@"\b0 ",""); diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index b1dfe5d1..421aecff 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -482,7 +482,7 @@ namespace Volian.Controls.Library // this line of code was moved before the find for the indent so that // the window gets resized if the indent changes the height, i.e. more line(s) in window. AddEventHandlers(); - if (MyItemInfo.InList(186722)) Console.WriteLine("here"); + //if (MyItemInfo.InList(186722)) Console.WriteLine("here"); if ((indchar = Find(indentToken, indchar, RichTextBoxFinds.None)) >= 0) { int nindents = 0; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index e79496a9..2282fe6a 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -2266,7 +2266,7 @@ namespace Volian.Controls.Library { if (ex.Message.Contains("has External Transitions and has no next step")) { - using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitions(ii.ItemID)) + using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(ii.ItemID)) { DialogResult ans = MessageBox.Show("Transitions exist to this step and cannot be adjusted automatically." + "\r\n\r\nDo you want to be placed on the " + (exTrans.Count > 1 ? "first " : "") + "substep with the problem Transition?" + diff --git a/PROMS/Volian.Print.Library/Grid2Pdf.cs b/PROMS/Volian.Print.Library/Grid2Pdf.cs index a47aebd8..d82530a2 100644 --- a/PROMS/Volian.Print.Library/Grid2Pdf.cs +++ b/PROMS/Volian.Print.Library/Grid2Pdf.cs @@ -1068,14 +1068,14 @@ namespace Volian.Print.Library case TextAlignEnum.LeftBottom: case TextAlignEnum.RightBottom: hAdjust = Math.Max(0,h - (mult * HContent) )-1; - Console.WriteLine("\"Bottom\",{0},{1},{2}", h, HContent, hAdjust); + //Console.WriteLine("\"Bottom\",{0},{1},{2}", h, HContent, hAdjust); break; case TextAlignEnum.CenterCenter: case TextAlignEnum.GeneralCenter: case TextAlignEnum.LeftCenter: case TextAlignEnum.RightCenter: hAdjust = Math.Max(0,(h - (mult * HContent)) / 2)-1; - Console.WriteLine("\"Middle\",{0},{1},{2}", h, HContent, hAdjust); + //Console.WriteLine("\"Middle\",{0},{1},{2}", h, HContent, hAdjust); break; default: break; diff --git a/PROMS/Volian.Print.Library/Rtf2Pdf.cs b/PROMS/Volian.Print.Library/Rtf2Pdf.cs index e42c4aae..e1797bdb 100644 --- a/PROMS/Volian.Print.Library/Rtf2Pdf.cs +++ b/PROMS/Volian.Print.Library/Rtf2Pdf.cs @@ -26,7 +26,8 @@ namespace Volian.Print.Library Phase7=64, Phase8=128, Phase9=256, - Phase10=512 + Phase10=512, + AllPhases=1+2+4+8+16+32+64+128+256+512 } public class Rtf2Pdf { @@ -114,7 +115,7 @@ namespace Volian.Print.Library return (c == ' '); } } - private static TableScrunching _AllowTableScrunching = TableScrunching.None; // RHM20150507 Table Scrunch + private static TableScrunching _AllowTableScrunching = TableScrunching.AllPhases; // RHM20150507 Table Scrunch public static TableScrunching AllowTableScrunching { get { return Rtf2Pdf._AllowTableScrunching; }