Update version number.

minor feature #52 implementation amendment.
Ashfaaq18 · Jul 10, 2022 · c8dde5d · c8dde5d
1 parent f7a3736
commit c8dde5d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/OpenNetMeter/Models/NetworkProcess.cs b/OpenNetMeter/Models/NetworkProcess.cs
@@ -288,8 +288,16 @@ private async Task CaptureNetworkSpeed()
                 {
                     Stopwatch sw1 = Stopwatch.StartNew();
 
-                    UploadSpeed = (CurrentSessionUploadData - tempUpload) * 8;
-                    DownloadSpeed = (CurrentSessionDownloadData - tempDownload) * 8;
+                    if(Properties.Settings.Default.NetworkSpeedFormat == 0)
+                    {
+                        UploadSpeed = (CurrentSessionUploadData - tempUpload) * 8;
+                        DownloadSpeed = (CurrentSessionDownloadData - tempDownload) * 8;
+                    }
+                    else
+                    {
+                        UploadSpeed = (CurrentSessionUploadData - tempUpload);
+                        DownloadSpeed = (CurrentSessionDownloadData - tempDownload);
+                    }
 
                     tempUpload = CurrentSessionUploadData;
                     tempDownload = CurrentSessionDownloadData;
@@ -300,7 +308,6 @@ private async Task CaptureNetworkSpeed()
                     //Debug.WriteLine($"current thread (CaptureNetworkSpeed): {Thread.CurrentThread.ManagedThreadId}");
                     //Debug.WriteLine($"networkProcess {DownloadSpeed}");
                 }
-                Debug.WriteLine("WOah woah boi slow down there");
             }
             catch (OperationCanceledException ex)
             {

diff --git a/OpenNetMeter/OpenNetMeter.csproj b/OpenNetMeter/OpenNetMeter.csproj
@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\AppIcon.ico</ApplicationIcon>
-    <Version>0.11.2</Version>
+    <Version>0.12.0</Version>
     <AssemblyName>OpenNetMeter</AssemblyName>
     <StartupObject>OpenNetMeter.App</StartupObject>
     <Win32Resource />

diff --git a/OpenNetMeter/ViewModels/MainWindowVM.cs b/OpenNetMeter/ViewModels/MainWindowVM.cs
@@ -133,6 +133,7 @@ private void Svm_PropertyChanged(object? sender, PropertyChangedEventArgs e)
                     break;
                 case "NetworkSpeedFormat":
                     dusvm.Graph.ChangeYLabel();
+                    dusvm.Graph.DrawClear();
                     break;
                 default:
                     break;

diff --git a/OpenNetMeter/Views/Converters/NetSpeedFormatConverter.cs b/OpenNetMeter/Views/Converters/NetSpeedFormatConverter.cs
@@ -12,7 +12,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if(Properties.Settings.Default.NetworkSpeedFormat == 0)
                 return DataSizeSuffix.InStr((long)value, 1, false);
             else
-                return DataSizeSuffix.InStr((long)value/8, 1, true);
+                return DataSizeSuffix.InStr((long)value, 1, true);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/OpenNetMeter/Views/ResourceDictionaries/DarkModeRD.xaml b/OpenNetMeter/Views/ResourceDictionaries/DarkModeRD.xaml
@@ -457,7 +457,7 @@
     <Style TargetType="{x:Type TextBlock}" x:Key="FooterTextStyle">
         <Setter Property="Foreground" Value="Black"/>
         <Setter Property="TextAlignment" Value="Right"/>
-        <Setter Property="Padding" Value="8,2"/>
+        <Setter Property="Padding" Value="4,2"/>
         <Style.Triggers>
             <DataTrigger Binding="{Binding Source={x:Static res:Settings.Default}, Path = DarkMode}" Value="True">
                 <Setter Property="Foreground" Value="White"/>
@@ -469,7 +469,7 @@
         <Setter Property="Height" Value="30"/>
         <Setter Property="FontFamily" Value="Segoe UI" />
         <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="8,2"/>
+        <Setter Property="Padding" Value="4,2"/>
         <Setter Property="Background" Value="#c0e3da" />
         <Setter Property="Foreground" Value="Black"/>
         <Setter Property="BorderBrush" Value="#999999"/>
@@ -548,7 +548,7 @@
     </Style>
 
     <Style x:Key="DGCellStyle" TargetType="DataGridCell">
-        <Setter Property="Padding" Value="8,2" />
+        <Setter Property="Padding" Value="4,2" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridCell}">