More Stuff

This commit is contained in:
BlubbFish 2018-09-09 14:36:16 +00:00
parent 338296206c
commit c970172c46
14 changed files with 709 additions and 28 deletions

View File

@ -0,0 +1,177 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using BlubbFish.Utils.IoT.Connector;
using System.Windows.Media;
namespace BlubbFish.House.Dashboard.Graphics
{
class Esp : AGraphics
{
public Esp(Dictionary<String, String> settings, ABackend data, UIElement window) : base(settings, data, window) {
}
public override Grid Draw() {
Grid outergrid = this.CreateOuterGrid();
outergrid.Children.Add(this.CreateTempGrid());
outergrid.Children.Add(this.CreateHumiGrid());
outergrid.Children.Add(this.CreatePresGrid());
outergrid.Children.Add(this.CreateLumiGrid());
return outergrid;
}
private Grid CreateLumiGrid() {
//<Grid Grid.Row="1" Grid.Column="1" Margin="5">
// <Grid.ColumnDefinitions>
// <ColumnDefinition />
// <ColumnDefinition />
// </Grid.ColumnDefinitions>
// <Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_luminence.png" Height="30" />
// <TextBlock Text="2000" Grid.Column="1"/>
//</Grid>
Grid grid = new Grid() {
Margin = new Thickness(5)
};
grid.SetValue(Grid.RowProperty, 1);
grid.SetValue(Grid.ColumnProperty, 1);
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.Children.Add(new Image() {
Source = Helper.BitmapToImageSource(Properties.Resources.esp_luminence),
Height = 30
});
TextBlock temp = new TextBlock() {
Text = "2000"
};
temp.SetValue(Grid.ColumnProperty, 1);
grid.Children.Add(temp);
return grid;
}
private Grid CreatePresGrid() {
//<Grid Grid.Row="1" Margin="5">
// <Grid.ColumnDefinitions>
// <ColumnDefinition />
// <ColumnDefinition />
// </Grid.ColumnDefinitions>
// <Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_pressure.png" Height="30" />
// <TextBlock Text="1000" Grid.Column="1"/>
//</Grid>
Grid grid = new Grid() {
Margin = new Thickness(5)
};
grid.SetValue(Grid.RowProperty, 1);
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.Children.Add(new Image() {
Source = Helper.BitmapToImageSource(Properties.Resources.esp_pressure),
Height = 30
});
TextBlock temp = new TextBlock() {
Text = "1000"
};
temp.SetValue(Grid.ColumnProperty, 1);
grid.Children.Add(temp);
return grid;
}
private Grid CreateHumiGrid() {
//<Grid Grid.Column="1" Margin="5">
// <Grid.ColumnDefinitions>
// <ColumnDefinition />
// <ColumnDefinition />
// </Grid.ColumnDefinitions>
// <Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_humidity.png" Height="30" />
// <TextBlock Text="30 %" Grid.Column="1"/>
//</Grid>
Grid grid = new Grid() {
Margin = new Thickness(5)
};
grid.SetValue(Grid.ColumnProperty, 1);
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.Children.Add(new Image() {
Source = Helper.BitmapToImageSource(Properties.Resources.esp_humidity),
Height = 30
});
TextBlock temp = new TextBlock() {
Text = "30%"
};
temp.SetValue(Grid.ColumnProperty, 1);
grid.Children.Add(temp);
return grid;
}
private Grid CreateTempGrid() {
//<Grid Margin="5">
// <Grid.ColumnDefinitions>
// <ColumnDefinition />
// <ColumnDefinition />
// </Grid.ColumnDefinitions>
// <Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_thermometer.png" Height="30" />
// <TextBlock Text="20 °C" Grid.Column="1"/>
//</Grid>
Grid grid = new Grid() {
Margin = new Thickness(5)
};
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.ColumnDefinitions.Add(new ColumnDefinition());
grid.Children.Add(new Image() {
Source = Helper.BitmapToImageSource(Properties.Resources.esp_thermometer),
Height = 30
});
TextBlock temp = new TextBlock() {
Text = "20°C"
};
temp.SetValue(Grid.ColumnProperty, 1);
grid.Children.Add(temp);
return grid;
}
private Grid CreateOuterGrid() {
//<Grid HorizontalAlignment="Left" Margin="105,87,0,0" VerticalAlignment="Top" Background="#CCFFFFFF">
// <Grid.RenderTransform>
// <TransformGroup>
// <ScaleTransform/>
// <SkewTransform/>
// <RotateTransform Angle="0"/>
// <TranslateTransform/>
// </TransformGroup>
// </Grid.RenderTransform>
// <Grid.RowDefinitions>
// <RowDefinition/>
// <RowDefinition/>
// </Grid.RowDefinitions>
// <Grid.ColumnDefinitions>
// <ColumnDefinition />
// <ColumnDefinition />
// </Grid.ColumnDefinitions>
//</Grid>
Thickness thickness = new Thickness();
if (this.settings.ContainsKey("x") && Int32.TryParse(this.settings["x"], out Int32 x)) {
thickness.Left = x;
}
if (this.settings.ContainsKey("y") && Int32.TryParse(this.settings["y"], out Int32 y)) {
thickness.Top = y;
}
Double rotate = 0;
if (this.settings.ContainsKey("rotate") && Double.TryParse(this.settings["rotate"], out rotate)) { }
Grid outergrid = new Grid() {
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Top,
Margin = thickness,
RenderTransform = new RotateTransform(rotate),
Background = new SolidColorBrush(Color.FromArgb(204, 255, 255, 255))
};
outergrid.RowDefinitions.Add(new RowDefinition());
outergrid.RowDefinitions.Add(new RowDefinition());
outergrid.ColumnDefinitions.Add(new ColumnDefinition());
outergrid.ColumnDefinitions.Add(new ColumnDefinition());
return outergrid;
}
}
}

View File

@ -15,6 +15,8 @@ namespace BlubbFish.House.Dashboard.Graphics {
class Heater : AGraphics {
private readonly TextBlock targetTemp;
private readonly Dictionary<Int32, Double> targetTemps = new Dictionary<Int32, Double>();
private readonly TextBox popup_targettemp;
private readonly ComboBox popup_modes;
private readonly TextBlock mode;
private readonly TextBlock now;
private readonly String topic;
@ -36,6 +38,11 @@ namespace BlubbFish.House.Dashboard.Graphics {
this.now = new TextBlock {
Text = "0 °C"
};
this.popup_targettemp = new TextBox {
Text = "20"
};
this.popup_modes = new ComboBox();
if(this.settings.ContainsKey("topic")) {
this.topic = this.settings["topic"];
this.data.MessageIncomming += this.Data_MessageIncomming;
@ -78,6 +85,15 @@ namespace BlubbFish.House.Dashboard.Graphics {
}
this.now.Dispatcher.BeginInvoke((Action)(() => {
this.mode.Text = text;
ComboBoxItem s = new ComboBoxItem();
foreach (KeyValuePair<Int32, String> item in this.modes) {
ComboBoxItem c = new ComboBoxItem { Content = item.Value, Tag = item.Key };
this.popup_modes.Items.Add(c);
if(jmode == item.Key) {
s = c;
}
}
this.popup_modes.SelectedItem = s;
}));
this.WriteTargetTemp();
}
@ -109,6 +125,7 @@ namespace BlubbFish.House.Dashboard.Graphics {
if (this.targetTemps.ContainsKey(this.activemode)) {
this.now.Dispatcher.BeginInvoke((Action)(() => {
this.targetTemp.Text = this.targetTemps[this.activemode] + " °C";
this.popup_targettemp.Text = this.targetTemps[this.activemode].ToString();
}));
}
}
@ -265,14 +282,11 @@ namespace BlubbFish.House.Dashboard.Graphics {
Margin = new Thickness(0, 0, 10, 0)
});
// <TextBox Grid.Column= "1" Width= "30" Text= "20" HorizontalAlignment= "Right" HorizontalContentAlignment= "Right" />
TextBox t1 = new TextBox {
Width = 30,
Text = "20",
HorizontalAlignment = HorizontalAlignment.Right,
HorizontalContentAlignment = HorizontalAlignment.Right
};
t1.SetValue(Grid.ColumnProperty, 1);
innergrid1.Children.Add(t1);
this.popup_targettemp.Width = 30;
this.popup_targettemp.HorizontalAlignment = HorizontalAlignment.Right;
this.popup_targettemp.HorizontalContentAlignment = HorizontalAlignment.Right;
this.popup_targettemp.SetValue(Grid.ColumnProperty, 1);
innergrid1.Children.Add(this.popup_targettemp);
// <TextBlock Text= "°C" Grid.Column= "2" />
TextBlock tb1 = new TextBlock {
Text = "°C"
@ -299,16 +313,11 @@ namespace BlubbFish.House.Dashboard.Graphics {
Margin = new Thickness(0, 0, 10, 0)
});
// <ComboBox Grid.Column= "1" Width= "50" >
ComboBox cb1 = new ComboBox {
Width = 50
};
cb1.SetValue(Grid.ColumnProperty, 1);
this.popup_modes.Width = 50;
this.popup_modes.SetValue(Grid.ColumnProperty, 1);
// <ComboBoxItem Content= "Heating" />
cb1.Items.Add(new ComboBoxItem {
Content = "Heating"
});
// </ComboBox >
innergrid2.Children.Add(cb1);
innergrid2.Children.Add(this.popup_modes);
// </Grid >
outergrid.Children.Add(innergrid2);
// <Grid Grid.Row= "3" Margin= "5" HorizontalAlignment= "Center" >
@ -326,17 +335,19 @@ namespace BlubbFish.House.Dashboard.Graphics {
// <Button Content= "Speichern" Margin= "0,0,10,0" />
Button b1 = new Button {
Content = "Speichern",
Tag = "save",
Margin = new Thickness(0, 0, 10, 0)
};
b1.Click += this.B1_Click;
b1.Click += this.CancelSaveClick;
innergrid3.Children.Add(b1);
// <Button Content= "Abbrechen" Grid.Column= "1" IsCancel= "True" />
Button b2 = new Button {
Content = "Abbrechen",
Tag = "cancel",
IsCancel = true
};
b2.SetValue(Grid.ColumnProperty, 1);
b2.Click += this.B1_Click;
b2.Click += this.CancelSaveClick;
innergrid3.Children.Add(b2);
// </Grid >
outergrid.Children.Add(innergrid3);
@ -350,9 +361,18 @@ namespace BlubbFish.House.Dashboard.Graphics {
this.popup.IsOpen = true;
}
private void B1_Click(Object sender, RoutedEventArgs e) {
private void CancelSaveClick(Object sender, RoutedEventArgs e) {
this.popup.IsOpen = false;
Button b = (Button)sender;
if(b.Tag.ToString() == "save") {
if(Double.TryParse(this.popup_targettemp.Text, out Double temp)) {
ComboBoxItem mode = this.popup_modes.SelectedItem as ComboBoxItem;
if(Int32.TryParse(mode.Tag.ToString(), out Int32 modeid)) {
((ADataBackend)this.data).Send(this.topic + "/0/67/"+modeid+"/set", JsonMapper.ToJson(new Dictionary<String, Double> { { "Level", temp } }));
((ADataBackend)this.data).Send(this.topic + "/0/64/set", JsonMapper.ToJson(new Dictionary<String, Int32> { { "Level", modeid } }));
}
}
}
}
}
}

View File

@ -0,0 +1,310 @@
using BlubbFish.Utils.IoT.Connector;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using BlubbFish.Utils.IoT.Events;
using LitJson;
using System.Windows.Controls.Primitives;
namespace BlubbFish.House.Dashboard.Graphics
{
class Huelight : AGraphics
{
private TextBlock status;
private TextBlock opy;
private ImageBrush img;
private String topic;
private Popup popup;
private Slider popup_slider;
private CheckBox popup_checkbox;
public Huelight(Dictionary<String, String> settings, ABackend data, UIElement window) : base(settings, data, window) {
this.status = new TextBlock() {
Text = "Aus"
};
this.opy = new TextBlock() {
Text = "100%"
};
this.img = new ImageBrush(Helper.BitmapToImageSource(Properties.Resources.graphics_huelight_on)) {
Opacity = 0.5
};
this.popup_slider = new Slider() {
Minimum = 0,
Maximum = 254
};
this.popup_checkbox = new CheckBox();
if (this.settings.ContainsKey("topic")) {
this.topic = this.settings["topic"];
this.data.MessageIncomming += this.Data_MessageIncomming;
if (this.data is ADataBackend) {
((ADataBackend)this.data).Send(this.topic + "/get", "");
}
}
}
private void Data_MessageIncomming(Object sender, BackendEvent e) {
if (e.From.ToString() == this.topic) {
JsonData json = JsonMapper.ToObject(e.Message);
if(json.ContainsKey("Brightness") && json["Brightness"].IsInt) {
Int32 bright = (Int32)json["Brightness"];
this.opy.Dispatcher.BeginInvoke((Action)(() => {
this.opy.Text = ((bright / 254) * 100).ToString() + " %";
}));
this.img.Dispatcher.BeginInvoke((Action)(() => {
this.img.Opacity = (bright / 254);
}));
this.popup_slider.Dispatcher.BeginInvoke((Action)(() => {
this.popup_slider.Value = bright;
}));
}
Boolean on = false;
if(json.ContainsKey("Reachable") && json["Reachable"].IsBoolean && !(Boolean)json["Reachable"]) {
on = false;
} else if(json.ContainsKey("Reachable") && json["Reachable"].IsBoolean && (Boolean)json["Reachable"]) {
if(json.ContainsKey("State") && json["State"].IsBoolean) {
on = (Boolean)json["State"];
}
}
if (!on) {
this.img.Dispatcher.BeginInvoke((Action)(() => {
this.img.Opacity = 0;
}));
}
this.status.Dispatcher.BeginInvoke((Action)(() => {
if (on) {
this.status.Text = "An";
} else {
this.status.Text = "Aus";
}
}));
this.popup_checkbox.Dispatcher.BeginInvoke((Action)(() => {
this.popup_checkbox.IsChecked = on;
}));
}
}
public override Grid Draw() {
Grid outergrid = this.CreateOuterGrid();
outergrid.Children.Add(this.CreateBackgroundGrid());
outergrid.Children.Add(this.CreateBackgroundOpyGrid());
outergrid.Children.Add(this.CreateTextBoxes());
outergrid.Children.Add(this.CreatePopup());
return outergrid;
}
private Popup CreatePopup() {
//<Popup PlacementTarget="{Binding ElementName=myWindow}" Placement="Center" PopupAnimation="Slide" IsOpen="True">
this.popup = new Popup {
Placement = PlacementMode.Center,
PopupAnimation = PopupAnimation.Slide,
PlacementTarget = this.window
};
// <Grid Background = "White" Opacity="0.8" Margin="0">
Grid outergrid = new Grid {
Background = new SolidColorBrush(Color.FromRgb(255, 255, 255)),
Opacity = 0.8,
Margin = new Thickness(0, 0, 0, 0)
};
// <Grid.RowDefinitions>
// <RowDefinition/>
// <RowDefinition/>
// <RowDefinition/>
// <RowDefinition/>
// <RowDefinition/>
// </Grid.RowDefinitions>
outergrid.RowDefinitions.Add(new RowDefinition());
outergrid.RowDefinitions.Add(new RowDefinition());
outergrid.RowDefinitions.Add(new RowDefinition());
outergrid.RowDefinitions.Add(new RowDefinition());
outergrid.RowDefinitions.Add(new RowDefinition());
// <Border BorderBrush = "Black" BorderThickness="2" Grid.RowSpan="5"/>
Border b = new Border {
BorderBrush = new SolidColorBrush(Color.FromRgb(0, 0, 0)),
BorderThickness = new Thickness(2)
};
b.SetValue(Grid.RowSpanProperty, 5);
outergrid.Children.Add(b);
// <TextBlock Text="Helligkeit:" FontSize="16" HorizontalAlignment="Center" />
outergrid.Children.Add(new TextBlock {
Text = "Helligkeit:",
FontSize = 16,
HorizontalAlignment = HorizontalAlignment.Center
});
// <Slider Orientation="Vertical" Height="60" Grid.Row="1" Margin="0,5,0,0" HorizontalAlignment="Center" />
this.popup_slider.Orientation = Orientation.Vertical;
this.popup_slider.Height = 60;
this.popup_slider.Margin = new Thickness(0, 5, 0, 0);
this.popup_slider.HorizontalAlignment = HorizontalAlignment.Center;
this.popup_slider.SetValue(Grid.RowProperty, 1);
outergrid.Children.Add(this.popup_slider);
// <TextBlock Text="Schalter" Grid.Row="2" FontSize="16" Margin="0,5,0,0" HorizontalAlignment="Center"/>
TextBlock tb2 = new TextBlock() {
Text = "Schalter:",
FontSize = 16,
Margin = new Thickness(0, 5, 0, 0),
HorizontalAlignment = HorizontalAlignment.Center
};
tb2.SetValue(Grid.RowProperty, 2);
outergrid.Children.Add(tb2);
// <CheckBox Grid.Row="3" HorizontalAlignment="Center" Margin="0,5,0,0" />
this.popup_checkbox.HorizontalAlignment = HorizontalAlignment.Center;
this.popup_checkbox.Margin = new Thickness(0, 5, 0, 0);
this.popup_checkbox.SetValue(Grid.RowProperty, 3);
outergrid.Children.Add(this.popup_checkbox);
// <Grid Grid.Row="4" Margin="5" HorizontalAlignment="Center">
Grid innergrid3 = new Grid {
Margin = new Thickness(5),
HorizontalAlignment = HorizontalAlignment.Center
};
innergrid3.SetValue(Grid.RowProperty, 4);
// <Grid.ColumnDefinitions >
// <ColumnDefinition />
// <ColumnDefinition />
// </Grid.ColumnDefinitions >
innergrid3.ColumnDefinitions.Add(new ColumnDefinition());
innergrid3.ColumnDefinitions.Add(new ColumnDefinition());
// <Button Content= "Speichern" Margin= "0,0,10,0" />
Button b1 = new Button {
Content = "Speichern",
Tag = "save",
Margin = new Thickness(0, 0, 10, 0)
};
b1.Click += this.CancelSaveClick;
innergrid3.Children.Add(b1);
// <Button Content= "Abbrechen" Grid.Column= "1" IsCancel= "True" />
Button b2 = new Button {
Content = "Abbrechen",
Tag = "cancel",
IsCancel = true
};
b2.SetValue(Grid.ColumnProperty, 1);
b2.Click += this.CancelSaveClick;
innergrid3.Children.Add(b2);
// </Grid >
outergrid.Children.Add(innergrid3);
// </Grid >
this.popup.Child = outergrid;
//</Popup >
return this.popup;
}
private void CancelSaveClick(Object sender, RoutedEventArgs e) {
this.popup.IsOpen = false;
Button b = (Button)sender;
if (b.Tag.ToString() == "save") {
Int32 slider = (Int32)this.popup_slider.Value;
Boolean active = (Boolean)this.popup_checkbox.IsChecked;
((ADataBackend)this.data).Send(this.topic + "/set", JsonMapper.ToJson(new Dictionary<String, Object> { { "Brightness", slider }, { "State", active } }));
}
}
private void Grid_MouseDown(Object sender, System.Windows.Input.MouseButtonEventArgs e) {
this.popup.IsOpen = true;
}
private Grid CreateTextBoxes() {
//<Grid Grid.Row="1">
// <Grid.RowDefinitions>
// <RowDefinition/>
// <RowDefinition/>
// </Grid.RowDefinitions>
// <TextBlock HorizontalAlignment="Center" Text="Aus" VerticalAlignment="Top" Grid.Row="0" FontWeight="Bold" FontSize="12" Margin="5,0,10,0"/>
// <TextBlock HorizontalAlignment="Center" Text="5%" VerticalAlignment="Top" Grid.Row="1" FontWeight="Bold" FontSize="12" Margin="5,0,10,0"/>
//</Grid>
Grid text = new Grid();
text.SetValue(Grid.RowProperty, 1);
text.RowDefinitions.Add(new RowDefinition());
text.RowDefinitions.Add(new RowDefinition());
this.status.HorizontalAlignment = HorizontalAlignment.Center;
this.status.VerticalAlignment = VerticalAlignment.Top;
this.status.FontWeight = FontWeights.Bold;
this.status.FontSize = 12;
this.status.Margin = new Thickness(5, 0, 10, 0);
text.Children.Add(this.status);
this.opy.HorizontalAlignment = HorizontalAlignment.Center;
this.opy.VerticalAlignment = VerticalAlignment.Top;
this.opy.FontWeight = FontWeights.Bold;
this.opy.FontSize = 12;
this.opy.Margin = new Thickness(5, 0, 10, 0);
this.opy.SetValue(Grid.RowProperty, 1);
text.Children.Add(this.opy);
return text;
}
private Grid CreateBackgroundOpyGrid() {
//<Grid Height="45" Width="45" HorizontalAlignment="Center" VerticalAlignment="Top">
// <Grid.Background>
// <ImageBrush ImageSource="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\graphics_huelight_on.png" Opacity="0.5"/>
// </Grid.Background>
//</Grid>
Grid bg = new Grid() {
Height = 45,
Width = 45,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Top,
Background = this.img
};
return bg;
}
private Grid CreateBackgroundGrid() {
//<Grid Height="45" Width="45" HorizontalAlignment="Center" VerticalAlignment="Top">
// <Grid.Background>
// <ImageBrush ImageSource="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\graphics_huelight_bg.png"/>
// </Grid.Background>
//</Grid>
Grid bg = new Grid() {
Height = 45,
Width = 45,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Top,
Background = new ImageBrush(Helper.BitmapToImageSource(Properties.Resources.graphics_huelight_bg))
};
return bg;
}
private Grid CreateOuterGrid() {
//<Grid HorizontalAlignment="Left" Margin="x,y,0,0" VerticalAlignment="Top">
// <Grid.RenderTransform>
// <TransformGroup>
// <ScaleTransform/>
// <SkewTransform/>
// <RotateTransform Angle="0"/>
// <TranslateTransform/>
// </TransformGroup>
// </Grid.RenderTransform>
// <Grid.RowDefinitions>
// <RowDefinition/>
// <RowDefinition/>
// </Grid.RowDefinitions>
//</Grid>
Thickness thickness = new Thickness();
if (this.settings.ContainsKey("x") && Int32.TryParse(this.settings["x"], out Int32 x)) {
thickness.Left = x;
}
if (this.settings.ContainsKey("y") && Int32.TryParse(this.settings["y"], out Int32 y)) {
thickness.Top = y;
}
Double rotate = 0;
if (this.settings.ContainsKey("rotate") && Double.TryParse(this.settings["rotate"], out rotate)) { }
Grid grid = new Grid() {
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Top,
Margin = thickness,
RenderTransform = new RotateTransform(rotate)
};
grid.RowDefinitions.Add(new RowDefinition());
grid.RowDefinitions.Add(new RowDefinition());
grid.MouseDown += this.Grid_MouseDown;
return grid;
}
}
}

View File

@ -67,7 +67,9 @@
<Compile Include="Functions\Tabs.cs" />
<Compile Include="Functions\Workload.cs" />
<Compile Include="Graphics\AGraphics.cs" />
<Compile Include="Graphics\Esp.cs" />
<Compile Include="Graphics\Heater.cs" />
<Compile Include="Graphics\HueLight.cs" />
<Compile Include="Helper.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
@ -122,5 +124,21 @@
<ItemGroup>
<None Include="Resources\graphics_heater.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\graphics_huelight_bg.png" />
<Resource Include="Resources\graphics_huelight_on.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\esp_thermometer.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\esp_humidity.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\esp_pressure.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\esp_luminence.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -8,9 +8,83 @@
Title="Dashboard" WindowState="Maximized" Topmost="True" WindowStyle="None" Height="600" Width="800" Name="myWindow">
<Grid>
<TabControl x:Name="tabs" Padding="0" Margin="0,0,0,26">
<TabItem Header="Home" FontSize="20">
<!-- <TabItem Header="Home" FontSize="20">
<Grid Background="#FFE5E5E5">
<Image Source="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\bin\Debug\Images\Grundriss.png"/>
<Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\bin\Debug\Images\Grundriss.png"/> -->
<!-- <Grid HorizontalAlignment="Left" Margin="300,100,0,0" VerticalAlignment="Top">
<Grid.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="0"/>
<TranslateTransform/>
</TransformGroup>
</Grid.RenderTransform>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Height="45" Width="45" HorizontalAlignment="Center" VerticalAlignment="Top">
<Grid.Background>
<ImageBrush ImageSource="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\graphics_huelight_bg.png"/>
</Grid.Background>
</Grid>
<Grid Height="45" Width="45" HorizontalAlignment="Center" VerticalAlignment="Top">
<Grid.Background>
<ImageBrush ImageSource="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\graphics_huelight_on.png" Opacity="0.5"/>
</Grid.Background>
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock HorizontalAlignment="Center" Text="Aus" VerticalAlignment="Top" Grid.Row="0" FontWeight="Bold" FontSize="12" Margin="5,0,10,0"/>
<TextBlock HorizontalAlignment="Center" Text="5%" VerticalAlignment="Top" Grid.Row="1" FontWeight="Bold" FontSize="12" Margin="5,0,10,0"/>
</Grid>
</Grid> -->
<!-- <Grid HorizontalAlignment="Left" Margin="105,87,0,0" VerticalAlignment="Top" Background="#CCFFFFFF">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_thermometer.png" Height="30" />
<TextBlock Text="20 °C" Grid.Column="1"/>
</Grid>
<Grid Grid.Column="1" Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_humidity.png" Height="30" />
<TextBlock Text="30 %" Grid.Column="1"/>
</Grid>
<Grid Grid.Row="1" Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_pressure.png" Height="30" />
<TextBlock Text="1000" Grid.Column="1"/>
</Grid>
<Grid Grid.Row="1" Grid.Column="1" Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image Source="D:\Visual Studio 2017\Projects\House-Dashboard\House-Dashboard\Resources\esp_luminence.png" Height="30" />
<TextBlock Text="2000" Grid.Column="1"/>
</Grid>
</Grid> -->
<!-- <Grid HorizontalAlignment="Left" Margin="105,87,0,0" VerticalAlignment="Top">
<Grid.RenderTransform>
<TransformGroup>
@ -80,8 +154,8 @@
</Grid>
</Popup>
</Grid> -->
</Grid>
</TabItem>
<!-- </Grid>
</TabItem> -->
</TabControl>
<StatusBar Margin="0" VerticalAlignment="Bottom" Height="26">
<StatusBar.ItemsPanel>
@ -118,6 +192,5 @@
<Button Content="Beenden" Click="ApplicationShutdown"/>
</StatusBarItem>
</StatusBar>
<!-- -->
</Grid>
</Window>

View File

@ -55,3 +55,8 @@ using System.Windows;
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguage("de-DE")]
/// Icons made by https://www.flaticon.com/authors/nice-and-serious Nice and Serious from Flaticon is licensed by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0
/// Icons made by https://www.flaticon.com/authors/epiccoders EpicCoders from Flaticon is licensed by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0
/// Icons made by https://www.flaticon.com/authors/photo3idea-studio photo3idea_studio from Flaticon is licensed by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0
/// Icons made by https://www.flaticon.com/authors/good-ware Good Ware from Flaticon is licensed by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0
/// Icons made by https://www.flaticon.com/authors/lucy-g Lucy G from Flaticon is licensed by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0

View File

@ -19,7 +19,7 @@ namespace BlubbFish.House.Dashboard.Properties {
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -60,6 +60,46 @@ namespace BlubbFish.House.Dashboard.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap esp_humidity {
get {
object obj = ResourceManager.GetObject("esp_humidity", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap esp_luminence {
get {
object obj = ResourceManager.GetObject("esp_luminence", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap esp_pressure {
get {
object obj = ResourceManager.GetObject("esp_pressure", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap esp_thermometer {
get {
object obj = ResourceManager.GetObject("esp_thermometer", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@ -69,5 +109,25 @@ namespace BlubbFish.House.Dashboard.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap graphics_huelight_bg {
get {
object obj = ResourceManager.GetObject("graphics_huelight_bg", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap graphics_huelight_on {
get {
object obj = ResourceManager.GetObject("graphics_huelight_on", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@ -118,7 +118,25 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="esp_humidity" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\esp_humidity.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="esp_luminence" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\esp_luminence.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="esp_pressure" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\esp_pressure.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="esp_thermometer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\esp_thermometer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="graphics_heater" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\graphics_heater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="graphics_huelight_bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\graphics_huelight_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="graphics_huelight_on" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\graphics_huelight_on.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB