equal
deleted
inserted
replaced
18 /// <summary> |
18 /// <summary> |
19 /// Interaction logic for UserControlNewProject.xaml |
19 /// Interaction logic for UserControlNewProject.xaml |
20 /// </summary> |
20 /// </summary> |
21 public partial class UserControlNewProject : UserControl |
21 public partial class UserControlNewProject : UserControl |
22 { |
22 { |
23 public event EventHandler EH_NewProject_ContactDown; |
23 public event EventHandler EH_NewCutting_ContactDown; |
24 public Project Project = new Project(); |
24 public Cutting Cutting = new Cutting(); |
25 User _User = new User(); |
25 User _User = new User(); |
26 |
26 |
27 public UserControlNewProject(User u) |
27 public UserControlNewProject(User u) |
28 { |
28 { |
29 InitializeComponent(); |
29 InitializeComponent(); |
35 |
35 |
36 #region Actions |
36 #region Actions |
37 |
37 |
38 private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) |
38 private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) |
39 { |
39 { |
40 Project = new Project(_User, new Cutting()); |
40 Cutting = new Cutting(_User.Name, new List<Annotation>()); |
41 if (EH_NewProject_ContactDown != null) |
41 if (EH_NewCutting_ContactDown != null) |
42 EH_NewProject_ContactDown(this, new EventArgs()); |
42 EH_NewCutting_ContactDown(this, new EventArgs()); |
43 } |
43 } |
44 |
44 |
45 private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e) |
45 private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e) |
46 { |
46 { |
47 Project = new Project(ST_ProjectName.Text, ST_Date.Text, ST_Desc.Text, _User, new Cutting()); |
47 //Project = new Project(ST_ProjectName.Text, ST_Date.Text, ST_Desc.Text, _User, new Cutting()); |
48 if (EH_NewProject_ContactDown != null) |
48 Cutting = new Cutting(_User.Name, new List<Annotation>()); |
49 EH_NewProject_ContactDown(this, new EventArgs()); |
49 if (EH_NewCutting_ContactDown != null) |
|
50 EH_NewCutting_ContactDown(this, new EventArgs()); |
50 } |
51 } |
51 |
52 |
52 #endregion |
53 #endregion |
53 } |
54 } |
54 } |
55 } |