diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs index e3f6d05..16a6358 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs +++ b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs @@ -9,6 +9,6 @@ namespace CzokoŚmieciarka.DataModels.Interfaces.TrashCans this.Localization = localization; } - public Coords Localization { get; } + public Coords Localization { get; set; } } } diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs index 0d79abb..5e113fa 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text; @@ -12,6 +13,8 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using CzokoŚmieciarka.DataModels.GeneralModels.Models; +using CzokoŚmieciarka.DataModels.Models; using CzokoŚmieciarka.WPFv2.Interfaces; using CzokoŚmieciarka.WPFv2.Models; @@ -38,9 +41,20 @@ namespace CzokoŚmieciarka.WPFv2 Board.RowDefinitions.Add(row); for (int j = 0; j < Columns; j++) { - Road road = new Road("path"); + Road road = new Road(); Objects[i, j] = road; + Grid.SetRow(Objects[i,j].Image, i); + Grid.SetColumn(Objects[i, j].Image, j); + Board.Children.Add(Objects[i, j].Image); } + + IEnumerable trashCans = new List(); + WPFHouse house = new WPFHouse(new Coords(i, i), trashCans); + Objects[i, i] = house; + Grid.SetRow(Objects[i, i].Image, i); + Grid.SetColumn(Objects[i, i].Image, i); + Board.Children.Add(Objects[i, i].Image); + } Board.ShowGridLines = true; diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs index 5690370..2f50ebe 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs @@ -5,6 +5,9 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Controls; using System.Windows.Media; +using System.Windows.Media.Imaging; +using CzokoŚmieciarka.DataModels.Enums; +using CzokoŚmieciarka.DataModels.GeneralModels.Models; using CzokoŚmieciarka.DataModels.Interfaces; using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; using CzokoŚmieciarka.DataModels.Models; @@ -17,9 +20,29 @@ namespace CzokoŚmieciarka.WPFv2.Models public string ImagePath { get; set; } public Image Image { get; set; } - public WPFDump(ITypeOfGarbage typeOfGarbage, int maxVolume, Coords localization, string imagePath) : base(typeOfGarbage, maxVolume, localization) + public WPFDump(ITypeOfGarbage typeofGarbage, int maxVolume, Coords localization, string imagePath) : base ( typeofGarbage, maxVolume, localization) { ImagePath = imagePath; + Image = new Image(); + switch (typeofGarbage.GarbageType) + { + case GarbageType.Glass: + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\glass.png"; + Image.Source = new BitmapImage(new Uri(ImagePath)); + break; + case GarbageType.PlasticMetal: + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\plasticmetal.png"; + Image.Source = new BitmapImage(new Uri(ImagePath)); + break; + case GarbageType.Organic: + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\organic.png"; + Image.Source = new BitmapImage(new Uri(ImagePath)); + break; + case GarbageType.Paper: + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\paper.png"; + Image.Source = new BitmapImage(new Uri(ImagePath)); + break; + } } } } diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs index f0910ae..ba5b121 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Controls; using System.Windows.Media; +using System.Windows.Media.Imaging; using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector; using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; using CzokoŚmieciarka.DataModels.Models; @@ -17,9 +18,12 @@ namespace CzokoŚmieciarka.WPFv2.Models public string ImagePath { get; set; } public Image Image { get; set; } - public WPFGarbageCollector(Coords startPosition, IEnumerable trashContainers, string imagePath) : base(startPosition, trashContainers) + public WPFGarbageCollector(Coords startPosition, IEnumerable trashContainers) : base(startPosition, trashContainers) { - ImagePath = imagePath; + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\garbageCollector.png"; + Image = new Image(); + Image.Source = + new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\garbageCollector.png")); } } } diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs index c07d442..d6cad2c 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Controls; using System.Windows.Media; +using System.Windows.Media.Imaging; using CzokoŚmieciarka.DataModels.Interfaces; using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; using CzokoŚmieciarka.DataModels.Models; @@ -20,10 +21,15 @@ namespace CzokoŚmieciarka.WPFv2.Models public Image Image { get; set; } - public WPFHouse(Coords coords, IEnumerable trashCans, string imagePath) + public WPFHouse(Coords coords, IEnumerable trashCans) { - this.Coords = coords; - this.TrashCans = trashCans; + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\house.png"; + Image = new Image + { + Source = new BitmapImage(new Uri(ImagePath)) + }; + TrashCans = trashCans; + Coords = coords; } } } diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs index bf378cf..6d4a0b5 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs @@ -16,9 +16,13 @@ namespace CzokoŚmieciarka.WPFv2.Models public string ImagePath { get; set; } public Image Image { get; set; } - public Road(string imagePath) + public Road() { - ImagePath = imagePath; + ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\intersection.png"; + Image = new Image + { + Source = new BitmapImage(new Uri(ImagePath)) + }; } } }