From 6949a7ba336d588198de2bf79d340e5c153a29a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommy=20=C3=96man?= Date: Fri, 31 Jul 2020 17:11:04 +0200 Subject: [PATCH] LocalPicture -model added --- ImageHandlingLibrary/Filing.cs | 12 ++++ .../ImageHandlingLibrary.csproj | 5 +- ImageHandlingLibrary/InterFaces/IFiling.cs | 1 + ImageHandlingLibrary/Models/LocalPicture.cs | 65 +++++++++++++++++++ ImageHandlingUI/ViewModels/ShellViewModel.cs | 12 +++- 5 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 ImageHandlingLibrary/Models/LocalPicture.cs diff --git a/ImageHandlingLibrary/Filing.cs b/ImageHandlingLibrary/Filing.cs index dce2329..17819fd 100644 --- a/ImageHandlingLibrary/Filing.cs +++ b/ImageHandlingLibrary/Filing.cs @@ -12,6 +12,12 @@ namespace ImageHandlingLibrary { public class Filing : IFiling { + private readonly IRegistring _registring; + + public Filing(IRegistring registring) + { + _registring = registring; + } public BitmapImage ConvertFromDrawImage(System.Drawing.Image _image) { using (var ms = new MemoryStream()) @@ -29,5 +35,11 @@ namespace ImageHandlingLibrary return bitmapImage; } } + + public string ShowText() + { + var output = _registring.GetRegistryRootDir(); + return $"Root directory value is {output} OBS Test!!"; + } } } diff --git a/ImageHandlingLibrary/ImageHandlingLibrary.csproj b/ImageHandlingLibrary/ImageHandlingLibrary.csproj index 8294199..9dbf86e 100644 --- a/ImageHandlingLibrary/ImageHandlingLibrary.csproj +++ b/ImageHandlingLibrary/ImageHandlingLibrary.csproj @@ -47,11 +47,10 @@ + - - - + \ No newline at end of file diff --git a/ImageHandlingLibrary/InterFaces/IFiling.cs b/ImageHandlingLibrary/InterFaces/IFiling.cs index e5b318f..efdcb52 100644 --- a/ImageHandlingLibrary/InterFaces/IFiling.cs +++ b/ImageHandlingLibrary/InterFaces/IFiling.cs @@ -11,5 +11,6 @@ namespace ImageHandlingLibrary.InterFaces public interface IFiling { BitmapImage ConvertFromDrawImage(Image _image); + string ShowText(); } } diff --git a/ImageHandlingLibrary/Models/LocalPicture.cs b/ImageHandlingLibrary/Models/LocalPicture.cs new file mode 100644 index 0000000..1452550 --- /dev/null +++ b/ImageHandlingLibrary/Models/LocalPicture.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ImageHandlingLibrary.Models +{ + public class LocalPicture + { + public string PictureFileName { get; set; } + public string InitialPath { get; set; } + public string PictureFullPath + { + get + { + return Path.Combine(InitialPath, PictureFileName); + } + } + public Image AktImage { get; set; } + public int AktImWidth { get; set; } + public int AktImHeight { get; set; } + public string CreatedDate { get; set; } + public bool CreatedDateChanged { get; set; } = false; + public string AarManDir + { + get + { + if (string.IsNullOrEmpty(CreatedDate)) return RootPosition; + else + { + DateTime dttd = DateTime.Parse(CreatedDate.Substring(0, 10).Replace(":", "-")); + string subDir = dttd.Year.ToString("0000") + "-" + dttd.Month.ToString("00") + @"\"; + return Path.Combine(RootPosition + subDir); + } + } + } + public string AarManDayDir + { + get + { + if (string.IsNullOrEmpty(CreatedDate)) return RootPosition; + else + { + DateTime dttd = DateTime.Parse(CreatedDate.Substring(0, 10).Replace(":", "-")); + string subDir = dttd.Year.ToString("0000") + "_" + dttd.Month.ToString("00") + "_" + dttd.Day.ToString("00") + @"\"; + return Path.Combine(AarManDir + subDir); + } + } + } + + public string ImageNewFullpath + { + get + { + return Path.Combine(AarManDayDir + PictureFileName); + } + } + public string RootPosition { get; set; } + + + } +} diff --git a/ImageHandlingUI/ViewModels/ShellViewModel.cs b/ImageHandlingUI/ViewModels/ShellViewModel.cs index 620d305..62016b5 100644 --- a/ImageHandlingUI/ViewModels/ShellViewModel.cs +++ b/ImageHandlingUI/ViewModels/ShellViewModel.cs @@ -60,6 +60,16 @@ namespace ImageHandlingUI.ViewModels _rootCatalog = value; } } - + private string _groundPath; + + public string GroundPath + { + get { + _groundPath = _filing.ShowText(); + return _groundPath; + } + set { _groundPath = value; } + } + } }