Skip to content

Commit e8f534e

Browse files
FoxTesFoxTes
committed
Changed icon menu.
1 parent f7ed642 commit e8f534e

File tree

12 files changed

+114
-36
lines changed

12 files changed

+114
-36
lines changed

‎src/DataAccess/SmartThermo.DataAccess.Sqlite/Models/Base/BaseModel.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace SmartThermo.DataAccess.Sqlite.Models.Base
2+
{
3+
public class BaseModel
4+
{
5+
public int Id { get; set; }
6+
}
7+
}

‎src/DataAccess/SmartThermo.DataAccess.Sqlite/Models/SelectMode.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
namespace SmartThermo.DataAccess.Sqlite.Models
1+
using SmartThermo.DataAccess.Sqlite.Models.Base;
2+
3+
namespace SmartThermo.DataAccess.Sqlite.Models
24
{
3-
public class SelectMode
5+
public class SelectMode : BaseModel
46
{
5-
public int Id { get; set; }
6-
77
public bool Stage { get; set; }
88

99
public int SettingId { get; set; }

‎src/DataAccess/SmartThermo.DataAccess.Sqlite/Models/SensorGroup.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System.Collections.Generic;
1+
using SmartThermo.DataAccess.Sqlite.Models.Base;
2+
using System.Collections.Generic;
23

34
namespace SmartThermo.DataAccess.Sqlite.Models
45
{
5-
public class SensorGroup
6+
public class SensorGroup : BaseModel
67
{
7-
public int Id { get; set; }
8-
98
public string Name { get; set; }
109

1110
public int SessionId { get; set; }

‎src/DataAccess/SmartThermo.DataAccess.Sqlite/Models/SensorInformation.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System;
1+
using SmartThermo.DataAccess.Sqlite.Models.Base;
2+
using System;
23

34
namespace SmartThermo.DataAccess.Sqlite.Models
45
{
5-
public class SensorInformation
6+
public class SensorInformation : BaseModel
67
{
7-
public int Id { get; set; }
8-
98
public int Value1 { get; set; }
109

1110
public int Value2 { get; set; }

‎src/DataAccess/SmartThermo.DataAccess.Sqlite/Models/Session.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
using System;
1+
using SmartThermo.DataAccess.Sqlite.Models.Base;
2+
using System;
23
using System.Collections.Generic;
34

45
namespace SmartThermo.DataAccess.Sqlite.Models
56
{
6-
public class Session
7+
public class Session : BaseModel
78
{
8-
public int Id { get; set; }
9-
109
public DateTime DateCreate { get; set; }
1110

1211
public List<SensorGroup> SensorGroups { get; set; }

‎src/DataAccess/SmartThermo.DataAccess.Sqlite/Models/Setting.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System.Collections.Generic;
1+
using SmartThermo.DataAccess.Sqlite.Models.Base;
2+
using System.Collections.Generic;
23

34
namespace SmartThermo.DataAccess.Sqlite.Models
45
{
5-
public class Setting
6+
public class Setting : BaseModel
67
{
7-
public int Id { get; set; }
8-
98
public List<SelectMode> SelectModes { get; set; }
109

1110
public byte AddressDeviceSelected { get; set; }

‎src/Modules/SmartThermo.Modules.Analytics/Views/AnalyticsWindow.xaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,14 @@
219219
HorizontalAlignment="Right"
220220
Command="{Binding GetSensorDataCommand}">
221221
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="8">
222-
<ui:SymbolIcon Symbol="Refresh" />
222+
223+
<ui:PathIcon
224+
Width="19"
225+
Height="18"
226+
HorizontalAlignment="Center"
227+
VerticalAlignment="Center"
228+
Data="M431.609,297.5c-14.62,0-27.041,9.383-31.591,22.453c-0.009-0.004-0.019-0.008-0.027-0.012 c-19.11,42.59-57.57,76.219-102.84,88.18c-52.799,14.311-113.45,0.299-152.179-39.051c21.92-21.76,44.369-43.01,66.189-64.869 c-59.7,0.049-119.41,0.029-179.11,0.01c-0.14,58.6-0.159,117.189,0.011,175.789c21.92-21.91,43.75-43.91,65.79-65.699 c14.109,13.789,29.76,26.07,46.92,35.869c54.739,31.971,123.399,38.602,183.299,17.891 c57.477-19.297,106.073-63.178,131.212-118.318c3.645-5.357,5.776-11.824,5.776-18.793C465.06,312.477,450.083,297.5,431.609,297.5z M479.971,32.18c-21.72,21.211-42.89,43-64.52,64.301c-1.05,1.23-2.26-0.16-3.09-0.85 c-24.511-23.98-54.58-42.281-87.221-52.84c-37.6-12.16-78.449-14.07-117.029-5.59c-68.67,14.67-128.811,64.059-156.44,128.609 c0.031,0.014,0.062,0.025,0.093,0.039c-2.3,4.537-3.605,9.666-3.605,15.1c0,18.475,14.977,33.451,33.451,33.451 c15.831,0,29.084-11.002,32.555-25.773c19.757-41.979,58.832-74.445,103.967-85.527c52.2-13.17,111.37,1.33,149.4,40.041 c-22.03,21.83-44.391,43.34-66.33,65.26c59.52-0.32,119.06-0.141,178.59-0.09C480.291,149.611,479.931,90.891,479.971,32.18z" />
229+
223230
<TextBlock>Обновить</TextBlock>
224231
</ui:SimpleStackPanel>
225232
<Button.Style>

‎src/Modules/SmartThermo.Modules.DataViewer/ViewModels/Represent/LoadDataViewerWindowViewModel.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,15 @@ private void DeviceConnector_SettingDeviceChanged(object sender, SettingDeviceEv
195195

196196
private void DeviceConnector_RegistersRequested(object sender, List<SensorInfoEventArgs> sensorData)
197197
{
198-
SensorsEtherItems.Clear();
199-
SensorsEtherItems.AddRange(sensorData.Where(x => x.IsAir)
198+
var sensorEhterItems = sensorData.Where(x => x.IsAir)
200199
.Select(x => new SensorsEther
201200
{
202201
Id = x.Number,
203202
Time = x.TimeLastBroadcast
204-
}).ToList());
203+
})
204+
.ToList();
205+
SensorsEtherItems.Clear();
206+
SensorsEtherItems.AddRange(sensorEhterItems);
205207

206208
_temperature.Clear();
207209
_temperature.AddRange(sensorData

‎src/SmartThermo.Core/Extensions/SplitByExtension.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System.Collections.Generic;
2+
3+
namespace SmartThermo.Core.Extensions
4+
{
5+
public static class SplitByExtension
6+
{
7+
public static IEnumerable<List<T>> SplitBy<T>(this IEnumerable<T> source, T delimiter)
8+
{
9+
var buffer = new List<T>();
10+
var comparer = EqualityComparer<T>.Default;
11+
12+
foreach (var item in source)
13+
if (comparer.Equals(item, delimiter))
14+
{
15+
if (buffer.Count > 0)
16+
yield return buffer;
17+
buffer = new List<T>();
18+
}
19+
else
20+
buffer.Add(item);
21+
22+
yield return buffer;
23+
}
24+
}
25+
}

‎src/SmartThermo/Properties/DesignTimeResources.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:ui="http://schemas.modernwpf.com/2019">
22
<ResourceDictionary.MergedDictionaries>
3-
<ResourceDictionary Source="/MyAssembly;component/Presentation/Common/Resources/Main.xaml" />
3+
<ui:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
44
</ResourceDictionary.MergedDictionaries>
55
</ResourceDictionary>

0 commit comments

Comments
 (0)