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

B2019-161 Timing of display history

Browse Source 
B2019-161 Timing of display RO
B2019-161 Timing of display search
B2019-161 Timing of display tab control
B2019-161 Timing of DSO Tab Panel Refresh
B2019-161 Timing of close word app
B2019-161 Timing of MyStepRTB selection changed
This commit is contained in:
Rich 2019-10-29 13:21:32 +00:00
parent 0bc786f46f
commit ee658d6a6d
7 changed files with 202 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ using Volian.Controls.Library;
using System.Reflection; using System.Reflection;
using LBWordLibrary; using LBWordLibrary;
using JR.Utils.GUI.Forms; using JR.Utils.GUI.Forms;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -143,8 +144,12 @@ namespace Volian.Controls.Library
_MyEdWord.DisableSaveHotKey(true); _MyEdWord.DisableSaveHotKey(true);
_MyEdWord.DisablePrintHotKey(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) void _RefreshTimer_Tick(object sender, EventArgs e)
{ {
_TimeActivity.Open();
_RefreshTimer.Enabled = false; _RefreshTimer.Enabled = false;
if (_MyEdWord != null)// B2017-133 Edraw if (_MyEdWord != null)// B2017-133 Edraw
{ {
@ -155,6 +160,7 @@ namespace Volian.Controls.Library
//{ //{
// _MyDisplayTabControl.CloseTabItem(_MyDisplayTabItem); // _MyDisplayTabControl.CloseTabItem(_MyDisplayTabItem);
//} //}
_TimeActivity.Close();
} }
void DSOTabPanel_ClientSizeChanged(object sender, EventArgs e) void DSOTabPanel_ClientSizeChanged(object sender, EventArgs e)

39
PROMS/Volian.Controls.Library/DisplayHistory.cs
View File

@ -9,6 +9,7 @@ using VEPROMS.CSLA.Library;
using System.IO; using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using JR.Utils.GUI.Forms; using JR.Utils.GUI.Forms;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -111,7 +112,7 @@ namespace Volian.Controls.Library
this.Visible = false; this.Visible = false;
if (this.Visible) if (this.Visible)
{ {
if(RefreshRequired) if (RefreshRequired)
WalkProcedure(); WalkProcedure();
UpdateHistory(); UpdateHistory();
} }
@ -566,7 +567,7 @@ namespace Volian.Controls.Library
if (stepnum == string.Empty) if (stepnum == string.Empty)
{ {
ItemInfo iii = aai.MyItemInfo; ItemInfo iii = aai.MyItemInfo;
if(iii != null) if (iii != null)
stepnum = FixPath(iii.SearchPath); stepnum = FixPath(iii.SearchPath);
} }
if (aai.DTS > MyRevDate) if (aai.DTS > MyRevDate)
@ -581,7 +582,7 @@ namespace Volian.Controls.Library
private static string FixPath(string path) private static string FixPath(string path)
{ {
string itemTitle = Regex.Replace(path, "^..+?\\u0007", ""); 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; return itemTitle;
} }
private void btnViewChronologyReport_Click(object sender, EventArgs e) private void btnViewChronologyReport_Click(object sender, EventArgs e)
@ -594,7 +595,7 @@ namespace Volian.Controls.Library
//_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate); //_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate);
//added setting selected slave in order for reports to replace unit number,etc jcb 20101010 //added setting selected slave in order for reports to replace unit number,etc jcb 20101010
MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode; 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)); 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); //_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate);
//added setting selected slave in order for reports to replace unit number,etc jcb 20101010 //added setting selected slave in order for reports to replace unit number,etc jcb 20101010
MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode; MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode;
// OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MySummary.pdf", 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)); 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) private void btnRefresh_Click(object sender, EventArgs e)
@ -635,7 +636,7 @@ namespace Volian.Controls.Library
if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) if (MyItemInfo.MyDocVersion.DocVersionAssociations != null)
myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); 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); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate);
RefreshRequired = true; RefreshRequired = true;
UpdateHistory(); UpdateHistory();
@ -667,10 +668,10 @@ namespace Volian.Controls.Library
if (iai.Level == 2) if (iai.Level == 2)
{ {
ROFstInfo myRoFst = null; // B2017-118 If No ROFST don't crash ROFstInfo myRoFst = null; // B2017-118 If No ROFST don't crash
if(MyItemInfo.MyDocVersion.DocVersionAssociations != null) if (MyItemInfo.MyDocVersion.DocVersionAssociations != null)
myRoFst= MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
if(myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate);
ii = MyItemInfo.RestoreItem(iai,myRoFst); ii = MyItemInfo.RestoreItem(iai, myRoFst);
if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate);
//_MyEditItem.AddChild((E_FromType)fromtype, contenttype); //_MyEditItem.AddChild((E_FromType)fromtype, contenttype);
//ii.ItemParts[0].FromType //ii.ItemParts[0].FromType
@ -742,7 +743,7 @@ namespace Volian.Controls.Library
if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) if (MyItemInfo.MyDocVersion.DocVersionAssociations != null)
myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); 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 (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate);
if (ii.IsStep) if (ii.IsStep)
ii = StepInfo.Get(ii.ItemID); ii = StepInfo.Get(ii.ItemID);
@ -773,7 +774,7 @@ namespace Volian.Controls.Library
ii.UpdateTransitionText(); ii.UpdateTransitionText();
ii.UpdateROText(); ii.UpdateROText();
} }
if(MyEditItem.MyPreviousEditItem != null) if (MyEditItem.MyPreviousEditItem != null)
MyEditItem.MyPreviousEditItem.SetAllTabs(); MyEditItem.MyPreviousEditItem.SetAllTabs();
else else
MyEditItem.SetAllTabs(); MyEditItem.SetAllTabs();
@ -806,7 +807,7 @@ namespace Volian.Controls.Library
if (MyItemInfo.MyDocVersion.DocVersionAssociations != null) if (MyItemInfo.MyDocVersion.DocVersionAssociations != null)
myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
if (myRoFst != null) myRoFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate); 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); if (myRoFst != null) myRoFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(myRoFst_ROTableUpdate);
RefreshRequired = true; RefreshRequired = true;
UpdateHistory(); UpdateHistory();
@ -918,8 +919,8 @@ namespace Volian.Controls.Library
myRTB.Visible = true; myRTB.Visible = true;
myRTB.BringToFront(); myRTB.BringToFront();
myVFG.Visible = false; myVFG.Visible = false;
// myRTB.Font = new Font("Arial", 12, FontStyle.Regular); // myRTB.Font = new Font("Arial", 12, FontStyle.Regular);
// myRTB.Text = cai.Text; // myRTB.Text = cai.Text;
//myRTB.SetupRichText("bozo", MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font); //myRTB.SetupRichText("bozo", MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font);
//myRTB.LastRtf = string.Empty; //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);
@ -969,13 +970,18 @@ namespace Volian.Controls.Library
myTimer.Enabled = false; myTimer.Enabled = false;
myTimer.Enabled = true; 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) private void myTimer_Tick(object sender, System.EventArgs e)
{ {
_TimeActivity.Open();
myTimer.Enabled = false; myTimer.Enabled = false;
if (this.lbChanges.Visible) if (this.lbChanges.Visible)
this.tabControl1.SelectedTab = tabItem2; this.tabControl1.SelectedTab = tabItem2;
UpdateHistory(); UpdateHistory();
RefreshRequired = true; RefreshRequired = true;
_TimeActivity.Close();
} }
} }
@ -1033,4 +1039,3 @@ namespace Volian.Controls.Library
} }
} }
} }

4
PROMS/Volian.Controls.Library/DisplayRO.cs
View File

@ -112,9 +112,12 @@ namespace Volian.Controls.Library
MyROFST = null; 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) void MyRTB_SelectionChanged(object sender, EventArgs e)
{ {
_TimeActivity.Open();
lbFound.SelectionMode = SelectionMode.None; lbFound.SelectionMode = SelectionMode.None;
lbFound.DataSource = null; lbFound.DataSource = null;
//Spin through ROs looking for the selected text //Spin through ROs looking for the selected text
@ -135,6 +138,7 @@ namespace Volian.Controls.Library
} }
else else
lbFound.Visible = false; lbFound.Visible = false;
_TimeActivity.Close();
} }
void MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args) void MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)

5
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@ -393,11 +393,16 @@ namespace Volian.Controls.Library
return _TmrRefresh; 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 // 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) void _TmrRefresh_Tick(object sender, EventArgs e)
{ {
_TimeActivity.Open();
TmrRefresh.Enabled = false; TmrRefresh.Enabled = false;
AdvTreeStepTypesFillIn(); AdvTreeStepTypesFillIn();
_TimeActivity.Close();
} }
public void StartAdvTreeStepTypesFillIn()// B2016-258 Hang after selecting a procedure if the Step Type panel is open on the search panel public void StartAdvTreeStepTypesFillIn()// B2016-258 Hang after selecting a procedure if the Step Type panel is open on the search panel
{ {

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

@ -9,6 +9,7 @@ using VEPROMS.CSLA.Library;
using Volian.Controls.Library; using Volian.Controls.Library;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using JR.Utils.GUI.Forms; using JR.Utils.GUI.Forms;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -877,9 +878,14 @@ namespace Volian.Controls.Library
tmrCaret.Enabled = false; tmrCaret.Enabled = false;
PnlCaret.Visible = 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) private void tmrCaret_Tick(object sender, EventArgs e)
{ {
_TimeActivity.Open();
PnlCaret.Visible = !PnlCaret.Visible; PnlCaret.Visible = !PnlCaret.Visible;
_TimeActivity.Close();
} }
#endregion #endregion
#region Private Methods #region Private Methods

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

@ -896,10 +896,15 @@ namespace Volian.Controls.Library
{ {
if (ReadOnly) return; 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) void StepRTB_SelectionChanged(object sender, EventArgs e)
{ {
_TimeActivity.Open();
if (_InitializingRTB || _IsExperimenting || (MyItemInfo!=null && MyItemInfo.IsRtfRaw)) return; if (_InitializingRTB || _IsExperimenting || (MyItemInfo!=null && MyItemInfo.IsRtfRaw)) return;
HandleSelectionChange(); HandleSelectionChange();
_TimeActivity.Close();
} }
private bool _MouseDown = false; private bool _MouseDown = false;
private bool _ContextMenuStripChanged = false; private bool _ContextMenuStripChanged = false;

5
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@ -831,8 +831,12 @@ namespace Volian.Controls.Library
private int lastStart = -1; private int lastStart = -1;
private int lastLength = -1; private int lastLength = -1;
private string lastText = null; 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) 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 //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) if (_MyStepRTB.MyItemInfo == lastItem && _MyStepRTB.SelectionStart == lastStart && _MyStepRTB.SelectionLength == lastLength && _MyStepRTB.SelectedText == lastText)
return; return;
@ -841,6 +845,7 @@ namespace Volian.Controls.Library
lastLength = _MyStepRTB.SelectionLength; lastLength = _MyStepRTB.SelectionLength;
lastText = _MyStepRTB.SelectedText; lastText = _MyStepRTB.SelectedText;
SetButtonAndMenuEnabling(false); SetButtonAndMenuEnabling(false);
_TimeActivity.Close();
} }
//void _MyStepRTB_MouseUp(object sender, MouseEventArgs e) //void _MyStepRTB_MouseUp(object sender, MouseEventArgs e)
//{ //{