From 504ec3a3e2074703cadc7600d85ce4909629b444 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 14:11:22 +0200 Subject: [PATCH 1/2] add searchplacepin, currentplacepin, hiddenpin --- .../Icons/DarkTheme/current_position_159.png | Bin 0 -> 8261 bytes .../Icons/DarkTheme/search_place_159.png | Bin 0 -> 8336 bytes .../Icons/LightTheme/current_position_159.png | Bin 0 -> 8261 bytes .../Icons/LightTheme/search_place_159.png | Bin 0 -> 8336 bytes CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 7 ++ .../Campusmap/CurrentPositionPinModel.cs | 29 +++++ .../Model/Campusmap/HiddenPinPlaceModel.cs | 15 +++ .../CampusAppWP8/Model/Campusmap/MapModel.cs | 102 ++++++++++++------ .../Model/Campusmap/MapPinModel.cs | 24 +++-- .../Model/Campusmap/SearchPlacePinModel.cs | 31 ++++++ .../Pages/Campusmap/CampusMapPage.xaml.cs | 27 +++-- CampusAppWP8/CampusAppWP8/Resources/Icons.cs | 22 ++++ .../CampusAppWP8/Resources/Icons.resx | 6 ++ .../Utility/Lui/Button/GoToMapButton.cs | 1 + 14 files changed, 214 insertions(+), 50 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/current_position_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_place_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/current_position_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_place_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/current_position_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/current_position_159.png new file mode 100644 index 0000000000000000000000000000000000000000..47ed68d2f6a9f58ab9b0bc56c1caf4bc036dff18 GIT binary patch literal 8261 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 o;u?JmdKI;Vst0H&ngkpKVy literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_place_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_place_159.png new file mode 100644 index 0000000000000000000000000000000000000000..2b8797caa0119e7275a0d9556fc7ada9cc9be9c4 GIT binary patch literal 8336 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/current_position_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/current_position_159.png new file mode 100644 index 0000000000000000000000000000000000000000..47ed68d2f6a9f58ab9b0bc56c1caf4bc036dff18 GIT binary patch literal 8261 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 o;u?JmdKI;Vst0H&ngkpKVy literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_place_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_place_159.png new file mode 100644 index 0000000000000000000000000000000000000000..2b8797caa0119e7275a0d9556fc7ada9cc9be9c4 GIT binary patch literal 8336 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index b86cead6..b2d262b0 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -105,6 +105,9 @@ + + + @@ -391,15 +394,18 @@ + + + @@ -422,6 +428,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs new file mode 100644 index 00000000..8bb3347d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs @@ -0,0 +1,29 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 27.08.2013 +//---------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Campusmap +{ + using System.Windows; + using CampusAppWP8.Resources; + + /// Current position pin model. + /// Stubbfel, 27.08.2013. + public class CurrentPositionPinModel : MapPinModel + { + /// Initializes a new instance of the CurrentPositionPinModel class. + /// Stubbfel, 27.08.2013. + public CurrentPositionPinModel() + { + this.ImageSource = Icons.CurrentPosition; + this.ImageWidth = 60; + this.ImageHeight = 60; + this.PinImageOffsetX = -25; + this.PinImageOffsetY = -34; + } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs new file mode 100644 index 00000000..e684b3d9 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs @@ -0,0 +1,15 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 13.08.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Model.Campusmap +{ + /// Hidden pin place model. + /// Stubbfel, 27.08.2013. + public class HiddenPinPlaceModel : MapPinModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs index 38e1ef38..49a5009d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs @@ -114,60 +114,73 @@ namespace CampusAppWP8.Model.Campusmap return new Point(x, y); } - /// - /// Method create in image, which can show at a certain position - /// - /// the x- coordinate - /// the y-coordinate - /// image of the pin - public Image AddPin(double x, double y) + /// Method create in image, which can show at a certain position. + /// Stubbfel, 27.08.2013. + /// the x- coordinate. + /// the y-coordinate. + /// The type. + /// image of the pin. + public Image AddPin(double x, double y, MapPinModel.PinType type) { Point position = new Point(x, y); - return this.AddPin(position); + return this.AddPin(position, type); } /// - /// Method create in image, which can show at a certain position depend of the + /// Method create in image, which can show at a certain position depend of the + /// /// - /// the x-coordinate - /// the y-coordinate - /// image of the pin - public Image AddPinFromRefPoint(double x, double y) + /// Stubbfel, 27.08.2013. + /// the x-coordinate. + /// the y-coordinate. + /// The type. + /// image of the pin. + public Image AddPinFromRefPoint(double x, double y, MapPinModel.PinType type) { Point position = new Point(this.RefPoint.X + x, this.RefPoint.Y - y); - return this.AddPin(position); + return this.AddPin(position, type); } /// - /// Method create in image, which can show at a certain position depend of the + /// Method create in image, which can show at a certain position depend of the + /// /// - /// input point - /// image of the pin - public Image AddPinFromRefPoint(Point position) + /// Stubbfel, 27.08.2013. + /// input point. + /// The type. + /// image of the pin. + public Image AddPinFromRefPoint(Point position, MapPinModel.PinType type) { - return this.AddPinFromRefPoint(position.X, position.Y); + return this.AddPinFromRefPoint(position.X, position.Y, type); } - /// - /// Method create in image, which can show at a certain position - /// - /// input point - /// image of the pin - public Image AddPin(Point position) + /// Method create in image, which can show at a certain position. + /// Stubbfel, 27.08.2013. + /// input point. + /// The type. + /// image of the pin. + public Image AddPin(Point position, MapPinModel.PinType type) { - MapPinModel pin = new MapPinModel() { Position = position }; - Image pinImg = new Image() { Source = new BitmapImage(new Uri(pin.ImageSource, UriKind.Relative)), Width = pin.ImageWidth }; + MapPinModel pin = this.CreatePin(type); + pin.Position = position; + Image pinImg = new Image(); + if (pin.ImageSource != null) + { + pinImg.Source = new BitmapImage(new Uri(pin.ImageSource, UriKind.Relative)); + pinImg.Width = pin.ImageWidth; + pinImg.Height = pin.ImageHeight; + } + Canvas.SetTop(pinImg, pin.Position.Y); Canvas.SetLeft(pinImg, pin.Position.X); return pinImg; } - /// - /// Convert a coordinates to coordinates which address pixels - /// - /// the x-coordinate - /// the y-coordinate - /// Point in pixel-size + /// Convert a coordinates to coordinates which address pixels. + /// Stubbfel, 27.08.2013. + /// the x-coordinate. + /// the y-coordinate. + /// Point in pixel-size. public Point ConverToPixelPoint(double x, double y) { Point p = new Point { X = this.ScaleX * x, Y = this.ScaleY * y }; @@ -210,6 +223,29 @@ namespace CampusAppWP8.Model.Campusmap protected virtual void LoadSpatials() { } + + /// Creates a pin. + /// Stubbfel, 27.08.2013. + /// The type. + /// The new pin. + private MapPinModel CreatePin(MapPinModel.PinType type) + { + MapPinModel pin; + switch (type) + { + case MapPinModel.PinType.CurrentPosition: + pin = new CurrentPositionPinModel(); + break; + case MapPinModel.PinType.SearchPlace: + pin = new SearchPlacePinModel(); + break; + default: + pin = new HiddenPinPlaceModel(); + break; + } + + return pin; + } #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs index a46cacaa..37b1bc7a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs @@ -8,12 +8,11 @@ namespace CampusAppWP8.Model.Campusmap { using System.Windows; - using CampusAppWP8.Resources; /// /// This Class manage the properties of a MapPin /// - public class MapPinModel + public abstract class MapPinModel { #region Member @@ -30,15 +29,26 @@ namespace CampusAppWP8.Model.Campusmap /// public MapPinModel() { - this.ImageSource = Icons.Search; - this.ImageWidth = 60; - this.ImageHeight = 60; - this.PinImageOffsetX = -25; - this.PinImageOffsetY = -27; } #endregion + #region enums + /// Values that represent PinType. + /// Stubbfel, 27.08.2013. + public enum PinType + { + /// An enum constant representing the hidden option. + Hidden = 0, + + /// An enum constant representing the search place option. + SearchPlace = 1, + + /// An enum constant representing the current position option. + CurrentPosition = 2 + } + #endregion + #region Property /// diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs new file mode 100644 index 00000000..4cba699a --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs @@ -0,0 +1,31 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 27.08.2013 +//---------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Campusmap +{ + using System.Windows; + using CampusAppWP8.Resources; + + /// Search pin place model. + /// Stubbfel, 27.08.2013. + public class SearchPlacePinModel : MapPinModel + { + /// + /// Initializes a new instance of the class. + /// + /// Stubbfel, 27.08.2013. + public SearchPlacePinModel() + { + this.ImageSource = Icons.SearchPlace; + this.ImageWidth = 60; + this.ImageHeight = 60; + this.PinImageOffsetX = -25; + this.PinImageOffsetY = -27; + } + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index deaa55c5..c7c77f94 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -46,15 +46,19 @@ namespace CampusAppWP8.Pages.Campusmap { MapCanvas.Children.Clear(); - string alias = "campus"; bool scroll = true; + string alias = "campus"; if (NavigationContext.QueryString.ContainsKey(Constants.ParamModelMap_SearchTermAlias)) { alias = NavigationContext.QueryString[Constants.ParamModelMap_SearchTermAlias]; + this.AddPins(this.SearchPlaces(alias), MapPinModel.PinType.SearchPlace); scroll = false; } + else + { + this.AddPins(this.SearchPlaces(alias), MapPinModel.PinType.Hidden); + } - this.AddPins(this.SearchPlaces(alias)); this.ShowCurrentPositionDispatcher(scroll); } } @@ -82,7 +86,7 @@ namespace CampusAppWP8.Pages.Campusmap } MapCanvas.Children.Clear(); - this.AddPins(this.SearchPlaces(query)); + this.AddPins(this.SearchPlaces(query), MapPinModel.PinType.SearchPlace); } /// Searches for the first places. @@ -97,15 +101,16 @@ namespace CampusAppWP8.Pages.Campusmap /// Adds the pins. /// Stubbfel, 19.08.2013. /// The places. + /// The type. /// (Optional) the scroll. - private void AddPins(List places, bool scroll = true) + private void AddPins(List places, MapPinModel.PinType type, bool scroll = true) { foreach (PlaceModel place in places) { GeoCoordinate coor = place.GeoRefPoint; if (coor != null) { - this.AddPin(coor.Longitude, coor.Latitude, scroll); + this.AddPin(coor.Longitude, coor.Latitude, type, scroll); } } } @@ -114,11 +119,12 @@ namespace CampusAppWP8.Pages.Campusmap /// Stubbfel, 19.08.2013. /// longitude parameter. /// latitude parameter. + /// The type. /// (Optional) the scroll. - private void AddPin(double x, double y, bool scroll = true) + private void AddPin(double x, double y, MapPinModel.PinType type, bool scroll = true) { Point scrollPoint = this.map.GetScrollPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y))); - MapCanvas.Children.Add(this.map.AddPinFromRefPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y)))); + MapCanvas.Children.Add(this.map.AddPinFromRefPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y)), type)); MapScroller.UpdateLayout(); if (scroll) @@ -174,15 +180,16 @@ namespace CampusAppWP8.Pages.Campusmap { string lat = App.LoadFromAppState(Constants.GeoWatch_CurrentPosition_Lat); string log = App.LoadFromAppState(Constants.GeoWatch_CurrentPosition_Long); - this.SetPinToPosition(lat, log, scroll); + this.SetPinToPosition(lat, log, MapPinModel.PinType.CurrentPosition, scroll); } /// Sets pin to position. /// Stubbfel, 27.08.2013. /// The latitude. /// The longitude. + /// The type. /// (Optional) the scroll. - private void SetPinToPosition(string latitude, string longitude, bool scroll = true) + private void SetPinToPosition(string latitude, string longitude, MapPinModel.PinType type, bool scroll = true) { double x; double y; @@ -191,7 +198,7 @@ namespace CampusAppWP8.Pages.Campusmap return; } - this.AddPin(x, y, scroll); + this.AddPin(x, y, type, scroll); ProgressBar.Visibility = Visibility.Collapsed; } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs index 7d6a9c8a..4d91d96d 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs @@ -66,6 +66,17 @@ namespace CampusAppWP8.Resources } } + /// + /// Gets the uri string of the CurrentPosition icon. + /// + public static string CurrentPosition + { + get + { + return Themerize("current_position_159.png"); + } + } + /// /// Gets the uri string of the Delete icon. /// @@ -264,6 +275,17 @@ namespace CampusAppWP8.Resources } } + /// + /// Gets the uri string of the SearchPlace icon. + /// + public static string SearchPlace + { + get + { + return Themerize("search_place_159.png"); + } + } + /// /// Gets the uri string of the StudentCouncil icon. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index f981d217..7cd96949 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -129,6 +129,9 @@ info_159.png + + current_position_159.png + delete_159.png @@ -183,6 +186,9 @@ search_159.png + + search_place_159.png + student_council_159.png diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs index 19521cc9..7247612e 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs @@ -78,6 +78,7 @@ namespace CampusAppWP8.Utility.Lui.Button { urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + this.SearchTerm; } + Uri url = new Uri(urlString as string, UriKind.Relative); Page page = App.RootFrame.Content as Page; page.NavigationService.Navigate(url); From 9c663b30cf0a355c28d4a5850f694ca34deab6c3 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 14:11:58 +0200 Subject: [PATCH 2/2] add enum to spelling list --- CampusAppWP8/CampusAppWP8/Settings.StyleCop | 1 + 1 file changed, 1 insertion(+) diff --git a/CampusAppWP8/CampusAppWP8/Settings.StyleCop b/CampusAppWP8/CampusAppWP8/Settings.StyleCop index 1b4199b4..ea0eb655 100644 --- a/CampusAppWP8/CampusAppWP8/Settings.StyleCop +++ b/CampusAppWP8/CampusAppWP8/Settings.StyleCop @@ -1,6 +1,7 @@ + enum Stubbfel