From c035370bb07f844697e1d559b20cbe7bb7e81e96 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 Jan 2016 21:49:26 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20bug=20B2016-013=20where=20the=20step=20?= =?UTF-8?q?properties=20would=20be=20inactive=20the=20first=20time=20it?= =?UTF-8?q?=E2=80=99s=20opened=20Bug=20fix=20B2016-014=20where=20a=20chang?= =?UTF-8?q?e=20bar=20was=20set=20when=20you=20check=20the=20CAS=20checkbox?= =?UTF-8?q?=20or=20the=20Page=20Break=20check=20box=20Bug=20Fix=20B2016-01?= =?UTF-8?q?1=20where=20a=20change=20bar=20a=20compressed=20table=20was=20t?= =?UTF-8?q?oo=20short=20Bug=20Fix=20=20B2015-184=20where=20generate=20PDF?= =?UTF-8?q?=20would=20bomb=20when=20it=20tried=20to=20print=20a=20change?= =?UTF-8?q?=20bar=20related=20to=20a=20null=20step=20element.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 4 ++-- PROMS/Volian.Controls.Library/DisplayTags.cs | 10 +++++++++- PROMS/Volian.Controls.Library/EditItem.cs | 11 ++++++++++- PROMS/Volian.Print.Library/vlnParagraph.cs | 1 - PROMS/Volian.Print.Library/vlnPrintObject.cs | 3 ++- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index c4af43ba..b30d9c4b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3013,8 +3013,6 @@ namespace VEPROMS displayTransition.MyRTB = args.MyEditItem.MyStepRTB; displayRO.MyRTB = args.MyEditItem.MyStepRTB; - displayTags.MyEditItem = args.MyEditItem; - displayTags.Mydvi = SelectedDVI; displayBookMarks.MyEditItem = args.MyEditItem; displayHistory.MyEditItem = args.MyEditItem; @@ -3028,6 +3026,8 @@ namespace VEPROMS if (args.MyEditItem != null) { SelectedStepTabPanel = args.MyEditItem.MyStepPanel.MyStepTabPanel; + displayTags.Mydvi = SelectedDVI; + displayTags.MyEditItem = args.MyEditItem; displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ? E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text; if (_LastStepRTB.IsRoTable && _LastStepRTB.MyItemInfo.MyContent.ContentRoUsageCount > 0) diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index 266975ad..1fdb3f89 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -401,7 +401,9 @@ namespace Volian.Controls.Library MyEditItem.SaveContents(); StepConfig sc = CurItemInfo.MyConfig as StepConfig; if (sc == null) return; + MyEditItem.ChangeBarForConfigItemChange = false; sc.Step_NewManualPagebreak = cbPageBreak.Checked; + MyEditItem.ChangeBarForConfigItemChange = true; } private void cbCAS_CheckedChanged(object sender, EventArgs e) { @@ -409,7 +411,9 @@ namespace Volian.Controls.Library MyEditItem.SaveContents(); StepConfig sc = CurItemInfo.MyConfig as StepConfig; if (sc == null) return; + MyEditItem.ChangeBarForConfigItemChange = false; sc.Step_CAS = (cbCAS.Checked) ? "True" : "False"; + MyEditItem.ChangeBarForConfigItemChange = true; } private void cbPlacekeeper_CheckedChanged(object sender, EventArgs e) { @@ -417,7 +421,9 @@ namespace Volian.Controls.Library MyEditItem.SaveContents(); StepConfig sc = CurItemInfo.MyConfig as StepConfig; if (sc == null) return; - sc.Step_Placekeeper = (cbPlaceKeeper.Checked)?"Y":"N"; + MyEditItem.ChangeBarForConfigItemChange = false; + sc.Step_Placekeeper = (cbPlaceKeeper.Checked) ? "Y" : "N"; + MyEditItem.ChangeBarForConfigItemChange = true; if (cbPlaceKeeper.Checked) { _Initalizing = true; @@ -431,7 +437,9 @@ namespace Volian.Controls.Library MyEditItem.SaveContents(); StepConfig sc = CurItemInfo.MyConfig as StepConfig; if (sc == null) return; + MyEditItem.ChangeBarForConfigItemChange = false; sc.Step_Placekeeper = (cbPlaceKeeperCont.Checked) ? "C" : "N"; + MyEditItem.ChangeBarForConfigItemChange = true; if (cbPlaceKeeperCont.Checked) { _Initalizing = true; diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 53a57179..aec20be7 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -210,6 +210,14 @@ namespace Volian.Controls.Library //if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true; } } + private bool _ChangeBarForConfigItemChange = true; + + public bool ChangeBarForConfigItemChange + { + get { return _ChangeBarForConfigItemChange; } + set { _ChangeBarForConfigItemChange = value; } + } + void value_Changed(object sender) { ChangeBar = _MyItemInfo.HasChangeBar; @@ -2781,7 +2789,8 @@ namespace Volian.Controls.Library using (Item itm = MyItemInfo.Get()) { itm.MyContent.Config = MyItemInfo.MyConfig.ToString(); - itm.MyContent.DTS = DateTime.Now; + if (ChangeBarForConfigItemChange) + itm.MyContent.DTS = DateTime.Now; itm.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID; itm.Save(); } diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 5e4d11ff..39ecb23b 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -856,7 +856,6 @@ namespace Volian.Print.Library if (vcb.Height == heightBefore / MyPageHelper.YMultiplier - 4) { float heightDif = (heightBefore - heightAfter); - vcb.Height = heightAfter; vcb.YChangeBarBottom += heightDif; FixMessages(vcb, heightDif); break; diff --git a/PROMS/Volian.Print.Library/vlnPrintObject.cs b/PROMS/Volian.Print.Library/vlnPrintObject.cs index b9bb210c..0ef8d42a 100644 --- a/PROMS/Volian.Print.Library/vlnPrintObject.cs +++ b/PROMS/Volian.Print.Library/vlnPrintObject.cs @@ -110,7 +110,8 @@ namespace Volian.Print.Library { // If the paragraph iscompressed, it may have been created as not compressed since compression // is not set when paragraph is initially created, it is set during pagination tests. - if (_IParagraph == null || IsCompressed) + //if (_IParagraph == null || IsCompressed) + if (Rtf != null && (_IParagraph == null || IsCompressed)) { int profileDepth = ProfileTimer.Push(">>>> VlnPrintObject.IParagraph"); string myRtf = Rtf;