diff --git a/docs/Hand-ins/Sprint-5-Planning-Package_07052024_2.pdf b/docs/Hand-ins/Sprint-5-Planning-Package_07052024_2.pdf new file mode 100644 index 0000000..f47eb35 Binary files /dev/null and b/docs/Hand-ins/Sprint-5-Planning-Package_07052024_2.pdf differ diff --git a/images/screenshots/ProfHeat-Screenshot-1.png b/images/screenshots/ProfHeat-Screenshot-1.png new file mode 100644 index 0000000..333e509 Binary files /dev/null and b/images/screenshots/ProfHeat-Screenshot-1.png differ diff --git a/images/screenshots/ProfHeat-Screenshot-2.png b/images/screenshots/ProfHeat-Screenshot-2.png new file mode 100644 index 0000000..d19fae2 Binary files /dev/null and b/images/screenshots/ProfHeat-Screenshot-2.png differ diff --git a/images/screenshots/ProfHeat-Screenshot-3.png b/images/screenshots/ProfHeat-Screenshot-3.png new file mode 100644 index 0000000..e34cd01 Binary files /dev/null and b/images/screenshots/ProfHeat-Screenshot-3.png differ diff --git a/images/screenshots/ProfHeat-Screenshot-4.png b/images/screenshots/ProfHeat-Screenshot-4.png new file mode 100644 index 0000000..386205a Binary files /dev/null and b/images/screenshots/ProfHeat-Screenshot-4.png differ diff --git a/images/screenshots/ProfHeat-Screenshot-5.png b/images/screenshots/ProfHeat-Screenshot-5.png new file mode 100644 index 0000000..245ec9b Binary files /dev/null and b/images/screenshots/ProfHeat-Screenshot-5.png differ diff --git a/images/screenshots/ProfHeat-Screenshot-6.png b/images/screenshots/ProfHeat-Screenshot-6.png new file mode 100644 index 0000000..1ac6aa1 Binary files /dev/null and b/images/screenshots/ProfHeat-Screenshot-6.png differ diff --git a/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg b/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg index ff8ff30..590e234 100644 --- a/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg @@ -12,13 +12,12 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - + id="layer1" + inkscape:label="Icon"> diff --git a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg index 634b282..6c2642b 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg @@ -8,23 +8,24 @@ height="256" viewBox="0 0 256 256" sodipodi:docname="GasBoiler.svg" - inkscape:export-filename="GasMoto.svg" + inkscape:export-filename="OilBoiler.svg" inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - + id="layer1" + inkscape:label="Flame"> diff --git a/src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg b/src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg new file mode 100644 index 0000000..0d7d54d --- /dev/null +++ b/src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/ProfHeat.AUI/Assets/Images/GasMotor.svg b/src/ProfHeat.AUI/Assets/Images/GasMotor.svg index e453b8d..b1b48f5 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasMotor.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasMotor.svg @@ -12,19 +12,16 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - + cx="128.59865" + cy="128.875" + rx="101.17259" + ry="103.625" /> diff --git a/src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg b/src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg deleted file mode 100644 index 7e08601..0000000 --- a/src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg +++ /dev/null @@ -1,979 +0,0 @@ - - - - diff --git a/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg b/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg index 3391cd7..891280b 100644 --- a/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg @@ -9,6 +9,7 @@ id="svg1" xml:space="preserve" sodipodi:docname="OilBoiler.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -21,43 +22,77 @@ inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" - inkscape:document-units="mm" /> + sodipodi:nodetypes="cccc" + inkscape:label="Shading drop" /> diff --git a/src/ProfHeat.AUI/Views/DataVisualizerView.axaml b/src/ProfHeat.AUI/Views/DataVisualizerView.axaml index c5eb39c..9a56ea7 100644 --- a/src/ProfHeat.AUI/Views/DataVisualizerView.axaml +++ b/src/ProfHeat.AUI/Views/DataVisualizerView.axaml @@ -10,7 +10,8 @@ x:DataType="vm:DataVisualizerViewModel" xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"> - + - + Margin="20"> + Margin="20"/>