From 3574608a730d9e959820bc4e1de813e90cd4ebf2 Mon Sep 17 00:00:00 2001 From: Stricted Date: Wed, 11 Nov 2015 23:22:57 +0100 Subject: [PATCH] cleanup --- .../Cryptography.cs | 1 - .../Data/SpeedportHybrid.cs | 2 +- .../Data/SpeedportHybridAPI.cs | 1 - .../PageModel/DslPageModel.cs | 40 ++++++++++++++++++- .../PageModel/LteInfoModel.cs | 4 -- SpeedportHybridControl/page/AboutPage.xaml | 6 +-- SpeedportHybridControl/page/ControlsPage.xaml | 6 +-- SpeedportHybridControl/page/LanPage.xaml.cs | 11 +---- SpeedportHybridControl/page/LoginPage.xaml | 4 +- SpeedportHybridControl/page/LteInfoPage.xaml | 6 +-- SpeedportHybridControl/page/StatusPage.xaml | 6 +-- 11 files changed, 54 insertions(+), 33 deletions(-) diff --git a/SpeedportHybridControl.Implementations/Cryptography.cs b/SpeedportHybridControl.Implementations/Cryptography.cs index d548039..7fda3fe 100644 --- a/SpeedportHybridControl.Implementations/Cryptography.cs +++ b/SpeedportHybridControl.Implementations/Cryptography.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Linq; using System.Security.Cryptography; using System.Text; diff --git a/SpeedportHybridControl/Data/SpeedportHybrid.cs b/SpeedportHybridControl/Data/SpeedportHybrid.cs index 27ac08e..cee3ed7 100644 --- a/SpeedportHybridControl/Data/SpeedportHybrid.cs +++ b/SpeedportHybridControl/Data/SpeedportHybrid.cs @@ -751,7 +751,7 @@ namespace SpeedportHybridControl.Data { if (SpeedportHybridAPI.getInstance().checkLogin().Equals(false)) return; - DeviceData deviceData = Application.Current.FindResource("DeviceData") as DeviceData; + LanPageModel deviceData = Application.Current.FindResource("LanPageModel") as LanPageModel; List deviceList = new List(); diff --git a/SpeedportHybridControl/Data/SpeedportHybridAPI.cs b/SpeedportHybridControl/Data/SpeedportHybridAPI.cs index 3535f04..3d760ad 100644 --- a/SpeedportHybridControl/Data/SpeedportHybridAPI.cs +++ b/SpeedportHybridControl/Data/SpeedportHybridAPI.cs @@ -9,7 +9,6 @@ using System.Windows; using System.Threading; using System.Collections.Generic; using SpeedportHybridControl.Implementations; -using SpeedportHybridControl.Model; using Newtonsoft.Json; using SpeedportHybridControl.PageModel; diff --git a/SpeedportHybridControl/PageModel/DslPageModel.cs b/SpeedportHybridControl/PageModel/DslPageModel.cs index e68c75d..33283f0 100644 --- a/SpeedportHybridControl/PageModel/DslPageModel.cs +++ b/SpeedportHybridControl/PageModel/DslPageModel.cs @@ -24,7 +24,14 @@ namespace SpeedportHybridControl.PageModel { private string _lastHEC; private string _lastFEC; - + private int lastdFEC; + private int lastuFEC; + private int lastdHEC; + private int lastuHEC; + private int lastdCRC; + private int lastuCRC; + private DateTime lastReload; + public Connection Connection { get { return _Connection; } set { SetProperty(ref _Connection, value); } @@ -82,7 +89,36 @@ namespace SpeedportHybridControl.PageModel { } private void OnReloadCommandExecute () { - new Thread(() => { SpeedportHybrid.initDSL(); }).Start(); + new Thread(() => { + SpeedportHybrid.initDSL(); + + if (lastReload.Equals(DateTime.MinValue).Equals(false)) { + DateTime now = DateTime.Now; + double difference = Math.Ceiling(Math.Ceiling((DateTime.Now - lastReload).TotalSeconds) / 60); + + double diffdCRC = Math.Ceiling((Line.dCRC - lastdCRC) / difference); + double diffuCRC = Math.Ceiling((Line.uCRC - lastuCRC) / difference); + lastCRC = string.Format("CRC/min (last {0} min) Upstream: {1} Downstream: {2}", difference, diffuCRC, diffdCRC); + + double diffdHEC = Math.Ceiling((Line.dHEC - lastdHEC) / difference); + double diffuHEC = Math.Ceiling((Line.uHEC - lastuHEC) / difference); + lastHEC = string.Format("HEC/min (last {0} min) Upstream: {1} Downstream: {2}", difference, diffuHEC, diffdHEC); + + double diffdFEC = Math.Ceiling((Line.dFEC - lastdFEC) / difference); + double diffuFEC = Math.Ceiling((Line.uFEC - lastuFEC) / difference); + lastFEC = string.Format("FEC/min (last {0} min) Upstream: {1} Downstream: {2}", difference, diffuFEC, diffdFEC); + } + + lastReload = DateTime.Now; + lastdCRC = Line.dCRC; + lastuCRC = Line.uCRC; + + lastdHEC = Line.dHEC; + lastuHEC = Line.uHEC; + + lastdFEC = Line.dFEC; + lastuFEC = Line.uFEC; + }).Start(); } private void OnAutoReloadCommandExecute () { diff --git a/SpeedportHybridControl/PageModel/LteInfoModel.cs b/SpeedportHybridControl/PageModel/LteInfoModel.cs index c9e3b3d..3a0a0df 100644 --- a/SpeedportHybridControl/PageModel/LteInfoModel.cs +++ b/SpeedportHybridControl/PageModel/LteInfoModel.cs @@ -2,11 +2,7 @@ using SpeedportHybridControl.Implementations; using SpeedportHybridControl.Model; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Timers; using System.Windows; using System.Windows.Controls; diff --git a/SpeedportHybridControl/page/AboutPage.xaml b/SpeedportHybridControl/page/AboutPage.xaml index 62c0b3a..8924964 100644 --- a/SpeedportHybridControl/page/AboutPage.xaml +++ b/SpeedportHybridControl/page/AboutPage.xaml @@ -1,10 +1,10 @@  diff --git a/SpeedportHybridControl/page/ControlsPage.xaml b/SpeedportHybridControl/page/ControlsPage.xaml index f29c5d9..f80ecf2 100644 --- a/SpeedportHybridControl/page/ControlsPage.xaml +++ b/SpeedportHybridControl/page/ControlsPage.xaml @@ -1,10 +1,10 @@  diff --git a/SpeedportHybridControl/page/LanPage.xaml.cs b/SpeedportHybridControl/page/LanPage.xaml.cs index a96079d..7afd286 100644 --- a/SpeedportHybridControl/page/LanPage.xaml.cs +++ b/SpeedportHybridControl/page/LanPage.xaml.cs @@ -1,5 +1,4 @@ -using System.Windows; -using System.Windows.Controls; +using System.Windows.Controls; namespace SpeedportHybridControl.page { /// @@ -9,13 +8,5 @@ namespace SpeedportHybridControl.page { public LanPage() { InitializeComponent(); } - - private void button_click(object sender, RoutedEventArgs e) { - /* - if (sender.Equals(reload)) { - util.init("Lan"); - } - */ - } } } diff --git a/SpeedportHybridControl/page/LoginPage.xaml b/SpeedportHybridControl/page/LoginPage.xaml index e51f2fe..a67cdad 100644 --- a/SpeedportHybridControl/page/LoginPage.xaml +++ b/SpeedportHybridControl/page/LoginPage.xaml @@ -1,8 +1,8 @@  diff --git a/SpeedportHybridControl/page/StatusPage.xaml b/SpeedportHybridControl/page/StatusPage.xaml index 5b2e542..dfa348b 100644 --- a/SpeedportHybridControl/page/StatusPage.xaml +++ b/SpeedportHybridControl/page/StatusPage.xaml @@ -1,10 +1,10 @@  -- 2.20.1