diff --git a/PrintLibrary/LibraryDataView.cs b/PrintLibrary/LibraryDataView.cs index 3e3aedd1b..84d51b980 100644 --- a/PrintLibrary/LibraryDataView.cs +++ b/PrintLibrary/LibraryDataView.cs @@ -84,8 +84,6 @@ namespace MatterHackers.MatterControl.PrintLibrary this.MouseLeaveBounds += new EventHandler(control_MouseLeaveBounds); LibraryProvider.DataReloaded.RegisterEvent(LibraryDataReloaded, ref unregisterEvents); - LibraryProvider.ItemAdded.RegisterEvent(ItemAddedToLibrary, ref unregisterEvents); - LibraryProvider.ItemRemoved.RegisterEvent(ItemRemovedFromToLibrary, ref unregisterEvents); } public delegate void HoverValueChangedEventHandler(object sender, EventArgs e); @@ -436,21 +434,6 @@ namespace MatterHackers.MatterControl.PrintLibrary HoverIndex = -1; } - private void ItemAddedToLibrary(object sender, EventArgs e) - { - IndexArgs addedIndexArgs = e as IndexArgs; - PrintItemWrapper item = LibraryDataView.CurrentLibraryProvider.GetPrintItemWrapper(addedIndexArgs.Index); - GuiWidget thumbnailWidget = LibraryDataView.CurrentLibraryProvider.GetItemThumbnail(addedIndexArgs.Index); - LibraryRowItem libraryItem = new LibraryRowItemPart(item, this, thumbnailWidget); - - int displayIndexToAdd = addedIndexArgs.Index + LibraryDataView.CurrentLibraryProvider.CollectionCount; - if (LibraryDataView.CurrentLibraryProvider.HasParent) - { - displayIndexToAdd++; - } - AddListItemToTopToBottom(libraryItem, displayIndexToAdd); - } - private void itemHolder_MouseDownInBounds(object sender, MouseEventArgs mouseEvent) { } @@ -464,22 +447,6 @@ namespace MatterHackers.MatterControl.PrintLibrary itemHolder.ParentChanged -= new EventHandler(itemHolder_ParentChanged); } - private void ItemRemovedFromToLibrary(object sender, EventArgs e) - { - IndexArgs removeIndexArgs = e as IndexArgs; - int indexToRemove = removeIndexArgs.Index + LibraryDataView.CurrentLibraryProvider.CollectionCount; - if (LibraryDataView.CurrentLibraryProvider.HasParent) - { - indexToRemove++; - } - topToBottomItemList.RemoveChild(indexToRemove); - - if (LibraryDataView.CurrentLibraryProvider.ItemCount > 0) - { - SelectedIndex = Math.Max(SelectedIndex - 1, 0); - } - } - private void itemToAdd_MouseEnterBounds(object sender, EventArgs e) { GuiWidget widgetEntered = ((GuiWidget)sender); diff --git a/PrintLibrary/Provider/LibraryProvider.cs b/PrintLibrary/Provider/LibraryProvider.cs index 696a773eb..518e3a8d4 100644 --- a/PrintLibrary/Provider/LibraryProvider.cs +++ b/PrintLibrary/Provider/LibraryProvider.cs @@ -41,8 +41,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider public abstract class LibraryProvider { public static RootedObjectEventHandler DataReloaded = new RootedObjectEventHandler(); - public static RootedObjectEventHandler ItemAdded = new RootedObjectEventHandler(); - public static RootedObjectEventHandler ItemRemoved = new RootedObjectEventHandler(); private LibraryProvider parentLibraryProvider = null; public LibraryProvider(LibraryProvider parentLibraryProvider) @@ -124,16 +122,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider DataReloaded.CallEvents(null, eventArgs); } - public static void OnItemAdded(EventArgs eventArgs) - { - ItemAdded.CallEvents(null, eventArgs); - } - - public static void OnItemRemoved(EventArgs eventArgs) - { - ItemRemoved.CallEvents(null, eventArgs); - } - #endregion Static Methods public virtual GuiWidget GetItemThumbnail(int printItemIndex) diff --git a/PrintLibrary/Provider/LibraryProviderFileSystem.cs b/PrintLibrary/Provider/LibraryProviderFileSystem.cs index 36437cd5d..0e4e704db 100644 --- a/PrintLibrary/Provider/LibraryProviderFileSystem.cs +++ b/PrintLibrary/Provider/LibraryProviderFileSystem.cs @@ -107,7 +107,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider { keywordFilter = value; GetFilesAndCollectionsInCurrentDirectory(); - LibraryProvider.OnDataReloaded(null); } } } @@ -134,7 +133,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider { Directory.CreateDirectory(directoryPath); GetFilesAndCollectionsInCurrentDirectory(); - LibraryProvider.OnDataReloaded(null); } } @@ -145,8 +143,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider CopyAllFiles(files, destPath); GetFilesAndCollectionsInCurrentDirectory(); - LibraryProvider.OnDataReloaded(null); - LibraryProvider.OnItemAdded(null); } public override void AddItem(PrintItemWrapper itemToAdd) @@ -187,7 +183,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider Thread.Sleep(1); // make sure we are not eating all the cpu time. } GetFilesAndCollectionsInCurrentDirectory(); - LibraryProvider.OnDataReloaded(null); } } @@ -195,8 +190,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider { File.Delete(printItemWrapper.PrintItem.FileLocation); GetFilesAndCollectionsInCurrentDirectory(); - LibraryProvider.OnDataReloaded(null); - LibraryProvider.OnItemRemoved(null); } public override void SaveToLibrary(PrintItemWrapper printItemWrapper, List meshGroupsToSave, List providerSavePath) @@ -263,7 +256,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider UiThread.RunOnIdle(() => { GetFilesAndCollectionsInCurrentDirectory(); - LibraryProvider.OnDataReloaded(null); }); } @@ -294,6 +286,8 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider } } } + + LibraryProvider.OnDataReloaded(null); } private string GetPathFromLocator(List providerLocator) diff --git a/PrintLibrary/Provider/LibraryProviderSqlite.cs b/PrintLibrary/Provider/LibraryProviderSqlite.cs index 7f827364a..33d11b63f 100644 --- a/PrintLibrary/Provider/LibraryProviderSqlite.cs +++ b/PrintLibrary/Provider/LibraryProviderSqlite.cs @@ -254,12 +254,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider loadFilesIntoLibraryBackgroundWorker.RunWorkerAsync(files); } - - if (baseLibraryCollection != null) - { - LoadLibraryItems(); - LibraryProvider.OnDataReloaded(null); - } } public override void AddItem(PrintItemWrapper itemToAdd) @@ -287,7 +281,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider List currentDisplayedCollection = GetProviderLocator(); if (currentDisplayedCollection.Count > 0 && currentDisplayedCollection[0].Key == LibraryProviderSQLite.StaticProviderKey) { - OnItemAdded(new IndexArgs(indexToInsert)); + //OnItemAdded(new IndexArgs(indexToInsert)); } item.PrintItem.PrintItemCollectionID = baseLibraryCollection.Id; item.PrintItem.Commit(); @@ -360,7 +354,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider printItemWrapper.Delete(); LoadLibraryItems(); - OnItemRemoved(new IndexArgs(index)); + LibraryProvider.OnDataReloaded(null); } public override void SaveToLibrary(PrintItemWrapper printItemWrapper, List meshGroupsToSave, List providerSavePath) @@ -480,6 +474,11 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider private void loadFilesIntoLibraryBackgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { + if (baseLibraryCollection != null) + { + LoadLibraryItems(); + LibraryProvider.OnDataReloaded(null); + } } } } \ No newline at end of file diff --git a/PrintLibrary/Provider/LibrarySQLiteData.cs b/PrintLibrary/Provider/LibrarySQLiteData.cs index 1a7a8509f..ca456f038 100644 --- a/PrintLibrary/Provider/LibrarySQLiteData.cs +++ b/PrintLibrary/Provider/LibrarySQLiteData.cs @@ -125,7 +125,7 @@ namespace MatterHackers.MatterControl.PrintLibrary List currentDisplayedCollection = LibraryProviderSQLite.Instance.GetProviderLocator(); if (currentDisplayedCollection.Count > 0 && currentDisplayedCollection[1].Key == LibraryProviderSQLite.StaticProviderKey) { - OnItemAdded(new IndexArgs(indexToInsert)); + //OnItemAdded(new IndexArgs(indexToInsert)); } item.PrintItem.PrintItemCollectionID = RootLibraryCollection.Id; item.PrintItem.Commit(); @@ -149,8 +149,6 @@ namespace MatterHackers.MatterControl.PrintLibrary // and remove it from the data base printItemWrapper.Delete(); - - OnItemRemoved(new IndexArgs(index)); } public PrintItemWrapper GetPrintItemWrapper(int index) @@ -259,16 +257,6 @@ namespace MatterHackers.MatterControl.PrintLibrary LibraryProvider.OnDataReloaded(e); } - public void OnItemAdded(EventArgs e) - { - LibraryProvider.OnItemAdded(e); - } - - public void OnItemRemoved(EventArgs e) - { - LibraryProvider.OnItemRemoved(e); - } - public void SaveLibraryItems() { // diff --git a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs index f0feb9385..70a7c6a85 100644 --- a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs @@ -43,8 +43,6 @@ namespace MatterControl.Tests public class LibraryProviderTests { private bool dataReloaded = false; - private bool itemAdded = false; - private bool itemRemoved = false; private string meshFileName = "Box20x20x10.stl"; private string meshPathAndFileName; private string pathToMesh = Path.Combine("..", "..", "..", "TestData", "TestMeshes", "LibraryProviderData"); @@ -87,11 +85,11 @@ namespace MatterControl.Tests // add an item works correctly LibraryProvider subProvider = testProvider.GetProviderForItem(testProvider.GetCollectionItem(0)); dataReloaded = false; - itemAdded = false; + //itemAdded = false; string subPathAndFile = Path.Combine(createdDirectory, meshFileName); Assert.IsTrue(!File.Exists(subPathAndFile)); Assert.IsTrue(dataReloaded == false); - Assert.IsTrue(itemAdded == false); + //Assert.IsTrue(itemAdded == false); // WIP: saving the name incorectly for this location (does not need to be changed). subProvider.AddFilesToLibrary(new string[] { meshPathAndFileName }); @@ -99,7 +97,7 @@ namespace MatterControl.Tests Assert.IsTrue(subProvider.ItemCount == 1); Assert.IsTrue(dataReloaded == true); - Assert.IsTrue(itemAdded == true); + //Assert.IsTrue(itemAdded == true); Assert.IsTrue(File.Exists(subPathAndFile)); // make sure the provider locator is correct @@ -107,10 +105,8 @@ namespace MatterControl.Tests // remove item works dataReloaded = false; Assert.IsTrue(dataReloaded == false); - Assert.IsTrue(itemRemoved == false); subProvider.RemoveItem(subProvider.GetPrintItemWrapper(0)); Assert.IsTrue(dataReloaded == true); - Assert.IsTrue(itemRemoved == true); Assert.IsTrue(!File.Exists(subPathAndFile)); // remove collection gets rid of it @@ -147,17 +143,14 @@ namespace MatterControl.Tests // add an item works correctly dataReloaded = false; - itemAdded = false; Assert.IsTrue(!NamedItemExists(collectionName)); Assert.IsTrue(dataReloaded == false); - Assert.IsTrue(itemAdded == false); testProvider.AddFilesToLibrary(new string[] { meshPathAndFileName }); Thread.Sleep(3000); // wait for the add to finihs Assert.IsTrue(testProvider.ItemCount == 2); Assert.IsTrue(dataReloaded == true); - Assert.IsTrue(itemAdded == true); string fileNameWithExtension = Path.GetFileNameWithoutExtension(meshPathAndFileName); Assert.IsTrue(NamedItemExists(fileNameWithExtension)); @@ -166,10 +159,8 @@ namespace MatterControl.Tests // remove item works dataReloaded = false; Assert.IsTrue(dataReloaded == false); - Assert.IsTrue(itemRemoved == false); testProvider.RemoveItem(testProvider.GetPrintItemWrapper(1)); Assert.IsTrue(dataReloaded == true); - Assert.IsTrue(itemRemoved == true); Assert.IsTrue(!NamedItemExists(fileNameWithExtension)); // remove collection gets rid of it @@ -187,12 +178,8 @@ namespace MatterControl.Tests meshPathAndFileName = Path.Combine(pathToMesh, meshFileName); dataReloaded = false; - itemAdded = false; - itemRemoved = false; LibraryProvider.DataReloaded.RegisterEvent((sender, e) => { dataReloaded = true; }, ref unregisterEvents); - LibraryProvider.ItemAdded.RegisterEvent((sender, e) => { itemAdded = true; }, ref unregisterEvents); - LibraryProvider.ItemRemoved.RegisterEvent((sender, e) => { itemRemoved = true; }, ref unregisterEvents); } [TearDown]