diff --git a/PROMS/Volian.Controls.Library/DSOTabPanel.cs b/PROMS/Volian.Controls.Library/DSOTabPanel.cs index 0f479c47..45b5b70c 100644 --- a/PROMS/Volian.Controls.Library/DSOTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DSOTabPanel.cs @@ -10,6 +10,7 @@ using Volian.Controls.Library; using System.Reflection; using LBWordLibrary; using JR.Utils.GUI.Forms; +using Volian.Base.Library; namespace Volian.Controls.Library { @@ -143,8 +144,12 @@ namespace Volian.Controls.Library _MyEdWord.DisableSaveHotKey(true); _MyEdWord.DisablePrintHotKey(true); } + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("DSOTabPanel.cs _RefreshTimer_Tick", 148); + void _RefreshTimer_Tick(object sender, EventArgs e) { + _TimeActivity.Open(); _RefreshTimer.Enabled = false; if (_MyEdWord != null)// B2017-133 Edraw { @@ -155,6 +160,7 @@ namespace Volian.Controls.Library //{ // _MyDisplayTabControl.CloseTabItem(_MyDisplayTabItem); //} + _TimeActivity.Close(); } void DSOTabPanel_ClientSizeChanged(object sender, EventArgs e) diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.cs b/PROMS/Volian.Controls.Library/DisplayHistory.cs index 154da213..918cf3cd 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.cs +++ b/PROMS/Volian.Controls.Library/DisplayHistory.cs @@ -9,6 +9,7 @@ using VEPROMS.CSLA.Library; using System.IO; using System.Text.RegularExpressions; using JR.Utils.GUI.Forms; +using Volian.Base.Library; namespace Volian.Controls.Library { @@ -95,7 +96,7 @@ namespace Volian.Controls.Library public EditItem MyEditItem { get { return _MyEditItem; } - set + set { if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface _MyEditItem = value; @@ -111,7 +112,7 @@ namespace Volian.Controls.Library this.Visible = false; if (this.Visible) { - if(RefreshRequired) + if (RefreshRequired) WalkProcedure(); UpdateHistory(); } @@ -120,7 +121,7 @@ namespace Volian.Controls.Library public int ApplDisplayMode { get { return _ApplDisplayMode; } - set + set { if (MyProcedureInfo == null) return; _ApplDisplayMode = value; @@ -236,8 +237,8 @@ namespace Volian.Controls.Library //myRTB.LastRtf = string.Empty; myVFG.Clear(); myPicBox.Image = null; - if (!tvAudits.IsDisposed) // fixes a crash that happend while debugging separate windows, have not been able to reproduce. left this IF check in just in case. - jsj 2-1-2018 - tvAudits.Nodes.Clear(); + if (!tvAudits.IsDisposed) // fixes a crash that happend while debugging separate windows, have not been able to reproduce. left this IF check in just in case. - jsj 2-1-2018 + tvAudits.Nodes.Clear(); if (MyItemInfo == null) { this.Cursor = Cursors.Default; @@ -365,148 +366,148 @@ namespace Volian.Controls.Library foreach (ItemAuditInfo iai in iail) { #region old style - // switch (iai.Level) - // { - // #region previous item - // case 0: //previous item - // { - // #region old style - // //if (previousItem == null) - // // previousItem = tvAudits.Nodes.Add("Deleted Previous Item"); //previousItem = tvAudits.Nodes.Add("Previous Item"); - // //TreeNode tn = previousItem.Nodes.Add(iai.ToString()); - // //tn.Tag = iai; - // #endregion - // #region new style - // if (deletedItems == null) - // deletedItems = tvAudits.Nodes.Add("Deleted Items"); - // TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); - // tnn.Tag = iai; - // #endregion - // break; - // } - // #endregion - // #region next item - // case 1: //next item - // { - // #region old style - // //if (nextItem == null) - // // nextItem = tvAudits.Nodes.Add("Deleted Next Item"); //nextItem = tvAudits.Nodes.Add("Next Item"); - // //TreeNode tn = nextItem.Nodes.Add(iai.ToString()); - // //tn.Tag = iai; - // #endregion - // #region new style - // if (deletedItems == null) - // deletedItems = tvAudits.Nodes.Add("Deleted Items"); - // TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); - // tnn.Tag = iai; - // #endregion - // break; - // } - // #endregion - // case 2: //parts - // { - // #region old style - // //PartAuditInfoList pail = null; - // //pail = PartAuditInfoList.GetByDeleteStatus(iai.DeleteStatus); - // //if (pail.Count == 0) - // // pail = PartAuditInfoList.GetByItemID(iai.ItemID); - // //foreach (PartAuditInfo pai in pail) - // //{ - // // if (pai.ContentID == MyItemInfo.ContentID) - // // { - // // switch (pai.FromType) - // // { - // // #region procedure part - // // case 1: //procedures - // // { - // // if (procedurePart == null) - // // procedurePart = tvAudits.Nodes.Add("Deleted Procedures"); //procedurePart = tvAudits.Nodes.Add("Procedures"); - // // TreeNode tn = procedurePart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // #region section part - // // case 2: //sections - // // { - // // if (sectionPart == null) - // // sectionPart = tvAudits.Nodes.Add("Deleted Sections"); //sectionPart = tvAudits.Nodes.Add("Sections"); - // // TreeNode tn = sectionPart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // #region caution part - // // case 3: //cautions - // // { - // // if (cautionPart == null) - // // cautionPart = tvAudits.Nodes.Add("Deleted Cautions"); //cautionPart = tvAudits.Nodes.Add("Cautions"); - // // TreeNode tn = cautionPart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // #region note part - // // case 4: //notes - // // { - // // if (notePart == null) - // // notePart = tvAudits.Nodes.Add("Deleted Notes"); //notePart = tvAudits.Nodes.Add("Notes"); - // // TreeNode tn = notePart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // #region rno part - // // case 5: //rnos - // // { - // // if (rnoPart == null) - // // rnoPart = tvAudits.Nodes.Add("Deleted RNOs"); //rnoPart = tvAudits.Nodes.Add("RNOs"); - // // TreeNode tn = rnoPart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // #region step part - // // case 6: //steps - // // { - // // if (stepPart == null) - // // stepPart = tvAudits.Nodes.Add("Deleted Steps"); //stepPart = tvAudits.Nodes.Add("Steps"); - // // TreeNode tn = stepPart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // #region table part - // // case 7: //tables - // // { - // // if (tablePart == null) - // // tablePart = tvAudits.Nodes.Add("Deleted Tables"); //tablePart = tvAudits.Nodes.Add("Tables"); - // // TreeNode tn = tablePart.Nodes.Add(iai.ToString()); - // // tn.Tag = iai; - // // break; - // // } - // // #endregion - // // } - // // } - // //} - // #endregion - // #region new style - // if (deletedItems == null) - // deletedItems = tvAudits.Nodes.Add("Deleted Items"); - // TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); - // tnn.Tag = iai; - // #endregion - // break; - // } - //} + // switch (iai.Level) + // { + // #region previous item + // case 0: //previous item + // { + // #region old style + // //if (previousItem == null) + // // previousItem = tvAudits.Nodes.Add("Deleted Previous Item"); //previousItem = tvAudits.Nodes.Add("Previous Item"); + // //TreeNode tn = previousItem.Nodes.Add(iai.ToString()); + // //tn.Tag = iai; + // #endregion + // #region new style + // if (deletedItems == null) + // deletedItems = tvAudits.Nodes.Add("Deleted Items"); + // TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); + // tnn.Tag = iai; + // #endregion + // break; + // } + // #endregion + // #region next item + // case 1: //next item + // { + // #region old style + // //if (nextItem == null) + // // nextItem = tvAudits.Nodes.Add("Deleted Next Item"); //nextItem = tvAudits.Nodes.Add("Next Item"); + // //TreeNode tn = nextItem.Nodes.Add(iai.ToString()); + // //tn.Tag = iai; + // #endregion + // #region new style + // if (deletedItems == null) + // deletedItems = tvAudits.Nodes.Add("Deleted Items"); + // TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); + // tnn.Tag = iai; + // #endregion + // break; + // } + // #endregion + // case 2: //parts + // { + // #region old style + // //PartAuditInfoList pail = null; + // //pail = PartAuditInfoList.GetByDeleteStatus(iai.DeleteStatus); + // //if (pail.Count == 0) + // // pail = PartAuditInfoList.GetByItemID(iai.ItemID); + // //foreach (PartAuditInfo pai in pail) + // //{ + // // if (pai.ContentID == MyItemInfo.ContentID) + // // { + // // switch (pai.FromType) + // // { + // // #region procedure part + // // case 1: //procedures + // // { + // // if (procedurePart == null) + // // procedurePart = tvAudits.Nodes.Add("Deleted Procedures"); //procedurePart = tvAudits.Nodes.Add("Procedures"); + // // TreeNode tn = procedurePart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // #region section part + // // case 2: //sections + // // { + // // if (sectionPart == null) + // // sectionPart = tvAudits.Nodes.Add("Deleted Sections"); //sectionPart = tvAudits.Nodes.Add("Sections"); + // // TreeNode tn = sectionPart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // #region caution part + // // case 3: //cautions + // // { + // // if (cautionPart == null) + // // cautionPart = tvAudits.Nodes.Add("Deleted Cautions"); //cautionPart = tvAudits.Nodes.Add("Cautions"); + // // TreeNode tn = cautionPart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // #region note part + // // case 4: //notes + // // { + // // if (notePart == null) + // // notePart = tvAudits.Nodes.Add("Deleted Notes"); //notePart = tvAudits.Nodes.Add("Notes"); + // // TreeNode tn = notePart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // #region rno part + // // case 5: //rnos + // // { + // // if (rnoPart == null) + // // rnoPart = tvAudits.Nodes.Add("Deleted RNOs"); //rnoPart = tvAudits.Nodes.Add("RNOs"); + // // TreeNode tn = rnoPart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // #region step part + // // case 6: //steps + // // { + // // if (stepPart == null) + // // stepPart = tvAudits.Nodes.Add("Deleted Steps"); //stepPart = tvAudits.Nodes.Add("Steps"); + // // TreeNode tn = stepPart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // #region table part + // // case 7: //tables + // // { + // // if (tablePart == null) + // // tablePart = tvAudits.Nodes.Add("Deleted Tables"); //tablePart = tvAudits.Nodes.Add("Tables"); + // // TreeNode tn = tablePart.Nodes.Add(iai.ToString()); + // // tn.Tag = iai; + // // break; + // // } + // // #endregion + // // } + // // } + // //} + // #endregion + // #region new style + // if (deletedItems == null) + // deletedItems = tvAudits.Nodes.Add("Deleted Items"); + // TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); + // tnn.Tag = iai; + // #endregion + // break; + // } + //} #endregion - #region new style - if (deletedItems == null) - deletedItems = tvAudits.Nodes.Add("Deleted Items"); - TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); - tnn.Tag = iai; - #endregion - } + #region new style + if (deletedItems == null) + deletedItems = tvAudits.Nodes.Add("Deleted Items"); + TreeNode tnn = deletedItems.Nodes.Add(iai.ToString()); + tnn.Tag = iai; + #endregion + } //Console.WriteLine("UpdateHistory: {0} seconds",TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalSeconds); this.Cursor = Cursors.Default; } @@ -566,7 +567,7 @@ namespace Volian.Controls.Library if (stepnum == string.Empty) { ItemInfo iii = aai.MyItemInfo; - if(iii != null) + if (iii != null) stepnum = FixPath(iii.SearchPath); } if (aai.DTS > MyRevDate) @@ -581,7 +582,7 @@ namespace Volian.Controls.Library private static string FixPath(string path) { string itemTitle = Regex.Replace(path, "^..+?\\u0007", ""); - itemTitle = itemTitle.Replace("\x11", itemTitle[0] == '\x11' ? "" : " - ").Replace(@"\u8209?", "-").Replace(@"\u9586?",@"\"); + itemTitle = itemTitle.Replace("\x11", itemTitle[0] == '\x11' ? "" : " - ").Replace(@"\u8209?", "-").Replace(@"\u9586?", @"\"); return itemTitle; } private void btnViewChronologyReport_Click(object sender, EventArgs e) @@ -594,7 +595,7 @@ namespace Volian.Controls.Library //_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate); //added setting selected slave in order for reports to replace unit number,etc jcb 20101010 MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode; -// OnChronologyPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MyChronology.pdf", MyItemInfo.MyProcedure, _ChronologyAuditList, _AnnotationList)); + // OnChronologyPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MyChronology.pdf", MyItemInfo.MyProcedure, _ChronologyAuditList, _AnnotationList)); OnChronologyPrintRequest(new DisplayHistoryReportEventArgs(string.Format(@"{0}\{1} Chronology of Changes.pdf", Volian.Base.Library.VlnSettings.TemporaryFolder, MyItemInfo.MyProcedure.PDFNumber), MyItemInfo.MyProcedure, _ChronologyAuditList, _AnnotationList)); //} } @@ -608,8 +609,8 @@ namespace Volian.Controls.Library //_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate); //added setting selected slave in order for reports to replace unit number,etc jcb 20101010 MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode; -// OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MySummary.pdf", MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList)); - OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(string.Format(@"{0}\{1} Summary of Changes.pdf", Volian.Base.Library.VlnSettings.TemporaryFolder,MyItemInfo.MyProcedure.PDFNumber), MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList)); + // OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MySummary.pdf", MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList)); + OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(string.Format(@"{0}\{1} Summary of Changes.pdf", Volian.Base.Library.VlnSettings.TemporaryFolder, MyItemInfo.MyProcedure.PDFNumber), MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList)); //} } private void btnRefresh_Click(object sender, EventArgs e) @@ -635,7 +636,7 @@ namespace Volian.Controls.Library if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); - ContentInfo ci = ContentInfo.RestoreContent(cai,myRoFst); + ContentInfo ci = ContentInfo.RestoreContent(cai, myRoFst); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); RefreshRequired = true; UpdateHistory(); @@ -667,10 +668,10 @@ namespace Volian.Controls.Library if (iai.Level == 2) { ROFstInfo myRoFst = null; // B2017-118 If No ROFST don't crash - if(MyItemInfo.MyDocVersion.DocVersionAssociations != null) - myRoFst= MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; - if(myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); - ii = MyItemInfo.RestoreItem(iai,myRoFst); + if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) + myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; + if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); + ii = MyItemInfo.RestoreItem(iai, myRoFst); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); //_MyEditItem.AddChild((E_FromType)fromtype, contenttype); //ii.ItemParts[0].FromType @@ -742,7 +743,7 @@ namespace Volian.Controls.Library if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); - ii = MyItemInfo.RestoreSibling(iai,myRoFst); + ii = MyItemInfo.RestoreSibling(iai, myRoFst); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); if (ii.IsStep) ii = StepInfo.Get(ii.ItemID); @@ -773,7 +774,7 @@ namespace Volian.Controls.Library ii.UpdateTransitionText(); ii.UpdateROText(); } - if(MyEditItem.MyPreviousEditItem != null) + if (MyEditItem.MyPreviousEditItem != null) MyEditItem.MyPreviousEditItem.SetAllTabs(); else MyEditItem.SetAllTabs(); @@ -806,7 +807,7 @@ namespace Volian.Controls.Library if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); - ContentInfo ci = ContentInfo.RestoreContent(cai,myRoFst); + ContentInfo ci = ContentInfo.RestoreContent(cai, myRoFst); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); RefreshRequired = true; UpdateHistory(); @@ -918,11 +919,11 @@ namespace Volian.Controls.Library myRTB.Visible = true; myRTB.BringToFront(); myVFG.Visible = false; -// myRTB.Font = new Font("Arial", 12, FontStyle.Regular); -// myRTB.Text = cai.Text; + // myRTB.Font = new Font("Arial", 12, FontStyle.Regular); + // myRTB.Text = cai.Text; //myRTB.SetupRichText("bozo", MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font); //myRTB.LastRtf = string.Empty; - myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font); + myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font); } } if (tn.Tag is ItemAuditInfo) @@ -936,7 +937,7 @@ namespace Volian.Controls.Library { //myRTB.Font = new Font("Arial", 12, FontStyle.Regular); //myRTB.Text = cai.Text; - myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font); + myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font); } } } @@ -969,13 +970,18 @@ namespace Volian.Controls.Library myTimer.Enabled = false; myTimer.Enabled = true; } + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("DisplayHistory myTimer_Tick", 974); + private void myTimer_Tick(object sender, System.EventArgs e) { + _TimeActivity.Open(); myTimer.Enabled = false; if (this.lbChanges.Visible) this.tabControl1.SelectedTab = tabItem2; UpdateHistory(); RefreshRequired = true; + _TimeActivity.Close(); } } @@ -1032,5 +1038,4 @@ namespace Volian.Controls.Library _ItemID = itemID; } } -} - +} \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index 008306d9..1c65ef62 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -112,9 +112,12 @@ namespace Volian.Controls.Library MyROFST = null; } } + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("DisplayRO MyRTB_SelectionChanged", 117); void MyRTB_SelectionChanged(object sender, EventArgs e) { + _TimeActivity.Open(); lbFound.SelectionMode = SelectionMode.None; lbFound.DataSource = null; //Spin through ROs looking for the selected text @@ -135,6 +138,7 @@ namespace Volian.Controls.Library } else lbFound.Visible = false; + _TimeActivity.Close(); } void MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 4f10dc2e..a7789794 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -393,11 +393,16 @@ namespace Volian.Controls.Library return _TmrRefresh; } } + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("DisplaySearch _TmrRefresh_Tick", 399); + // B2016-258 Hang after selecting a procedure if the Step Type panel is open on the search panel void _TmrRefresh_Tick(object sender, EventArgs e) { + _TimeActivity.Open(); TmrRefresh.Enabled = false; AdvTreeStepTypesFillIn(); + _TimeActivity.Close(); } public void StartAdvTreeStepTypesFillIn()// B2016-258 Hang after selecting a procedure if the Step Type panel is open on the search panel { diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 7e3965b9..30077ca5 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -9,6 +9,7 @@ using VEPROMS.CSLA.Library; using Volian.Controls.Library; using DevComponents.DotNetBar; using JR.Utils.GUI.Forms; +using Volian.Base.Library; namespace Volian.Controls.Library { @@ -877,9 +878,14 @@ namespace Volian.Controls.Library tmrCaret.Enabled = false; PnlCaret.Visible = false; } + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("DisplayTabControl.cs tmrCaret_Tick", 881); + private void tmrCaret_Tick(object sender, EventArgs e) { + _TimeActivity.Open(); PnlCaret.Visible = !PnlCaret.Visible; + _TimeActivity.Close(); } #endregion #region Private Methods diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index c73b6ec1..268e8650 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -641,7 +641,7 @@ namespace Volian.Controls.Library // would be. This is only used for display, printing works. //B2019-155 Hard spaces were displace as a square box for non-proportional fonts. // To fix this, we removed the check for a proportional font and now replace the hard space with a "'" mark for all fonts - Rtf = Rtf.Replace(@"\'a0", "'"); + Rtf = Rtf.Replace(@"\'a0", "'"); } OrigRTF = Rtf; _InitializingRTB = false; @@ -896,10 +896,15 @@ namespace Volian.Controls.Library { if (ReadOnly) return; } + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("StepRTB CloseWordApp_Tick", 902); + void StepRTB_SelectionChanged(object sender, EventArgs e) { + _TimeActivity.Open(); if (_InitializingRTB || _IsExperimenting || (MyItemInfo!=null && MyItemInfo.IsRtfRaw)) return; HandleSelectionChange(); + _TimeActivity.Close(); } private bool _MouseDown = false; private bool _ContextMenuStripChanged = false; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index f43a867d..3c85ac9c 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -831,8 +831,12 @@ namespace Volian.Controls.Library private int lastStart = -1; private int lastLength = -1; private string lastText = null; + // B2019-161 When tracking timing time this action + private static VolianTimer _TimeActivity = new VolianTimer("StepTabRibbon.cs _MyStepRTB_SelectionChanged",837); + void _MyStepRTB_SelectionChanged(object sender, EventArgs e) { + _TimeActivity.Open(); //B2019-154 This will prevent duplicate processing of the ribbon menu and refresh of step items, speeding up the editing experience if (_MyStepRTB.MyItemInfo == lastItem && _MyStepRTB.SelectionStart == lastStart && _MyStepRTB.SelectionLength == lastLength && _MyStepRTB.SelectedText == lastText) return; @@ -841,6 +845,7 @@ namespace Volian.Controls.Library lastLength = _MyStepRTB.SelectionLength; lastText = _MyStepRTB.SelectedText; SetButtonAndMenuEnabling(false); + _TimeActivity.Close(); } //void _MyStepRTB_MouseUp(object sender, MouseEventArgs e) //{