diff -r 97ef988c92c2 -r 25b49d4f1635 src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs --- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Wed Oct 28 13:46:38 2009 +0100 +++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Wed Oct 28 17:07:27 2009 +0100 @@ -8,6 +8,7 @@ using System.Windows.Media.Animation; using System.Windows.Navigation; using FingersDance.Data; +using FingersDance.ViewModels; namespace FingersDance.Control.UserPanel { @@ -18,17 +19,27 @@ public event EventHandler OnSuccessAnnotation; //Event to display ColorAnnotation from different Users public int id = 0; public uint idcolor = 0; //The color of the Pivot Button - Project _Project = new Project(); + //Project _Project = new Project(); + private CuttingViewModel cutVM; + #endregion #region Properties - public Project Project + public CuttingViewModel CuttingVM { - get { return _Project; } - set { _Project = value; } + get { return cutVM; } + set { cutVM = value; } } #endregion + //#region Properties + //public Project Project + //{ + // get { return _Project; } + // set { _Project = value; } + //} + //#endregion + #region Constructors public UserControlUserPanel() { @@ -37,12 +48,12 @@ // Insert code required on object creation below this point. } - public UserControlUserPanel(int idPar, Color col, Project p, string path) + public UserControlUserPanel(int idPar, Color col, Cutting cut, string path) { this.InitializeComponent(); id = idPar; - _Project = p; - this.UserControlSyncSource.Load(path, col, _Project.Cutting); + //_Project = p; + this.UserControlSyncSource.Load(path, col, cut); UserControlSyncSource.OnSuccessAnnotation+=new EventHandler(UserControlSyncSource_OnSuccessAnnotation); } #endregion