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

Show the amount of time it takes to complete a search

Browse Source 
Remove Debug Messages
Eliminate crash due to SQL connections
The location for search result was changed from bullets to meaningful values.
This commit is contained in:
Rich 2016-02-12 20:00:10 +00:00
parent 006d194d01
commit 697fbf98f8
5 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -290,6 +290,7 @@ namespace VEPROMS
Database.LastDatabase = Properties.Settings.Default.DefaultDB;
// Setup the Context menu for DisplaySearch including the symbols
displaySearch1.SetupContextMenu();
displaySearch1.SearchComplete += displaySearch1_SearchComplete;
if (!FormatInfo.HasLatestChanges())
throw new Exception("Inconsistent Formats");
if (!ItemAuditInfo.IsChangeManagerVersion())
@ -323,6 +324,10 @@ namespace VEPROMS
tv.PauseRefresh += tv_PauseRefresh;
tv.UnPauseRefresh += tv_UnPauseRefresh;
}
void displaySearch1_SearchComplete(object sender, DisplaySearchEventArgs args)
{
ProgBarText = string.Format("{0} Seconds", args.HowLong.TotalSeconds);
}
private bool _PauseRefresh = false;
public bool PauseRefresh
{

17
PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
View File

@ -32,26 +32,35 @@ namespace VEPROMS.CSLA.Library
#region Log4Net
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#endregion
private static string _DBServer = null;
public static string DBServer
{ get
{
get
{
if (_DBServer == null)
{
string cnstr = null;
try
{
using (SqlConnection cn = Database.VEPROMS_SqlConnection)
cnstr = cn.ConnectionString;
string server = "";
string db = "";
Match m = Regex.Match(Database.VEPROMS_SqlConnection.ConnectionString, "Data Source=([^;]+)(;[^;]+)*;*Initial Catalog=([^;]+)(;[^;]+)*");
Match m = Regex.Match(cnstr, "Data Source=([^;]+)(;[^;]+)*;*Initial Catalog=([^;]+)(;[^;]+)*");
if (m.Success && m.Groups.Count > 4)
{
server = m.Groups[1].Value;
db = m.Groups[3].Value;
}
return string.Format("{0} - {1}", server, db);
_DBServer = string.Format("{0} - {1}", server, db);
}
catch (Exception)
{
return Database.VEPROMS_SqlConnection.ConnectionString;
_DBServer = cnstr;
}
}
return _DBServer;
}
}
private static int _DefaultTimeout = 600; // 600 seconds, i.e. 10 minutes

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

@ -22,6 +22,12 @@ namespace Volian.Controls.Library
if (PrintRequest != null)
PrintRequest(this, args);
}
public event DisplaySearchEvent SearchComplete;
private void OnSearchComplete(DisplaySearchEventArgs args)
{
if (SearchComplete != null)
SearchComplete(this, args);
}
#endregion
#region Properties
private string _strSrchText = "";
@ -1369,7 +1375,8 @@ namespace Volian.Controls.Library
{
Cursor = savcursor;
}
Console.WriteLine("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds);
//Console.WriteLine("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds);
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
//if (VlnSettings.DebugMode)
// MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds));
}
@ -2190,6 +2197,16 @@ namespace Volian.Controls.Library
get { return _MyItemInfoList; }
set { _MyItemInfoList = value; }
}
private TimeSpan _HowLong = TimeSpan.FromTicks(0);
public TimeSpan HowLong
{
get { return _HowLong; }
set { _HowLong = value; }
}
public DisplaySearchEventArgs(TimeSpan howLong)
{
HowLong = howLong;
}
public DisplaySearchEventArgs(string reportTitle, string typesSelected, string searchString, ICollection<ItemInfo> myItemInfoList)
{
_ReportTitle = reportTitle;

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

@ -697,7 +697,7 @@ namespace Volian.Controls.Library
if (_MyEditItem.RTBLastFocus)
{
trackerSC++;
/*if (trackerSC>20) */Console.WriteLine("ShowCaret: {0}", trackerSC);
/*if (trackerSC>20) *///Console.WriteLine("ShowCaret: {0}", trackerSC);
//Volian.Base.Library.vlnStackTrace.ShowStack("ShowCaret: EI: {0} StepRTB: {1}", _MyEditItem.MyItemInfo.ItemID, _MyStepRTB.MyItemInfo.ItemID);
if (!_MyStepRTB.Visible)
_MyStepRTB.Visible = true;
@ -727,7 +727,7 @@ namespace Volian.Controls.Library
if (_MyStepRTB != null && !_MyStepRTB.Disposing && !_MyStepRTB.Closed)
{
trackerHC++;
/* if (trackerHC>20)*/ Console.WriteLine("HideCaret {0}", trackerHC);
/* if (trackerHC>20)*/ //Console.WriteLine("HideCaret {0}", trackerHC);
//Volian.Base.Library.vlnStackTrace.ShowStack("HideCaret: StepRTB: {0}", _MyStepRTB.MyItemInfo.ItemID);
HideTheCaret();
if (_MyStepRTB.SelectionLength > 0)

3
PROMS/Volian.Print.Library/PDFReport.cs
View File

@ -836,7 +836,10 @@ namespace Volian.Print.Library
StepInfo stpinfo = StepInfo.Get(pitem.ItemID);
string thisTab = stpinfo.MyTab.CleanText; //StepInfo.Get(pitem.ItemID).MyTab.CleanText;
if (IncludesParentToHLS(stpinfo))
if (!thisTab.Contains("\u25CF")) //Remove Bullet
return thisTab;
else
thisTab = null;
string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;//stpinfo.FormatStepData.ToString();
// remove delimiters of '.' and ')' in tab.
if (thisTab != null)