Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Remove Unnecessary debug message

Browse Source 
Fixed logic to find external transition when attempting to delete a procedure
Turn-on Table Shrinking Generically
This commit is contained in:
Rich 2015-05-29 00:09:39 +00:00
parent 5b07290ccd
commit 1463ec8853
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2631,7 +2631,7 @@ namespace VEPROMS.CSLA.Library
#region Lookups and More Related #region Lookups and More Related
private ItemInfoList Lookup(int fromType, ref ItemInfoList itemInfoList) private ItemInfoList Lookup(int fromType, ref ItemInfoList itemInfoList)
{ {
Console.WriteLine(itemInfoList); //Console.WriteLine(itemInfoList);
if (itemInfoList == null) if (itemInfoList == null)
itemInfoList = Lookup(fromType); itemInfoList = Lookup(fromType);
return itemInfoList; return itemInfoList;

6
PROMS/Volian.Controls.Library/DisplayText.cs
View File

@ -379,8 +379,8 @@ namespace Volian.Controls.Library
{ {
if (rs.ReplaceWord.Contains("{RO}")) if (rs.ReplaceWord.Contains("{RO}"))
{ {
if (_MyItemInfo.InList(34770,34771,34782,34882,34886,34916,34891,35121,36361)) //if (_MyItemInfo.InList(34770,34771,34782,34882,34886,34916,34891,35121,36361))
Console.WriteLine("FixDiffUnitROReplaceWords jcb"); // Console.WriteLine("FixDiffUnitROReplaceWords jcb");
string oldvalue = text; string oldvalue = text;
string replaceWord = rs.ReplaceWord; string replaceWord = rs.ReplaceWord;
string replaceWord2 = Regex.Replace( replaceWord,@"(\{RO\})([0-9,]+)(\{RO\})",@"\\v <START]\\v0 ($2)\\v"); string replaceWord2 = Regex.Replace( replaceWord,@"(\{RO\})([0-9,]+)(\{RO\})",@"\\v <START]\\v0 ($2)\\v");
@ -2101,7 +2101,7 @@ namespace Volian.Controls.Library
} }
string preceedingText = text.Substring(0, offset + foundMatch.MyMatch.Index); string preceedingText = text.Substring(0, offset + foundMatch.MyMatch.Index);
int ndxBold = preceedingText.LastIndexOf(@"\b"); int ndxBold = preceedingText.LastIndexOf(@"\b");
if (ndxBold > -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(@"\b ","");
with = with.Replace(@"\b0 ",""); with = with.Replace(@"\b0 ","");

2
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@ -482,7 +482,7 @@ namespace Volian.Controls.Library
// this line of code was moved before the find for the indent so that // 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. // the window gets resized if the indent changes the height, i.e. more line(s) in window.
AddEventHandlers(); AddEventHandlers();
if (MyItemInfo.InList(186722)) Console.WriteLine("here"); //if (MyItemInfo.InList(186722)) Console.WriteLine("here");
if ((indchar = Find(indentToken, indchar, RichTextBoxFinds.None)) >= 0) if ((indchar = Find(indentToken, indchar, RichTextBoxFinds.None)) >= 0)
{ {
int nindents = 0; int nindents = 0;

2
PROMS/Volian.Controls.Library/vlnTreeView.cs
View File

@ -2266,7 +2266,7 @@ namespace Volian.Controls.Library
{ {
if (ex.Message.Contains("has External Transitions and has no next step")) 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." + 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?" + "\r\n\r\nDo you want to be placed on the " + (exTrans.Count > 1 ? "first " : "") + "substep with the problem Transition?" +

4
PROMS/Volian.Print.Library/Grid2Pdf.cs
View File

@ -1068,14 +1068,14 @@ namespace Volian.Print.Library
case TextAlignEnum.LeftBottom: case TextAlignEnum.LeftBottom:
case TextAlignEnum.RightBottom: case TextAlignEnum.RightBottom:
hAdjust = Math.Max(0,h - (mult * HContent) )-1; 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; break;
case TextAlignEnum.CenterCenter: case TextAlignEnum.CenterCenter:
case TextAlignEnum.GeneralCenter: case TextAlignEnum.GeneralCenter:
case TextAlignEnum.LeftCenter: case TextAlignEnum.LeftCenter:
case TextAlignEnum.RightCenter: case TextAlignEnum.RightCenter:
hAdjust = Math.Max(0,(h - (mult * HContent)) / 2)-1; 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; break;
default: default:
break; break;

5
PROMS/Volian.Print.Library/Rtf2Pdf.cs
View File

@ -26,7 +26,8 @@ namespace Volian.Print.Library
Phase7=64, Phase7=64,
Phase8=128, Phase8=128,
Phase9=256, Phase9=256,
Phase10=512 Phase10=512,
AllPhases=1+2+4+8+16+32+64+128+256+512
} }
public class Rtf2Pdf public class Rtf2Pdf
{ {
@ -114,7 +115,7 @@ namespace Volian.Print.Library
return (c == ' '); return (c == ' ');
} }
} }
private static TableScrunching _AllowTableScrunching = TableScrunching.None; // RHM20150507 Table Scrunch private static TableScrunching _AllowTableScrunching = TableScrunching.AllPhases; // RHM20150507 Table Scrunch
public static TableScrunching AllowTableScrunching public static TableScrunching AllowTableScrunching
{ {
get { return Rtf2Pdf._AllowTableScrunching; } get { return Rtf2Pdf._AllowTableScrunching; }