From bc8c6ae91216b0728da700a530c5257bcf9602c7 Mon Sep 17 00:00:00 2001 From: s434678 Date: Wed, 20 Mar 2019 12:34:03 +0100 Subject: [PATCH] Board --- Trunk/CodeMap1.dgml | 299 ++++++++++++++++++ .../CzokoŚmieciarka.DataModels.csproj | 2 - .../CzokoŚmieciarka.DataModels/Models/Map.cs | 1 - .../CzokoŚmieciarka.WPF.csproj | 12 + .../CzokoŚmieciarka.WPF/Images/house.png | Bin 0 -> 3949 bytes .../Images/intersection.png | Bin 0 -> 6083 bytes .../Interfaces/IObject.cs | 15 + .../CzokoŚmieciarka.WPF/MainWindow.xaml.cs | 13 +- .../CzokoŚmieciarka.WPF/Models/Board.cs | 9 +- .../CzokoŚmieciarka.WPF/Models/Home.cs | 15 + 10 files changed, 359 insertions(+), 7 deletions(-) create mode 100644 Trunk/CodeMap1.dgml create mode 100644 Trunk/Interface/CzokoŚmieciarka.WPF/Images/house.png create mode 100644 Trunk/Interface/CzokoŚmieciarka.WPF/Images/intersection.png create mode 100644 Trunk/Interface/CzokoŚmieciarka.WPF/Interfaces/IObject.cs create mode 100644 Trunk/Interface/CzokoŚmieciarka.WPF/Models/Home.cs diff --git a/Trunk/CodeMap1.dgml b/Trunk/CodeMap1.dgml new file mode 100644 index 0000000..36945f2 --- /dev/null +++ b/Trunk/CodeMap1.dgml @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj b/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj index 314b063..105b426 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj +++ b/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj @@ -31,8 +31,6 @@ 4 - - diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs index 20d45b5..3cd1057 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs +++ b/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Windows.Shapes; using CzokoŚmieciarka.DataModels.Interfaces; namespace CzokoŚmieciarka.DataModels.Models diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/CzokoŚmieciarka.WPF.csproj b/Trunk/Interface/CzokoŚmieciarka.WPF/CzokoŚmieciarka.WPF.csproj index 50fb454..206dc7a 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/CzokoŚmieciarka.WPF.csproj +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/CzokoŚmieciarka.WPF.csproj @@ -70,6 +70,8 @@ + + Code @@ -96,5 +98,15 @@ + + + {a3d5da96-69d7-463f-b1ee-6fc70716e3b2} + CzokoŚmieciarka.DataModels.GeneralModels + + + {f2e11fee-c5ac-47d2-ba9c-819909b6dff7} + CzokoŚmieciarka.DataModels + + \ No newline at end of file diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Images/house.png b/Trunk/Interface/CzokoŚmieciarka.WPF/Images/house.png new file mode 100644 index 0000000000000000000000000000000000000000..357a3ae28879250d31a1b5900cd6defefca578c9 GIT binary patch literal 3949 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 Hu0mjfP=U$8 literal 0 HcmV?d00001 diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Images/intersection.png b/Trunk/Interface/CzokoŚmieciarka.WPF/Images/intersection.png new file mode 100644 index 0000000000000000000000000000000000000000..a98dc6ce607b046c2844065c6049a144ace49a24 GIT binary patch literal 6083 zcmeAS@N?(olHy`uVBq!ia0y~yU@8J(4kn<;d7oW}fD~hKkh>GZx^prwfgF}}M_)$< zhK>E)e-c@Ne9i)o$YKTtzQZ8Qcszea3Il_9gr|#RNJZS+s|Qb}-rU#{cvGqRmio;r za{CVZKT%=f-^d<%@#wFJ#kD&p`&j&3U;qE__4?n_zpavGG&m9Y_jrgkQ^JJJzxr2} zu^d?N|K*y0?)w+}{D;Wi)xEqw%bkIzD6IVSm-V*<8Jg!@y=(M$HBhNSdg=C2WupNy znnFhN!f4?DE=xyC%h7saw4xksIgGZEMjMTz&EwJj0RBK0^UUk((_VT{`nTcJ%lCtnR7fsDjaO7)=kO z`GUgoVgHo+7v)oAJtqB|@u~6pdkyOeDt`^1GOxcMSf=3lEBO?A-2TOH9437^K81fz zo%_v3m6!7`?f?Jp_5P>Z=R-9701Z|Ho7lVFJXj7Hm43OYc|K&MdiiO-I!J{xSI?SU gg~k8=z5dT|IOjc2#??$7;J`bBr>mdKI;Vst0Q;t++yDRo literal 0 HcmV?d00001 diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Interfaces/IObject.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/Interfaces/IObject.cs new file mode 100644 index 0000000..8e3f8b0 --- /dev/null +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/Interfaces/IObject.cs @@ -0,0 +1,15 @@ +using CzokoŚmieciarka.DataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.WPF.Models +{ + public interface IObject + { + Coords Location { get; set; } + string ImagePath { get; set; } + } +} diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs index 07bccf7..c103673 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/MainWindow.xaml.cs @@ -13,6 +13,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using CzokoŚmieciarka.DataModels.Models; using CzokoŚmieciarka.WPF.Models; namespace CzokoŚmieciarka.WPF @@ -22,11 +23,19 @@ namespace CzokoŚmieciarka.WPF /// public partial class MainWindow : Window { + public List Objects = new List(); + + public MainWindow() { - InitializeComponent(); - this.DataContext = new Board(10, 10); + InitializeComponent(); + Objects.Add(new Home() + { + ImagePath = @"C:\Users\s434678\Source\Repos\Czoko_Smieciarka\Trunk\Interface\CzokoŚmieciarka.WPF\Images\house.png", + Location = new Coords(10, 12) + }); + this.DataContext = new Board(8, 10, Objects); } } diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Board.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Board.cs index 2c6d613..7cc761b 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Board.cs +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Board.cs @@ -14,11 +14,11 @@ namespace CzokoŚmieciarka.WPF.Models int _columns; List _tiles = new List(); - public Board(int rows, int columns) + public Board(int rows, int columns, List Objects) { _rows = rows; _columns = columns; - ImageBrush imgBrush = new ImageBrush(new BitmapImage(new Uri(@"F:\Projects\In-progress\CzokoSmieciarka\Trunk\CzokoŚmieciarka.WPF\Images\dirt.jpg"))); + ImageBrush imgBrush = new ImageBrush(new BitmapImage(new Uri(@"C:\Users\s434678\Source\Repos\Czoko_Smieciarka\Trunk\Interface\CzokoŚmieciarka.WPF\Images\intersection.png"))); for (int r = 0; r < rows; r++) { for (int c = 0; c < columns; c++) @@ -30,6 +30,11 @@ namespace CzokoŚmieciarka.WPF.Models }); } } + + foreach(var item in Objects) + { + _tiles[item.Location.X + item.Location.Y].Background = new ImageBrush(new BitmapImage(new Uri(@item.ImagePath))); + } } public int Rows diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Home.cs b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Home.cs new file mode 100644 index 0000000..ab3e271 --- /dev/null +++ b/Trunk/Interface/CzokoŚmieciarka.WPF/Models/Home.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.DataModels.Models; + +namespace CzokoŚmieciarka.WPF.Models +{ + public class Home : IObject + { + public Coords Location { get; set; } + public string ImagePath { get; set; } + } +}