Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ACTIVE error management

Browse Source 
Fix tool table cancel buttons
Removed deleted button in edit
This commit is contained in:
Lucio Maranta
2019-03-26 17:01:29 +01:00
parent 463e24a2d2
commit 7ed87452a4
8 changed files with 97 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Core/ThreadsFunctions.cs
+7 -53
View File
@@ -1018,6 +1018,10 @@ public static class ThreadsFunctions
case CMS_ERROR_CODES.INTERNAL_ERROR:
Manage(ERROR_LEVEL.FATAL, cmsError.localizationKey);
break;
case CMS_ERROR_CODES.SELECTED_PROCESS:
Manage(ERROR_LEVEL.FATAL, cmsError.localizationKey);
break;
//default:
// Manage(ERROR_LEVEL.WARNING, cmsError.localizationKey);
// break;
@@ -1040,7 +1044,7 @@ public static class ThreadsFunctions
ThreadsHandler.RunningThreadStatus["ReadAxesPositionsData"] = (ReadAxesTimer / ReadAxesTimes) + " mS";
ReadAxesTimer = 0;
ReadAxesTimes = 0;
}
}
if (ThreadsHandler.RunningThreadStatus.ContainsKey("ReadPowerOnData") && ReadPowerOnTimes != 0)
{
@@ -1086,6 +1090,7 @@ public static class ThreadsFunctions
ReadAxesNamesTimer = 0;
ReadAxesNamesTimes = 0;
}
if (ThreadsHandler.RunningThreadStatus.ContainsKey("UpdateToolsData") && ReadAxesNamesTimer != 0)
{
ThreadsHandler.RunningThreadStatus["UpdateToolsData"] = (ReadToolDataTimer / ReadToolDataTimes) + " mS";
@@ -1134,55 +1139,4 @@ public static class ThreadsFunctions
}
#endregion SupportFunctions
}
//public static void MonitorPanelPCResources()
//{
// float sumRec, sumSen;
// Stopwatch sw = new Stopwatch();
// DTONetworkMonitorModel Monitor = new DTONetworkMonitorModel();
// int cardId = ServerConfig.ServerStartupConfig.NetworkCardId - 1;
// PerformanceCounterCategory performanceCounterCategory = new PerformanceCounterCategory("Network Interface");
// if (cardId < 0 || cardId > performanceCounterCategory.GetInstanceNames().Length)
// {
// Monitor.Name = "No card to monitor";
// MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
// return;
// }
// Monitor.Name = performanceCounterCategory.GetInstanceNames()[cardId];
// PerformanceCounter PC_Bandwith = new PerformanceCounter("Network Interface", "Current Bandwidth", Monitor.Name);
// PerformanceCounter PC_RecievedBytes = new PerformanceCounter("Network Interface", "Bytes Received/sec", Monitor.Name);
// PerformanceCounter PC_SentBytes = new PerformanceCounter("Network Interface", "Bytes Sent/sec", Monitor.Name);
// Monitor.Bandwidth = PC_Bandwith.NextValue();
// try
// {
// while (true)
// {
// sw.Restart();
// sumRec = 0;
// sumSen = 0;
// for (int index = 0; index < 50; index++)
// {
// sumRec += PC_RecievedBytes.NextValue();
// sumSen += PC_SentBytes.NextValue();
// }
// Monitor.Value = Math.Round(((8 * (sumSen + sumRec)) / (Monitor.Bandwidth * 50) * 100), 2);
// MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
// sw.Stop();
// // Wait
// Thread.Sleep(CalcSleepTime(2000, (int)sw.ElapsedMilliseconds));
// }
// }
// catch (ThreadAbortException)
// {
// ExceptionManager.Manage(ERROR_LEVEL.FATAL, "Fatal error in Network Performance monitor Thread");
// }
//}
}