From 21353ceb8266cf7fdbbb6d3a3d882937cbb52658 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 3 Sep 2014 12:20:44 +0000 Subject: [PATCH] =?UTF-8?q?Undo=20previous=20fix=20for=20backspace=20size?= =?UTF-8?q?=20=E2=80=93=20was=20incomplete=20solution=20improve=20debug=20?= =?UTF-8?q?performance=20(used=20by=20developers=20only)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 5 ++++- .../Format/PlantFormat.cs | 8 -------- PROMS/fmtxml/FmtFileToXml.cs | 2 -- PROMS/fmtxml/PlantSpecific_WolfCreak.cs | 1 - PROMS/fmtxml/TranslateFMT.XSL | Bin 214914 -> 214500 bytes 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 7dbd7210..37010d4b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -861,7 +861,10 @@ namespace VEPROMS System.Threading.AutoResetEvent autoEvent = new System.Threading.AutoResetEvent(false); //System.Threading.TimerCallback timerDelegate = new System.Threading.TimerCallback(MySessionInfo.PingSession); System.Threading.TimerCallback timerDelegate = new System.Threading.TimerCallback(this.PingSession); - MyActivityTimer = new System.Threading.Timer(timerDelegate, autoEvent, 10000, 10000); + + if (!System.Diagnostics.Process.GetCurrentProcess().ProcessName.ToLower().EndsWith("vshost")) + MyActivityTimer = new System.Threading.Timer(timerDelegate, autoEvent, 10000, 10000); + //string debugMode = ConfigurationManager.AppSettings["Debug"]; //VlnSettings.DebugMode = bool.Parse(debugMode); // set debug for the Volian.Controls.Library // get the saved location and size of the VE-PROMS appication for this user diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 3483d700..8acdda86 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -649,14 +649,6 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DoPrnDrvrAdjusts, "@DoPrnDrvrAdjusts"); } } - private LazyLoad _BackSpaceSize; - public float? BackSpaceSize - { - get - { - return LazyLoad(ref _BackSpaceSize, "@BackSpaceSize"); - } - } private LazyLoad _TopOfPageThing; public string TopOfPageThing { diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index b2c6ad6e..ed8fa030 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -412,7 +412,6 @@ public struct GeneralEditor public struct GeneralPrint { public Int16 DoPrnDrvrAdjusts; - public float BackSpaceSize; public string TopOfPageThing; /* Format flags moved to here.... */ public string DoRevDate; @@ -4926,7 +4925,6 @@ namespace fmtxml if (mainFmt.EditData.PromptForCautionType != null && mainFmt.EditData.PromptForCautionType == subFmt.EditData.PromptForCautionType) subFmt.EditData.PromptForCautionType = "null"; if (mainFmt.SectData.StepSectionData.TopRow == subFmt.SectData.StepSectionData.TopRow) subFmt.SectData.StepSectionData.TopRow = NullInt; if (mainFmt.PrintData.DoPrnDrvrAdjusts == subFmt.PrintData.DoPrnDrvrAdjusts) subFmt.PrintData.DoPrnDrvrAdjusts = NullInt; - if (mainFmt.PrintData.BackSpaceSize == subFmt.PrintData.BackSpaceSize) subFmt.PrintData.BackSpaceSize = NullInt; if (mainFmt.PrintData.DoRevDate != null && mainFmt.PrintData.DoRevDate == subFmt.PrintData.DoRevDate) subFmt.PrintData.DoRevDate = "null"; if (mainFmt.PrintData.AlternateFoldoutPages != null && mainFmt.PrintData.AlternateFoldoutPages == subFmt.PrintData.AlternateFoldoutPages) subFmt.PrintData.AlternateFoldoutPages = "null"; if (mainFmt.PrintData.AlternateFloatingFoldout != null && mainFmt.PrintData.AlternateFloatingFoldout == subFmt.PrintData.AlternateFloatingFoldout) subFmt.PrintData.AlternateFloatingFoldout = "null"; diff --git a/PROMS/fmtxml/PlantSpecific_WolfCreak.cs b/PROMS/fmtxml/PlantSpecific_WolfCreak.cs index 8b2c56d7..3f8a1c4c 100644 --- a/PROMS/fmtxml/PlantSpecific_WolfCreak.cs +++ b/PROMS/fmtxml/PlantSpecific_WolfCreak.cs @@ -131,7 +131,6 @@ namespace fmtxml } private void AddWCNCKLFmt(ref FormatData fmtdata) { - fmtdata.PrintData.BackSpaceSize = 21.3f; fmtdata.BoxData[3].End = 518; fmtdata.BoxData[4].End = 518; fmtdata.StepData[30].StepLayoutData.AlignWithParentTab = "True"; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index a9b3c4fddace2f021f4343788a5851111e080363..25e51bcf906f37a6dda5882666f903ccbd745edf 100644 GIT binary patch delta 40 vcmZqb=Y7)6yTMLsdeAaPq0Ko`b66%DJYs8}pwK=+ff0zAwog!C{-g!~JwOic delta 125 zcmaFT&D+$^yTMLM+KC~NA(lrbqye;~=^GC9DHgA;B9Nb>3Q2}>A-CI?7yHFL