diff -r beb938b4fb76 -r bd33267300aa client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs --- a/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs Wed Jan 27 10:55:59 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs Thu Feb 04 16:38:04 2010 +0100 @@ -95,8 +95,8 @@ /// /// Loader pour chargement à la volée des VideoLivres selectionnés /// - private Loader _loaderVideoBook { get; set; } - + //private Loader _loaderVideoBook { get; set; } + private VideoBookLoader _loaderVideoBook { get; set; } private AnnotationMakerVM _annotationMakerVM; /// /// ViewModel de AnnotationMaker @@ -116,9 +116,20 @@ private void InitializeCommands() { + Commands.ClickMenu.CreateNewTextualAnnotation.Executed += new EventHandler(CreateNewTextualAnnotation_Executed); Commands.ConsultMenu.ClickBook.Executed += new EventHandler(ClickBook_Executed); Commands.PolemicElement.SelectPolemicElement.Executed += new EventHandler(SelectPolemicElement_Executed); - Commands.ClickMenu.CreateNewTextualAnnotation.Executed += new EventHandler(CreateNewTextualAnnotation_Executed); + Commands.AnnotationMaker.NewAnnotationFinished.Executed += new EventHandler(NewAnnotationFinished_Executed); + } + + void NewAnnotationFinished_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e) + { + Annotation createdAnnotation = ((Annotation)e.Parameter); + PolemicElement refElement = ((PolemicElement)e.Source); + refElement.Chapter.Annotations.Add(createdAnnotation); + //refElement.Chapter.Book.Save(); + + } /// @@ -141,20 +152,31 @@ if (CanAdd) { //Préparation du loader - _loaderVideoBook = new Loader(LDTFileReader.ConvertToVideoBook); + /* _loaderVideoBook = new Loader(LDTFileReader.ConvertToVideoBook); _loaderVideoBook.LoaderFinished += new EventHandler(LoaderVideoBook_LoaderFinished); + _loaderVideoBook.Load(((VideoBook)e.Parameter).LdtPath);*/ + _loaderVideoBook = new VideoBookLoader(); + _loaderVideoBook.LoaderFinished += new EventHandler>(_loaderVideoBook_LoaderFinished); _loaderVideoBook.Load(((VideoBook)e.Parameter).LdtPath); } } + void _loaderVideoBook_LoaderFinished(object sender, LoaderEventArgs e) + { + VideoBook addedVideoBook = ((LoaderEventArgs)e).CreatedObject; + BookTimeLineVM temp = new BookTimeLineVM(addedVideoBook); + temp.ViewModelVideoViewer = ConsultationBookViewContextMenu.ActualVideoSourceVM; + SelectedVideoBooks.Add(temp); ; + } + /// /// Fonction une fois que le fichier .ldt à été chargé /// /// /// - private void LoaderVideoBook_LoaderFinished(object sender, EventArgs e) + /* private void LoaderVideoBook_LoaderFinished(object sender, EventArgs e) { VideoBook addedVideoBook = ((LoaderEventArgs)e).CreatedObject; ///------- /// @@ -164,12 +186,13 @@ temp.ViewModelVideoViewer = ConsultationBookViewContextMenu.ActualVideoSourceVM; SelectedVideoBooks.Add(temp); - } + }*/ private void CreateNewTextualAnnotation_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e) { ViewModelAnnotationMaker.RefElement=SelectedElement; + } public ConsultationViewVM() {