From 56d2a4ff75d2bb7cba84bcf2fb2241debcd26fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulski?= Date: Wed, 27 Mar 2019 01:11:14 +0100 Subject: [PATCH] =?UTF-8?q?wy=C5=9Bwietlanie=20ilo=C5=9Bci=20=C5=9Bmieci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CzokoŚmieciarka.WPF/MainWindow.xaml | 2 +- .../CzokoŚmieciarka.WPF/MainWindow.xaml.cs | 24 ++++++++++++----- .../CzokoŚmieciarka.WPF/Models/DumpWPF.cs | 26 +++++++++---------- .../CzokoŚmieciarka.WPF/Models/House.cs | 7 ++--- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml b/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml index 5947876..afd7bf9 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml @@ -12,7 +12,7 @@ - + diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs index b9497a3..cb63d2e 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs @@ -48,19 +48,29 @@ namespace CzokoŚmieciarka.WPF } } - House house = new House(columns, new Coords(0, 0)); + List trashes = new List(); + Trash glass = new Trash(GarbageType.Glass, 100); + Trash plasticMetal = new Trash(GarbageType.PlasticMetal, 100); + Trash organic = new Trash(GarbageType.Organic, 100); + Trash paper = new Trash(GarbageType.Paper, 100); + + trashes.Add(glass); + trashes.Add(plasticMetal); + trashes.Add(organic); + trashes.Add(paper); + House house = new House(columns, new Coords(0, 0),trashes); Objects[house.Location.X + house.Location.Y] = house; - house = new House(columns, new Coords(1, 0)); + house = new House(columns, new Coords(1, 0),trashes); Objects[house.Location.X + house.Location.Y] = house; - house = new House(columns, new Coords(2, 0)); + house = new House(columns, new Coords(2, 0),trashes); Objects[house.Location.X + house.Location.Y] = house; - DumpWPF dump = new DumpWPF(columns, new Coords(2, 4), new TypeOfGarbage("glass", 0, 0)); + DumpWPF dump = new DumpWPF(columns, new Coords(2, 4), glass); Objects[dump.Location.X + dump.Location.Y] = dump; - dump = new DumpWPF(columns, new Coords(2, 5), new TypeOfGarbage("plasticmetal", 0, 0)); + dump = new DumpWPF(columns, new Coords(2, 5), paper); Objects[dump.Location.X + dump.Location.Y] = dump; - dump = new DumpWPF(columns, new Coords(3, 4), new TypeOfGarbage("organic", 0, 0)); + dump = new DumpWPF(columns, new Coords(3, 4), organic); Objects[dump.Location.X + dump.Location.Y] = dump; - dump = new DumpWPF(columns, new Coords(3, 5), new TypeOfGarbage("paper", 0, 0)); + dump = new DumpWPF(columns, new Coords(3, 5), plasticMetal); Objects[dump.Location.X + dump.Location.Y] = dump; diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/DumpWPF.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/DumpWPF.cs index c1c0020..25de71b 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/DumpWPF.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/DumpWPF.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Media; using System.Windows.Media.Imaging; +using CzokoŚmieciarka.DataModels.Enums; using CzokoŚmieciarka.DataModels.Interfaces; using CzokoŚmieciarka.DataModels.Models; using CzokoŚmieciarka.WPF.Interfaces; @@ -14,34 +15,33 @@ namespace CzokoŚmieciarka.WPF.Models { class DumpWPF : AObject, INotifyPropertyChanged { - public ITypeOfGarbage TypeOfGarbage { get; set; } public event PropertyChangedEventHandler PropertyChanged; - - public DumpWPF(int columns, Coords location, ITypeOfGarbage typeOfGarbage) + public Trash Trash; + public DumpWPF(int columns, Coords location, Trash trash) { Location = new Coords(location.X, location.Y * columns); - TypeOfGarbage = typeOfGarbage; - switch (TypeOfGarbage.GarbageType) + Trash = trash; + switch (Trash.Type) { - case "glass": + case GarbageType.Glass: ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\glass.png"; Image = new ImageBrush(new BitmapImage(new Uri(ImagePath))); - Data = "Szkło"; + Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight); break; - case "plasticmetal": + case GarbageType.PlasticMetal: ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\plasticmetal.png"; Image = new ImageBrush(new BitmapImage(new Uri(ImagePath))); - Data = "Plastiki i metale"; + Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight); break; - case "organic": + case GarbageType.Organic: ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\organic.png"; Image = new ImageBrush(new BitmapImage(new Uri(ImagePath))); - Data = "Organiczne"; + Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight); break; - case "paper": + case GarbageType.Paper: ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\paper.png"; Image = new ImageBrush(new BitmapImage(new Uri(ImagePath))); - Data = "Papier"; + Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight); break; } } diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/House.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/House.cs index ab3da73..92a5a29 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/House.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/House.cs @@ -12,13 +12,14 @@ namespace CzokoŚmieciarka.WPF.Models { public class House : AObject { - public List Trashes = new List(4); - public House(int columns, Coords location) + public List Trashes = new List(); + public House(int columns, Coords location, List trashes) { + Trashes = trashes; ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\house.png"; Image = new ImageBrush(new BitmapImage(new Uri(ImagePath))); Location = new Coords(location.X, location.Y*columns); - Data = ""; + Data = String.Format("House\n{0}: {1}\n{2}: {3}\n{4}: {5}\n{6}: {7}", Trashes[0].Type.ToString(), Trashes[0].Weight, Trashes[1].Type.ToString(), Trashes[1].Weight, Trashes[2].Type.ToString(), Trashes[2].Weight, Trashes[3].Type.ToString(), Trashes[3].Weight); } } }