From e77b8ed307dedd09fae3b8f396e7855c197262a1 Mon Sep 17 00:00:00 2001 From: vidufour1 Date: Fri, 28 Apr 2023 17:18:56 +0200 Subject: [PATCH] code de base c# + ajout .cs dans ViewsApp/Model pour les utiliser dans l'appli --- Models_Classe/Metronome.cs | 25 ++++++++++++++- Models_Classe/Partition.cs | 23 ++++++++++++-- Models_Classe/ReglageTempo.cs | 13 ++++++++ Models_Classe/Trier.cs | 30 +++++++++++------- Models_Classe/Utilisateur.cs | 32 +++++++++++++++++-- ViewsApp/ViewsApp/App.xaml.cs | 6 +++- ViewsApp/ViewsApp/MainPage.xaml | 4 +++ ViewsApp/ViewsApp/MainPage.xaml.cs | 13 ++++++-- ViewsApp/ViewsApp/Model/Manager.cs | 25 +++++++++++++++ ViewsApp/ViewsApp/Model/Metronome.cs | 32 +++++++++++++++++++ ViewsApp/ViewsApp/Model/Partition.cs | 31 ++++++++++++++++++ ViewsApp/ViewsApp/Model/ReglageTempo.cs | 25 +++++++++++++++ ViewsApp/ViewsApp/Model/Trier.cs | 37 ++++++++++++++++++++++ ViewsApp/ViewsApp/Model/Utilisateur.cs | 42 +++++++++++++++++++++++++ 14 files changed, 319 insertions(+), 19 deletions(-) create mode 100644 ViewsApp/ViewsApp/Model/Manager.cs create mode 100644 ViewsApp/ViewsApp/Model/Metronome.cs create mode 100644 ViewsApp/ViewsApp/Model/Partition.cs create mode 100644 ViewsApp/ViewsApp/Model/ReglageTempo.cs create mode 100644 ViewsApp/ViewsApp/Model/Trier.cs create mode 100644 ViewsApp/ViewsApp/Model/Utilisateur.cs diff --git a/Models_Classe/Metronome.cs b/Models_Classe/Metronome.cs index 36a4330..24346b5 100644 --- a/Models_Classe/Metronome.cs +++ b/Models_Classe/Metronome.cs @@ -8,6 +8,29 @@ namespace App.Models { class Metronome { - public int valeur { get; set; } + + + public void lancer() + { + //lancer la partition + var son = AudioManager.Current.CreatePlayer(await FileSystem.OpenAppPackageFileAsync("")); + son.Play(); + } + + public void arreter() + { + //mettre en pause la partition + } + + public void reinitialiser() + { + //remettre la partition à 0 + } + + public void regler() + { + //régler la partition (volume, tempo ...) + } + } } diff --git a/Models_Classe/Partition.cs b/Models_Classe/Partition.cs index bc42766..1df4904 100644 --- a/Models_Classe/Partition.cs +++ b/Models_Classe/Partition.cs @@ -4,9 +4,28 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace App.Models +namespace MauiApp1.Model { - class Partition + public class Partition { + public string Nom { get; private set; } + public int IdPartition { get; private set; } + public string Auteur { get; private set; } + public int Complexite { get; private set; } + public string Description { get; private set; } + public string Instrument { get; private set; } + public string Son { get; private set; } + + public Partition(string nom, int idPartition, string auteur, int complexite, string description, string instrument, string son) + { + Nom = nom; + IdPartition = idPartition; + Auteur = auteur; + Complexite = complexite; + Description = description; + Instrument = instrument; + Son = son; + } + } } diff --git a/Models_Classe/ReglageTempo.cs b/Models_Classe/ReglageTempo.cs index 7a4312f..91ec943 100644 --- a/Models_Classe/ReglageTempo.cs +++ b/Models_Classe/ReglageTempo.cs @@ -8,5 +8,18 @@ namespace App.Models { class ReglageTempo { + public int Valeur { get; private set; } + + + public void augmenter(int valeur) + { + Valeur = valeur; + } + + public void reduire(int valeur) + { + Valeur = valeur; + } + } } diff --git a/Models_Classe/Trier.cs b/Models_Classe/Trier.cs index 0c6fbf4..32fd50e 100644 --- a/Models_Classe/Trier.cs +++ b/Models_Classe/Trier.cs @@ -8,21 +8,29 @@ namespace App.Models { class Trier { - public List parnom(List liste) - { - - } - - - - - - - + public List partitions = new List(); + public List parNom(List liste) + { + Comparer comparer = Comparer.Create((p1, p2) => p1.Nom.CompareTo(p2.Nom)); + liste.Sort(comparer); + return liste; + } + public List parComplexite(List liste) + { + Comparer comparer = Comparer.Create((p1, p2) => p1.Complexite.CompareTo(p2.Complexite)); + liste.Sort(comparer); + return liste; + } + public List parInstrument(List liste) + { + Comparer comparer = Comparer.Create((p1, p2) => p1.Instrument.CompareTo(p2.Instrument)); + liste.Sort(comparer); + return liste; + } } } diff --git a/Models_Classe/Utilisateur.cs b/Models_Classe/Utilisateur.cs index 92a4113..6678385 100644 --- a/Models_Classe/Utilisateur.cs +++ b/Models_Classe/Utilisateur.cs @@ -4,9 +4,37 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace App.Models +namespace MauiApp1.Model { - class Utilisateur + + public class Utilisateur { + public int IdUtilisateur { get; private set; } + public List Favoris { get; private set; } + + + public Utilisateur(int id) + { + IdUtilisateur = id; + Favoris = new List; + } + + + public void ajouter(Partition partition) + { + favoris.Add(partition); + } + + public void retirer(Partition partition) + { + favoris.Remove(partition); + } + + public void retirerTout() + { + Favoris.Clear(); + } + } + } diff --git a/ViewsApp/ViewsApp/App.xaml.cs b/ViewsApp/ViewsApp/App.xaml.cs index 1654862..ae00ff5 100644 --- a/ViewsApp/ViewsApp/App.xaml.cs +++ b/ViewsApp/ViewsApp/App.xaml.cs @@ -1,7 +1,11 @@ -namespace ViewsApp; +using ViewsApp.Model; + +namespace ViewsApp; public partial class App : Application { + + public Manager MyManager { get; private set; } = new Manager(); public App() { InitializeComponent(); diff --git a/ViewsApp/ViewsApp/MainPage.xaml b/ViewsApp/ViewsApp/MainPage.xaml index cd71f6e..d28fbb8 100644 --- a/ViewsApp/ViewsApp/MainPage.xaml +++ b/ViewsApp/ViewsApp/MainPage.xaml @@ -61,6 +61,10 @@ HeightRequest="75" BackgroundColor="Blue"/> + + + + diff --git a/ViewsApp/ViewsApp/MainPage.xaml.cs b/ViewsApp/ViewsApp/MainPage.xaml.cs index 36431c9..c55d699 100644 --- a/ViewsApp/ViewsApp/MainPage.xaml.cs +++ b/ViewsApp/ViewsApp/MainPage.xaml.cs @@ -1,12 +1,21 @@ -namespace ViewsApp; +using MauiApp1.Model; +using ViewsApp.Model; + +namespace ViewsApp; public partial class MainPage : ContentPage { - + public Manager UtilManager => (App.Current as App).MyManager; public MainPage() { InitializeComponent(); } + private void Button_Clicked(object sender, EventArgs e) + { + Utilisateur u = new Utilisateur(1, UtilEditor.Text); + UtilManager.ajouterUtilisateur(u); + + } } diff --git a/ViewsApp/ViewsApp/Model/Manager.cs b/ViewsApp/ViewsApp/Model/Manager.cs new file mode 100644 index 0000000..252bdb6 --- /dev/null +++ b/ViewsApp/ViewsApp/Model/Manager.cs @@ -0,0 +1,25 @@ +using MauiApp1.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ViewsApp.Model +{ + public class Manager + { + public List utilisateurs { get; private set; } + public List partitions { get; private set; } + + public Manager() { + utilisateurs = new List(); + partitions = new List(); + } + + public void ajouterUtilisateur(Utilisateur utilisateur) + { + utilisateurs.Add(utilisateur); + } + } +} diff --git a/ViewsApp/ViewsApp/Model/Metronome.cs b/ViewsApp/ViewsApp/Model/Metronome.cs new file mode 100644 index 0000000..314b2e1 --- /dev/null +++ b/ViewsApp/ViewsApp/Model/Metronome.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace App.Models +{ + class Metronome + { + public void lancer() + { + //lancer la partition + } + + public void arreter() + { + //mettre en pause la partition + } + + public void reinitialiser() + { + //remettre la partition à 0 + } + + public void regler() + { + //régler la partition (volume, tempo ...) + } + + } +} diff --git a/ViewsApp/ViewsApp/Model/Partition.cs b/ViewsApp/ViewsApp/Model/Partition.cs new file mode 100644 index 0000000..e876aa5 --- /dev/null +++ b/ViewsApp/ViewsApp/Model/Partition.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MauiApp1.Model +{ + public class Partition + { + public string Nom { get; private set; } + public int IdPartition { get; private set; } + public string Auteur { get; private set; } + public int Complexite { get; private set; } + public string Description { get; private set; } + public string Instrument { get; private set; } + public string Son { get; private set; } + + public Partition(string nom, int idPartition, string auteur, int complexite, string description, string instrument, string son) + { + Nom = nom; + IdPartition = idPartition; + Auteur = auteur; + Complexite = complexite; + Description = description; + Instrument = instrument; + Son = son; + } + + } +} diff --git a/ViewsApp/ViewsApp/Model/ReglageTempo.cs b/ViewsApp/ViewsApp/Model/ReglageTempo.cs new file mode 100644 index 0000000..549934e --- /dev/null +++ b/ViewsApp/ViewsApp/Model/ReglageTempo.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace App.Models +{ + class ReglageTempo + { + public int Valeur { get; private set; } + + + public void augmenter(int valeur) + { + Valeur = valeur; + } + + public void reduire(int valeur) + { + Valeur = valeur; + } + + } +} diff --git a/ViewsApp/ViewsApp/Model/Trier.cs b/ViewsApp/ViewsApp/Model/Trier.cs new file mode 100644 index 0000000..9238075 --- /dev/null +++ b/ViewsApp/ViewsApp/Model/Trier.cs @@ -0,0 +1,37 @@ +using MauiApp1.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace App.Models +{ + class Trier + { + + public List partitions = new List(); + + public List parNom(List liste) + { + Comparer comparer = Comparer.Create((p1, p2) => p1.Nom.CompareTo(p2.Nom)); + liste.Sort(comparer); + return liste; + } + + public List parComplexite(List liste) + { + Comparer comparer = Comparer.Create((p1, p2) => p1.Complexite.CompareTo(p2.Complexite)); + liste.Sort(comparer); + return liste; + } + + public List parInstrument(List liste) + { + Comparer comparer = Comparer.Create((p1, p2) => p1.Instrument.CompareTo(p2.Instrument)); + liste.Sort(comparer); + return liste; + } + + } +} diff --git a/ViewsApp/ViewsApp/Model/Utilisateur.cs b/ViewsApp/ViewsApp/Model/Utilisateur.cs new file mode 100644 index 0000000..722c892 --- /dev/null +++ b/ViewsApp/ViewsApp/Model/Utilisateur.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MauiApp1.Model +{ + + public class Utilisateur + { + public int IdUtilisateur { get; private set; } + public string Nom { get; private set; } + public List Favoris { get; private set; } + + + public Utilisateur(int id, string n) + { + IdUtilisateur = id; + Nom = n; + Favoris = new List(); + } + + + public void ajouter(Partition partition) + { + Favoris.Add(partition); + } + + public void retirer(Partition partition) + { + Favoris.Remove(partition); + } + + public void retirerTout() + { + Favoris.Clear(); + } + + } + +}