diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index ab5540fc..fa8f4720 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -98,6 +98,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs new file mode 100644 index 00000000..5f5374a2 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; + +namespace CampusAppWP8.Model.Campusmap +{ + public class MapPinModel + { + public MapPinModel() + { + } + + public string ImageSource { get; set; } + public double ImageWidth { get; set; } + public double ImageHeight { get; set; } + + public double MapOffsetX { get; set; } + public double MapOffsetY { get; set; } + + public Point Position { get; set; } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml index def4011f..698435f8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml @@ -57,7 +57,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index 40f7e811..570aeca0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -9,6 +9,7 @@ using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; using System.Windows.Media; using CampusAppWP8.Model.Campusmap; +using System.Windows.Media.Imaging; namespace CampusAppWP8.Pages.Campusmap { @@ -19,7 +20,13 @@ namespace CampusAppWP8.Pages.Campusmap { InitializeComponent(); this.map = new MapModel() { ImageSource = "/Assets/testmap.png", ImageWidth = 2000, ImageHeight = 2000, MapOffsetX = -228, MapOffsetY = -300, RefPoint = new Point(1000, 1000) }; + MapPinModel pin = new MapPinModel() { ImageSource = "/Assets/icons/search_159_light.png", ImageWidth = 60, ImageHeight = 60, MapOffsetX = -24, MapOffsetY = -24, Position = new Point(1000, 1000) }; + Image pinImg =new Image() { Source = new BitmapImage((new Uri(pin.ImageSource,UriKind.Relative))), Width = pin.ImageWidth}; + // this.MapCanvas.SetLeft(pinImg,500); this.MapCanvas.DataContext = map; + MapCanvas.Children.Add(pinImg); + Image img = new Image(); + } private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)