diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs b/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs
index 5c86b10..38f6415 100644
--- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs
@@ -1,17 +1,18 @@
-using CzokoŚmieciarka.DataModels.Interfaces;
+using CzokoŚmieciarka.DataModels.Enums;
+using CzokoŚmieciarka.DataModels.Interfaces;
namespace CzokoŚmieciarka.DataModels.GeneralModels.Models
{
public class TypeOfGarbage : ITypeOfGarbage
{
- public TypeOfGarbage(string garbageType, int density, int processingTimePerUnit = 0)
+ public TypeOfGarbage(GarbageType garbageType, int density, int processingTimePerUnit = 0)
{
this.GarbageType = garbageType;
this.Density = density;
this.ProcessingTimePerUnit = processingTimePerUnit;
}
- public string GarbageType { get; }
+ public GarbageType GarbageType { get; }
public int ProcessingTimePerUnit { get; }
public int Density { get; }
}
diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs
index f99614a..b8b65c0 100644
--- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs
@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using CzokoŚmieciarka.DataModels.Enums;
namespace CzokoŚmieciarka.DataModels.Interfaces
{
public interface ITypeOfGarbage
{
- string GarbageType { get; }
+ GarbageType GarbageType { get; }
int ProcessingTimePerUnit { get; }
diff --git a/Trunk/CzokoŚmieciarka.sln b/Trunk/CzokoŚmieciarka.sln
index abbf3b7..6ca794f 100644
--- a/Trunk/CzokoŚmieciarka.sln
+++ b/Trunk/CzokoŚmieciarka.sln
@@ -9,7 +9,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.DataModels
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.WPF", "Interface\CzokoŚmieciarka.WPF\CzokoŚmieciarka.WPF.csproj", "{06937DFB-242D-46BD-9A4B-486D156B62A9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Czoko_Smieciarka.AI_Naive", "Czoko_Smieciarka.AI_Naive\Czoko_Smieciarka.AI_Naive.csproj", "{A1F1D99A-4E5B-4389-B776-321D8A5976EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Czoko_Smieciarka.AI_Naive", "Czoko_Smieciarka.AI_Naive\Czoko_Smieciarka.AI_Naive.csproj", "{A1F1D99A-4E5B-4389-B776-321D8A5976EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.WPFv2", "Interface\CzokoŚmieciarka.WPFv2\CzokoŚmieciarka.WPFv2.csproj", "{2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,6 +35,10 @@ Global
{A1F1D99A-4E5B-4389-B776-321D8A5976EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1F1D99A-4E5B-4389-B776-321D8A5976EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1F1D99A-4E5B-4389-B776-321D8A5976EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPF/Images/dupa.jpg b/Trunk/Interface/CzokoŚmieciarka.WPF/Images/dupa.jpg
deleted file mode 100644
index 476ef0b..0000000
Binary files a/Trunk/Interface/CzokoŚmieciarka.WPF/Images/dupa.jpg and /dev/null differ
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.config b/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.config
new file mode 100644
index 0000000..731f6de
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.xaml b/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.xaml
new file mode 100644
index 0000000..72052c4
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.xaml
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.xaml.cs
new file mode 100644
index 0000000..0282415
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace CzokoŚmieciarka.WPFv2
+{
+ ///
+ /// Interaction logic for App.xaml
+ ///
+ public partial class App : Application
+ {
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj b/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj
new file mode 100644
index 0000000..4451d31
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj
@@ -0,0 +1,112 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}
+ WinExe
+ CzokoŚmieciarka.WPFv2
+ CzokoŚmieciarka.WPFv2
+ v4.6.1
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ true
+ true
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ App.xaml
+ Code
+
+
+ MainWindow.xaml
+ Code
+
+
+
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+
+
+
+ {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.WPFv2/MainWindow.xaml b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml
new file mode 100644
index 0000000..b21a30d
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
new file mode 100644
index 0000000..cae978d
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
@@ -0,0 +1,51 @@
+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.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CzokoŚmieciarka.WPFv2
+{
+ ///
+ /// Interaction logic for MainWindow.xaml
+ ///
+ public partial class MainWindow : Window
+ {
+ public MainWindow()
+ {
+ ColumnDefinition column;
+ RowDefinition row;
+ InitializeComponent();
+ for(int i = 0; i < 10; i++)
+ {
+ column = new ColumnDefinition();
+ row = new RowDefinition();
+ Board.ColumnDefinitions.Add(column);
+ Board.RowDefinitions.Add(row);
+ }
+
+ Board.ShowGridLines = true;
+ for(int rows = 0; rows < 3; rows++)
+ {
+ row = new RowDefinition();
+ CollectorInfo.RowDefinitions.Add(row);
+ }
+
+ for (int columns = 0; columns < 2; columns++)
+ {
+ column = new ColumnDefinition();
+ CollectorInfo.ColumnDefinitions.Add(column);
+ }
+ CollectorInfo.ShowGridLines = true;
+ }
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs
new file mode 100644
index 0000000..8c1e517
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Dump.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using CzokoŚmieciarka.DataModels.Interfaces;
+using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
+using CzokoŚmieciarka.DataModels.Models;
+
+namespace CzokoŚmieciarka.WPFv2.Models
+{
+ class WPFDump : ADump
+ {
+ public string ImagePath { get; set; }
+ public ImageBrush ImageBrush { get; set; }
+
+ public WPFDump(ITypeOfGarbage typeOfGarbage, int maxVolume, Coords localization, string imagePath) : base(typeOfGarbage, maxVolume, localization)
+ {
+ ImagePath = imagePath;
+ }
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs
new file mode 100644
index 0000000..87e1238
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector;
+using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
+using CzokoŚmieciarka.DataModels.Models;
+
+namespace CzokoŚmieciarka.WPFv2.Models
+{
+ class WPFGarbageCollector : AGarbageCollector
+ {
+ public string ImagePath { get; set; }
+ public ImageBrush ImageBrush { get; set; }
+
+ public WPFGarbageCollector(Coords startPosition, IEnumerable trashContainers, string imagePath) : base(startPosition, trashContainers)
+ {
+ ImagePath = imagePath;
+ }
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs
new file mode 100644
index 0000000..f5da43c
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using CzokoŚmieciarka.DataModels.Interfaces;
+using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
+using CzokoŚmieciarka.DataModels.Models;
+
+namespace CzokoŚmieciarka.WPFv2.Models
+{
+ class WPFHouse : IGarbageLocalization
+ {
+ public Coords Coords { get; }
+ public IEnumerable TrashCans { get; set; }
+ private string ImagePath { get; set; }
+ public ImageBrush ImageBrush { get; set; }
+
+
+ public WPFHouse(Coords coords, IEnumerable trashCans, string imagePath)
+ {
+ this.Coords = coords;
+ this.TrashCans = trashCans;
+ }
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/AssemblyInfo.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..d74f52c
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("CzokoŚmieciarka.WPFv2")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CzokoŚmieciarka.WPFv2")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//CultureYouAreCodingWith in your .csproj file
+//inside a . For example, if you are using US english
+//in your source files, set the to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Resources.Designer.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..bfbd2f2
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace CzokoŚmieciarka.WPFv2.Properties
+{
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [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
+ {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources()
+ {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager
+ {
+ get
+ {
+ if ((resourceMan == null))
+ {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CzokoŚmieciarka.WPFv2.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture
+ {
+ get
+ {
+ return resourceCulture;
+ }
+ set
+ {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Resources.resx b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Settings.Designer.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..1372997
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace CzokoŚmieciarka.WPFv2.Properties
+{
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+ {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default
+ {
+ get
+ {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Settings.settings b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file