Usunięto starego wpf'a i AI_Naive zmieniono z .net core na framework
This commit is contained in:
Michał Dulski
parent
c2f5acee58
commit
9ef87dc4fe
@ -0,0 +1,54 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProjectGuid>{10E77BBE-55E1-483D-A456-0E94EAC9B24A}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
|
<RootNamespace>CzokoŚmieciarka.AI_Naive</RootNamespace>
|
||||||
|
<AssemblyName>CzokoŚmieciarka.AI_Naive</AssemblyName>
|
||||||
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
|
<FileAlignment>512</FileAlignment>
|
||||||
|
<Deterministic>true</Deterministic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\Debug\</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Net.Http" />
|
||||||
|
<Reference Include="System.Xml" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="RoutePlanningEngine.cs" />
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\CzokoŚmieciarka.DataModels\CzokoŚmieciarka.DataModels.csproj">
|
||||||
|
<Project>{f2e11fee-c5ac-47d2-ba9c-819909b6dff7}</Project>
|
||||||
|
<Name>CzokoŚmieciarka.DataModels</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// 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.AI_Naive")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("")]
|
||||||
|
[assembly: AssemblyProduct("CzokoŚmieciarka.AI_Naive")]
|
||||||
|
[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)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("10e77bbe-55e1-483d-a456-0e94eac9b24a")]
|
||||||
|
|
||||||
|
// 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")]
|
||||||
@ -1,117 +1,120 @@
|
|||||||
using CzokoŚmieciarka.DataModels.Enums;
|
using CzokoŚmieciarka.DataModels.Enums;
|
||||||
using CzokoŚmieciarka.DataModels.Interfaces;
|
using CzokoŚmieciarka.DataModels.Interfaces;
|
||||||
using CzokoŚmieciarka.DataModels.Interfaces.RoutePlanningEngine;
|
using CzokoŚmieciarka.DataModels.Interfaces.RoutePlanningEngine;
|
||||||
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
|
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
|
||||||
using CzokoŚmieciarka.DataModels.Models;
|
using CzokoŚmieciarka.DataModels.Models;
|
||||||
using CzokoŚmieciarka.DataModels.Models.Steps;
|
using CzokoŚmieciarka.DataModels.Models.Steps;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace Czoko_Smieciarka.AI_Naive
|
namespace Czoko_Smieciarka.AI_Naive
|
||||||
{
|
{
|
||||||
public class RoutePlanningEngine : IRoutePlanningEngine
|
public class RoutePlanningEngine : IRoutePlanningEngine
|
||||||
{
|
{
|
||||||
public IGarbageCollector Collector { get; }
|
public IGarbageCollector Collector { get; }
|
||||||
public IEnumerable<IGarbageLocalization> Cans { get; }
|
public IEnumerable<IGarbageLocalization> Cans { get; }
|
||||||
public IEnumerable<ADump> Dumps { get; }
|
public IEnumerable<ADump> Dumps { get; }
|
||||||
|
|
||||||
enum State { TravelToDump, TravelToCan, Wait, Finish }
|
enum State { TravelToDump, TravelToCan, Wait, Finish }
|
||||||
public Coords Destination { get; set; }
|
public Coords Destination { get; set; }
|
||||||
public object DestinationObject { get; set; }
|
public object DestinationObject { get; set; }
|
||||||
private State CurrentState { get; set; }
|
private State CurrentState { get; set; }
|
||||||
|
|
||||||
public IEnumerable<IStep> CalculateStep()
|
public IEnumerable<IStep> CalculateStep()
|
||||||
{
|
{
|
||||||
return PerformMove();
|
return PerformMove();
|
||||||
}
|
}
|
||||||
|
|
||||||
public RoutePlanningEngine(IGarbageCollector collector, IEnumerable<IGarbageLocalization> cans, IEnumerable<ADump> dumps)
|
public RoutePlanningEngine(IGarbageCollector collector, IEnumerable<IGarbageLocalization> cans, IEnumerable<ADump> dumps)
|
||||||
{
|
{
|
||||||
this.Collector = collector.Clone() as IGarbageCollector;
|
this.Collector = collector.Clone() as IGarbageCollector;
|
||||||
this.Cans = cans;
|
this.Cans = cans;
|
||||||
this.Dumps = dumps;
|
this.Dumps = dumps;
|
||||||
this.CurrentState = State.Wait;
|
this.CurrentState = State.Wait;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private IEnumerable<IStep> PerformMove()
|
private IEnumerable<IStep> PerformMove()
|
||||||
{
|
{
|
||||||
|
|
||||||
switch (CurrentState)
|
switch (CurrentState)
|
||||||
{
|
{
|
||||||
case State.TravelToDump:
|
case State.TravelToDump:
|
||||||
if (Destination == Collector.Position)
|
if (Destination == Collector.Position)
|
||||||
{
|
{
|
||||||
var dump = (DestinationObject as ADump);
|
var dump = (DestinationObject as ADump);
|
||||||
var step = new SpillStep(Collector, dump, dump.TypeOfGarbage);
|
var step = new SpillStep(Collector, dump, dump.TypeOfGarbage);
|
||||||
step.Invoke();
|
step.Invoke();
|
||||||
yield return step;
|
yield return step;
|
||||||
this.CurrentState = State.Wait;
|
this.CurrentState = State.Wait;
|
||||||
} else
|
}
|
||||||
{
|
else
|
||||||
var dif = Destination - Collector.Position;
|
{
|
||||||
Direction nextDirection = (dif.X == 0) ?
|
var dif = Destination - Collector.Position;
|
||||||
((dif.Y > 0) ? Direction.Up : Direction.Down) :
|
Direction nextDirection = (dif.X == 0) ?
|
||||||
((dif.X > 0) ? Direction.Right : Direction.Left);
|
((dif.Y > 0) ? Direction.Up : Direction.Down) :
|
||||||
|
((dif.X > 0) ? Direction.Right : Direction.Left);
|
||||||
var step = new MoveStep(nextDirection, Collector);
|
|
||||||
step.Invoke();
|
var step = new MoveStep(nextDirection, Collector);
|
||||||
yield return step;
|
step.Invoke();
|
||||||
}
|
yield return step;
|
||||||
break;
|
}
|
||||||
case State.TravelToCan:
|
break;
|
||||||
if (Destination == Collector.Position)
|
case State.TravelToCan:
|
||||||
{
|
if (Destination == Collector.Position)
|
||||||
var garbage = (DestinationObject as IGarbageLocalization);
|
{
|
||||||
foreach (var item in garbage.TrashCans)
|
var garbage = (DestinationObject as IGarbageLocalization);
|
||||||
{
|
foreach (var item in garbage.TrashCans)
|
||||||
var step = new CollectStep(Collector, garbage, item.TypeOfGarbage);
|
{
|
||||||
step.Invoke();
|
var step = new CollectStep(Collector, garbage, item.TypeOfGarbage);
|
||||||
yield return step;
|
step.Invoke();
|
||||||
}
|
yield return step;
|
||||||
|
}
|
||||||
this.CurrentState = State.Wait;
|
|
||||||
}
|
this.CurrentState = State.Wait;
|
||||||
else
|
}
|
||||||
{
|
else
|
||||||
var dif = Destination - Collector.Position;
|
{
|
||||||
Direction nextDirection = (dif.X == 0) ?
|
var dif = Destination - Collector.Position;
|
||||||
((dif.Y > 0) ? Direction.Up : Direction.Down) :
|
Direction nextDirection = (dif.X == 0) ?
|
||||||
((dif.X > 0) ? Direction.Right : Direction.Left);
|
((dif.Y > 0) ? Direction.Up : Direction.Down) :
|
||||||
|
((dif.X > 0) ? Direction.Right : Direction.Left);
|
||||||
var step = new MoveStep(nextDirection, Collector);
|
|
||||||
step.Invoke();
|
var step = new MoveStep(nextDirection, Collector);
|
||||||
yield return step;
|
step.Invoke();
|
||||||
}
|
yield return step;
|
||||||
break;
|
}
|
||||||
case State.Wait:
|
break;
|
||||||
var notEmpty = Collector.TrashContainers.Where(i => i.FillPercent > 0);
|
case State.Wait:
|
||||||
if (notEmpty.Any())
|
var notEmpty = Collector.TrashContainers.Where(i => i.FillPercent > 0);
|
||||||
{
|
if (notEmpty.Any())
|
||||||
var destDump = Dumps.First(i => i.TypeOfGarbage == notEmpty.First().TypeOfGarbage);
|
{
|
||||||
this.Destination = destDump.Localization;
|
var destDump = Dumps.First(i => i.TypeOfGarbage == notEmpty.First().TypeOfGarbage);
|
||||||
this.CurrentState = State.TravelToDump;
|
this.Destination = destDump.Localization;
|
||||||
} else
|
this.CurrentState = State.TravelToDump;
|
||||||
{
|
}
|
||||||
var notEmptyCans = Cans.Where(i => i.TrashCans.Any(j => j.FillPercent > 0));
|
else
|
||||||
if (notEmptyCans.Any())
|
{
|
||||||
{
|
var notEmptyCans = Cans.Where(i => i.TrashCans.Any(j => j.FillPercent > 0));
|
||||||
this.Destination = notEmptyCans.First().Coords;
|
if (notEmptyCans.Any())
|
||||||
this.CurrentState = State.TravelToCan;
|
{
|
||||||
} else
|
this.Destination = notEmptyCans.First().Coords;
|
||||||
{
|
this.CurrentState = State.TravelToCan;
|
||||||
this.CurrentState = State.Finish;
|
}
|
||||||
}
|
else
|
||||||
}
|
{
|
||||||
break;
|
this.CurrentState = State.Finish;
|
||||||
case State.Finish:
|
}
|
||||||
yield break;
|
}
|
||||||
}
|
break;
|
||||||
foreach (var item in PerformMove())
|
case State.Finish:
|
||||||
{
|
yield break;
|
||||||
yield return item;
|
}
|
||||||
}
|
foreach (var item in PerformMove())
|
||||||
}
|
{
|
||||||
}
|
yield return item;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>netcoreapp2.1</TargetFramework>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\Components\CzokoŚmieciarka.DataModels\CzokoŚmieciarka.DataModels.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@ -7,12 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.DataModels
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.DataModels.GeneralModels", "Components\CzokoŚmieciarka.DataModels.GeneralModels\CzokoŚmieciarka.DataModels.GeneralModels.csproj", "{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.DataModels.GeneralModels", "Components\CzokoŚmieciarka.DataModels.GeneralModels\CzokoŚmieciarka.DataModels.GeneralModels.csproj", "{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}"
|
||||||
EndProject
|
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("{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}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.WPFv2", "Interface\CzokoŚmieciarka.WPFv2\CzokoŚmieciarka.WPFv2.csproj", "{2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.AI_Naive", "Components\CzokoŚmieciarka.AI_Naive\CzokoŚmieciarka.AI_Naive.csproj", "{10E77BBE-55E1-483D-A456-0E94EAC9B24A}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -27,18 +25,14 @@ Global
|
|||||||
{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|Any CPU.Build.0 = Release|Any CPU
|
{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{06937DFB-242D-46BD-9A4B-486D156B62A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{06937DFB-242D-46BD-9A4B-486D156B62A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{06937DFB-242D-46BD-9A4B-486D156B62A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{06937DFB-242D-46BD-9A4B-486D156B62A9}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A1F1D99A-4E5B-4389-B776-321D8A5976EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{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.ActiveCfg = Debug|Any CPU
|
||||||
{2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|Any CPU.Build.0 = 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.ActiveCfg = Release|Any CPU
|
||||||
{2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|Any CPU.Build.0 = Release|Any CPU
|
{2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<startup>
|
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
|
||||||
</startup>
|
|
||||||
</configuration>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<Application x:Class="CzokoŚmieciarka.WPF.App"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:local="clr-namespace:CzokoŚmieciarka.WPF"
|
|
||||||
StartupUri="MainWindow.xaml">
|
|
||||||
<Application.Resources>
|
|
||||||
|
|
||||||
</Application.Resources>
|
|
||||||
</Application>
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
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.WPF
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for App.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class App : Application
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,119 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{06937DFB-242D-46BD-9A4B-486D156B62A9}</ProjectGuid>
|
|
||||||
<OutputType>WinExe</OutputType>
|
|
||||||
<RootNamespace>CzokoŚmieciarka.WPF</RootNamespace>
|
|
||||||
<AssemblyName>CzokoŚmieciarka.WPF</AssemblyName>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
|
||||||
<Deterministic>true</Deterministic>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.Drawing" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="System.Net.Http" />
|
|
||||||
<Reference Include="System.Xaml">
|
|
||||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="WindowsBase" />
|
|
||||||
<Reference Include="PresentationCore" />
|
|
||||||
<Reference Include="PresentationFramework" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ApplicationDefinition Include="App.xaml">
|
|
||||||
<Generator>MSBuild:Compile</Generator>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</ApplicationDefinition>
|
|
||||||
<Page Include="MainWindow.xaml">
|
|
||||||
<Generator>MSBuild:Compile</Generator>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</Page>
|
|
||||||
<Compile Include="App.xaml.cs">
|
|
||||||
<DependentUpon>App.xaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Interfaces\AObject.cs" />
|
|
||||||
<Compile Include="MainWindow.xaml.cs">
|
|
||||||
<DependentUpon>MainWindow.xaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="Models\Board.cs" />
|
|
||||||
<Compile Include="Interfaces\IObject.cs" />
|
|
||||||
<Compile Include="Models\DumpWPF.cs" />
|
|
||||||
<Compile Include="Models\GarbageCollectorWPF.cs" />
|
|
||||||
<Compile Include="Models\House.cs" />
|
|
||||||
<Compile Include="Models\Road.cs" />
|
|
||||||
<Compile Include="Models\Tile.cs" />
|
|
||||||
<Compile Include="Models\Trash.cs" />
|
|
||||||
<Compile Include="Properties\Annotations.cs" />
|
|
||||||
<Compile Include="Properties\AssemblyInfo.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Properties\Resources.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Properties\Settings.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Settings.settings</DependentUpon>
|
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
|
||||||
</Compile>
|
|
||||||
<EmbeddedResource Include="Properties\Resources.resx">
|
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<None Include="Properties\Settings.settings">
|
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="App.config" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\Components\CzokoŚmieciarka.DataModels.GeneralModels\CzokoŚmieciarka.DataModels.GeneralModels.csproj">
|
|
||||||
<Project>{a3d5da96-69d7-463f-b1ee-6fc70716e3b2}</Project>
|
|
||||||
<Name>CzokoŚmieciarka.DataModels.GeneralModels</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\Components\CzokoŚmieciarka.DataModels\CzokoŚmieciarka.DataModels.csproj">
|
|
||||||
<Project>{f2e11fee-c5ac-47d2-ba9c-819909b6dff7}</Project>
|
|
||||||
<Name>CzokoŚmieciarka.DataModels</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
||||||
</Project>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 83 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 85 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
@ -1,25 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using CzokoŚmieciarka.DataModels.Models;
|
|
||||||
using CzokoŚmieciarka.WPF.Models;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Interfaces
|
|
||||||
{
|
|
||||||
public abstract class AObject : IObject
|
|
||||||
{
|
|
||||||
public Coords Location { get; set; }
|
|
||||||
public string ImagePath { get; set; }
|
|
||||||
public string Data { get; set; }
|
|
||||||
public ImageBrush Image { get; set; }
|
|
||||||
|
|
||||||
public void RefreshImage()
|
|
||||||
{
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
using CzokoŚmieciarka.DataModels.Models;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Media;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public interface IObject
|
|
||||||
{
|
|
||||||
string ImagePath { get; set; }
|
|
||||||
string Data { get; set; }
|
|
||||||
ImageBrush Image { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
<Window x:Class="CzokoŚmieciarka.WPF.MainWindow"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:local="clr-namespace:CzokoŚmieciarka.WPF"
|
|
||||||
xmlns:models="clr-namespace:CzokoŚmieciarka.WPF.Models"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Title="MainWindow" Height="800" Width="1000"
|
|
||||||
KeyDown="MainWindow_OnKeyDown">
|
|
||||||
<ItemsControl ItemsSource="{Binding Tiles}">
|
|
||||||
<ItemsControl.Resources>
|
|
||||||
<DataTemplate DataType="{x:Type models:Tile}">
|
|
||||||
<Grid Background="{Binding Object.Image}">
|
|
||||||
<TextBlock Text="{Binding Object.Data}" Foreground="White"></TextBlock>
|
|
||||||
</Grid>
|
|
||||||
</DataTemplate>
|
|
||||||
</ItemsControl.Resources>
|
|
||||||
<ItemsControl.ItemsPanel>
|
|
||||||
<ItemsPanelTemplate>
|
|
||||||
<UniformGrid Rows="{Binding Rows}" Columns="{Binding Columns}"></UniformGrid>
|
|
||||||
</ItemsPanelTemplate>
|
|
||||||
</ItemsControl.ItemsPanel>
|
|
||||||
</ItemsControl>
|
|
||||||
|
|
||||||
</Window>
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Controls.Primitives;
|
|
||||||
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;
|
|
||||||
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;
|
|
||||||
using CzokoŚmieciarka.WPF.Interfaces;
|
|
||||||
using CzokoŚmieciarka.WPF.Models;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for MainWindow.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class MainWindow : Window
|
|
||||||
{
|
|
||||||
//public Board board;
|
|
||||||
private static int rows = 9;
|
|
||||||
private static int columns = 9;
|
|
||||||
private GarbageCollectorWPF garbageCollector = new GarbageCollectorWPF(columns, new Coords(0, 0), AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\garbageCollector.png", new List<AGarbageCollectorContainer>());
|
|
||||||
private List<AObject> Objects = new List<AObject>();
|
|
||||||
public MainWindow()
|
|
||||||
{
|
|
||||||
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
for (int y = 0; y < rows; y++)
|
|
||||||
{
|
|
||||||
for (int x = 0; x < columns; x++)
|
|
||||||
{
|
|
||||||
Road road = new Road(columns, new Coords(x, y), AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\intersection.png");
|
|
||||||
Objects.Add(road);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
List<Trash> trashes = new List<Trash>();
|
|
||||||
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), trashes);
|
|
||||||
Objects[house.Location.X + house.Location.Y] = house;
|
|
||||||
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), glass);
|
|
||||||
Objects[dump.Location.X + dump.Location.Y] = dump;
|
|
||||||
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), organic);
|
|
||||||
Objects[dump.Location.X + dump.Location.Y] = dump;
|
|
||||||
dump = new DumpWPF(columns, new Coords(3, 5), plasticMetal);
|
|
||||||
Objects[dump.Location.X + dump.Location.Y] = dump;
|
|
||||||
|
|
||||||
|
|
||||||
Board board = new Board(Objects, garbageCollector);
|
|
||||||
this.DataContext = board;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void MainWindow_OnKeyDown(object sender, KeyEventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
if (e.Key == Key.Up)
|
|
||||||
{
|
|
||||||
garbageCollector.Move(columns, Direction.Up);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.Key == Key.Down)
|
|
||||||
{
|
|
||||||
garbageCollector.Move(columns, Direction.Down);
|
|
||||||
}
|
|
||||||
if (e.Key == Key.Left)
|
|
||||||
{
|
|
||||||
garbageCollector.Move(columns, Direction.Left);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.Key == Key.Right)
|
|
||||||
{
|
|
||||||
garbageCollector.Move(columns, Direction.Right);
|
|
||||||
}
|
|
||||||
Board board = new Board(Objects, garbageCollector);
|
|
||||||
board.BoardRefresh(Objects, garbageCollector);
|
|
||||||
this.DataContext = board;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Drawing;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using CzokoŚmieciarka.DataModels.GeneralModels.Models;
|
|
||||||
using CzokoŚmieciarka.DataModels.Models;
|
|
||||||
using CzokoŚmieciarka.WPF.Interfaces;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public class Board
|
|
||||||
{
|
|
||||||
static int _rows = 9;
|
|
||||||
static int _columns = 9;
|
|
||||||
List<Tile> _tiles = new List<Tile>();
|
|
||||||
|
|
||||||
public Board(List<AObject> objects, GarbageCollectorWPF garbageCollector)
|
|
||||||
{
|
|
||||||
foreach (var item in objects)
|
|
||||||
{
|
|
||||||
Tile tile = new Tile()
|
|
||||||
{
|
|
||||||
Data = item.Data,
|
|
||||||
Object = item
|
|
||||||
};
|
|
||||||
_tiles.Add(tile);
|
|
||||||
}
|
|
||||||
_tiles[garbageCollector.Location.X + garbageCollector.Location.Y].Object.Image = MergedBitmaps(
|
|
||||||
new Bitmap(_tiles[garbageCollector.Location.X + garbageCollector.Location.Y].Object.ImagePath),
|
|
||||||
new Bitmap(garbageCollector.ImagePath));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BoardRefresh(List<AObject> objects, GarbageCollectorWPF garbageCollector)
|
|
||||||
{
|
|
||||||
foreach (var item in objects)
|
|
||||||
{
|
|
||||||
_tiles[item.Location.X + item.Location.Y].Object = item;
|
|
||||||
_tiles[item.Location.X + item.Location.Y].Object.RefreshImage();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
_tiles[garbageCollector.Location.X + garbageCollector.Location.Y].Object.Image = MergedBitmaps(
|
|
||||||
new Bitmap(_tiles[garbageCollector.Location.X + garbageCollector.Location.Y].Object.ImagePath),
|
|
||||||
new Bitmap(garbageCollector.ImagePath));
|
|
||||||
}
|
|
||||||
|
|
||||||
public int Rows
|
|
||||||
{
|
|
||||||
get { return _rows; }
|
|
||||||
set { _rows = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public int Columns
|
|
||||||
{
|
|
||||||
get { return _columns; }
|
|
||||||
set { _columns = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Tile> Tiles
|
|
||||||
{
|
|
||||||
get { return _tiles; }
|
|
||||||
set { _tiles = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
private ImageBrush MergedBitmaps(Bitmap bmp1, Bitmap bmp2)
|
|
||||||
{
|
|
||||||
using (Graphics g = Graphics.FromImage(bmp1))
|
|
||||||
{
|
|
||||||
g.DrawImage(bmp2, new Point(0, 0));
|
|
||||||
}
|
|
||||||
MemoryStream ms = new MemoryStream();
|
|
||||||
((System.Drawing.Bitmap)bmp1).Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);
|
|
||||||
BitmapImage image = new BitmapImage();
|
|
||||||
image.BeginInit();
|
|
||||||
ms.Seek(0, SeekOrigin.Begin);
|
|
||||||
image.StreamSource = ms;
|
|
||||||
image.EndInit();
|
|
||||||
ImageBrush result = new ImageBrush(image);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
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;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
class DumpWPF : AObject, INotifyPropertyChanged
|
|
||||||
{
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
public Trash Trash;
|
|
||||||
public DumpWPF(int columns, Coords location, Trash trash)
|
|
||||||
{
|
|
||||||
Location = new Coords(location.X, location.Y * columns);
|
|
||||||
Trash = trash;
|
|
||||||
switch (Trash.Type)
|
|
||||||
{
|
|
||||||
case GarbageType.Glass:
|
|
||||||
ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\glass.png";
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight);
|
|
||||||
break;
|
|
||||||
case GarbageType.PlasticMetal:
|
|
||||||
ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\plasticmetal.png";
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight);
|
|
||||||
break;
|
|
||||||
case GarbageType.Organic:
|
|
||||||
ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\organic.png";
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight);
|
|
||||||
break;
|
|
||||||
case GarbageType.Paper:
|
|
||||||
ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\Dumps\paper.png";
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
Data = String.Format("House\n{0}: {1}", Trash.Type.ToString(), Trash.Weight);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
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.GeneralModels.Models;
|
|
||||||
using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector;
|
|
||||||
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
|
|
||||||
using CzokoŚmieciarka.DataModels.Models;
|
|
||||||
using CzokoŚmieciarka.WPF.Annotations;
|
|
||||||
using CzokoŚmieciarka.WPF.Interfaces;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public class GarbageCollectorWPF : AGarbageCollector, IObject, INotifyPropertyChanged
|
|
||||||
{
|
|
||||||
public Coords Location { get; set; }
|
|
||||||
public string ImagePath { get; set; }
|
|
||||||
public string Data { get; set; }
|
|
||||||
public ImageBrush Image { get; set; }
|
|
||||||
public void Move(int columns, Direction direction)
|
|
||||||
{
|
|
||||||
switch (direction)
|
|
||||||
{
|
|
||||||
case (Direction.Up):
|
|
||||||
Location.Y = Location.Y + (-1 * columns);
|
|
||||||
Position = this.MoveUp();
|
|
||||||
break;
|
|
||||||
case (Direction.Down):
|
|
||||||
Location.Y = Location.Y + (1 * columns);
|
|
||||||
Position = this.MoveDown();
|
|
||||||
break;
|
|
||||||
case (Direction.Left):
|
|
||||||
Location.X = Location.X + (-1);
|
|
||||||
Position = this.MoveLeft();
|
|
||||||
break;
|
|
||||||
case (Direction.Right):
|
|
||||||
Location.X = Location.X + (1);
|
|
||||||
Position = this.MoveRight();
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public GarbageCollectorWPF(int columns, Coords location, string imagePath, IEnumerable<AGarbageCollectorContainer> trashContainers) : base(location, trashContainers)
|
|
||||||
{
|
|
||||||
Location = new Coords(location.X, location.Y * columns);
|
|
||||||
ImagePath = imagePath;
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
|
|
||||||
[NotifyPropertyChangedInvocator]
|
|
||||||
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
|
||||||
{
|
|
||||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using CzokoŚmieciarka.DataModels.Models;
|
|
||||||
using CzokoŚmieciarka.WPF.Interfaces;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public class House : AObject
|
|
||||||
{
|
|
||||||
public List<Trash> Trashes = new List<Trash>();
|
|
||||||
public House(int columns, Coords location, List<Trash> 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 = 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using CzokoŚmieciarka.DataModels.Models;
|
|
||||||
using CzokoŚmieciarka.WPF.Interfaces;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public class Road: AObject
|
|
||||||
{
|
|
||||||
public Road(int columns, Coords location, string imagePath)
|
|
||||||
{
|
|
||||||
Location = new Coords(location.X, location.Y * columns);
|
|
||||||
ImagePath = imagePath;
|
|
||||||
Image = new ImageBrush(new BitmapImage(new Uri(ImagePath)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using CzokoŚmieciarka.WPF.Interfaces;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public class Tile
|
|
||||||
{
|
|
||||||
public string Data { get; set; }
|
|
||||||
public AObject Object { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using CzokoŚmieciarka.DataModels.Enums;
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Models
|
|
||||||
{
|
|
||||||
public class Trash
|
|
||||||
{
|
|
||||||
public GarbageType Type { get; set; }
|
|
||||||
public int Weight { get; set; }
|
|
||||||
|
|
||||||
public Trash(GarbageType type, int weight)
|
|
||||||
{
|
|
||||||
Type = type;
|
|
||||||
Weight = weight;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,55 +0,0 @@
|
|||||||
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.WPF")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("CzokoŚmieciarka.WPF")]
|
|
||||||
[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
|
|
||||||
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
|
|
||||||
//inside a <PropertyGroup>. For example, if you are using US english
|
|
||||||
//in your source files, set the <UICulture> 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")]
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// 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.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.Properties
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
|
||||||
/// </summary>
|
|
||||||
// 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()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns the cached ResourceManager instance used by this class.
|
|
||||||
/// </summary>
|
|
||||||
[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.WPF.Properties.Resources", typeof(Resources).Assembly);
|
|
||||||
resourceMan = temp;
|
|
||||||
}
|
|
||||||
return resourceMan;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Overrides the current thread's CurrentUICulture property for all
|
|
||||||
/// resource lookups using this strongly typed resource class.
|
|
||||||
/// </summary>
|
|
||||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
|
||||||
internal static global::System.Globalization.CultureInfo Culture
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return resourceCulture;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
resourceCulture = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<root>
|
|
||||||
<!--
|
|
||||||
Microsoft ResX Schema
|
|
||||||
|
|
||||||
Version 2.0
|
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
|
||||||
that is mostly human readable. The generation and parsing of the
|
|
||||||
various data types are done through the TypeConverter classes
|
|
||||||
associated with the data types.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
|
||||||
<resheader name="version">2.0</resheader>
|
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
|
||||||
</data>
|
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:choice maxOccurs="unbounded">
|
|
||||||
<xsd:element name="metadata">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="assembly">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:attribute name="alias" type="xsd:string" />
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="data">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="resheader">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:choice>
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:schema>
|
|
||||||
<resheader name="resmimetype">
|
|
||||||
<value>text/microsoft-resx</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="version">
|
|
||||||
<value>2.0</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="reader">
|
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="writer">
|
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
</root>
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// 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.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
namespace CzokoŚmieciarka.WPF.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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
|
|
||||||
<Profiles>
|
|
||||||
<Profile Name="(Default)" />
|
|
||||||
</Profiles>
|
|
||||||
<Settings />
|
|
||||||
</SettingsFile>
|
|
||||||
@ -101,6 +101,10 @@
|
|||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\Components\CzokoŚmieciarka.AI_Naive\CzokoŚmieciarka.AI_Naive.csproj">
|
||||||
|
<Project>{10e77bbe-55e1-483d-a456-0e94eac9b24a}</Project>
|
||||||
|
<Name>CzokoŚmieciarka.AI_Naive</Name>
|
||||||
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\..\Components\CzokoŚmieciarka.DataModels.GeneralModels\CzokoŚmieciarka.DataModels.GeneralModels.csproj">
|
<ProjectReference Include="..\..\Components\CzokoŚmieciarka.DataModels.GeneralModels\CzokoŚmieciarka.DataModels.GeneralModels.csproj">
|
||||||
<Project>{a3d5da96-69d7-463f-b1ee-6fc70716e3b2}</Project>
|
<Project>{a3d5da96-69d7-463f-b1ee-6fc70716e3b2}</Project>
|
||||||
<Name>CzokoŚmieciarka.DataModels.GeneralModels</Name>
|
<Name>CzokoŚmieciarka.DataModels.GeneralModels</Name>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user