nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Took out the provider locator code as it is not needed.

Browse source
This commit is contained in:
Lars Brubaker 2015-07-17 16:45:24 -07:00
parent b80ab532d8
commit 6f0b443bb3
6 changed files with 3 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

15
DataStorage/Models.cs
View file

@ -274,11 +274,10 @@ namespace MatterHackers.MatterControl.DataStorage
{
}
public PrintItem(string name, string fileLocation, string libraryProviderLocatorJson = "")
public PrintItem(string name, string fileLocation)
{
this.Name = name;
this.FileLocation = fileLocation;
this.LibraryProviderLocatorJson = libraryProviderLocatorJson;
DateAdded = DateTime.Now;
PrintCount = 0;
@ -288,8 +287,6 @@ namespace MatterHackers.MatterControl.DataStorage
public string FileLocation { get; set; }
public string LibraryProviderLocatorJson { get; set; }
public string Name { get; set; }
public int PrintCount { get; set; }
@ -297,16 +294,6 @@ namespace MatterHackers.MatterControl.DataStorage
[Indexed]
public int PrintItemCollectionID { get; set; }
public List<ProviderLocatorNode> GetLibraryProviderLocator()
{
List<ProviderLocatorNode> providerPath = null;
if (LibraryProviderLocatorJson != null)
{
providerPath = JsonConvert.DeserializeObject<List<ProviderLocatorNode>>(LibraryProviderLocatorJson);
}
return providerPath;
}
public bool ReadOnly { get; set; }
public bool Protected { get; set; }

5
Library/Provider/LibraryProviderFileSystem.cs
View file

@ -181,10 +181,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
string fileName = currentDirectoryFiles[itemIndex];
List<ProviderLocatorNode> providerLocator = GetProviderLocator();
string providerLocatorJson = JsonConvert.SerializeObject(providerLocator);
return new PrintItemWrapper(new DataStorage.PrintItem(Path.GetFileNameWithoutExtension(fileName), fileName, providerLocatorJson));
return new PrintItemWrapper(new DataStorage.PrintItem(Path.GetFileNameWithoutExtension(fileName), fileName));
}
public override LibraryProvider GetProviderForItem(PrintItemCollection collection)

33
Library/Provider/LibraryProviderSelector.cs
View file

@ -239,10 +239,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
public override void RemoveItem(PrintItemWrapper printItemWrapper)
{
List<ProviderLocatorNode> subProviderSavePath;
int libraryProviderToUseIndex = GetProviderIndex(printItemWrapper, out subProviderSavePath);
visibleProviders[libraryProviderToUseIndex].RemoveItem(printItemWrapper);
throw new NotImplementedException();
}
public override void SaveToLibrary(PrintItemWrapper printItemWrapper, List<MeshGroup> meshGroupsToSave, List<ProviderLocatorNode> providerSavePath = null)
@ -250,34 +247,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
throw new NotImplementedException();
}
private int GetProviderIndex(PrintItemWrapper printItemWrapper, out List<ProviderLocatorNode> subProviderSavePath)
{
List<ProviderLocatorNode> providerPath = printItemWrapper.PrintItem.GetLibraryProviderLocator();
return GetProviderIndex(providerPath, out subProviderSavePath);
}
private int GetProviderIndex(List<ProviderLocatorNode> providerSavePath, out List<ProviderLocatorNode> subProviderSavePath)
{
subProviderSavePath = null;
if (providerSavePath != null
&& providerSavePath.Count > 1) // key 0 is this provider so we want to look at the next provider
{
for (int i = 0; i < visibleProviders.Count; i++)
{
if (visibleProviders[i].ProviderKey == providerSavePath[1].Key)
{
subProviderSavePath = new List<ProviderLocatorNode>(providerSavePath);
subProviderSavePath.RemoveAt(0);
return i;
}
}
}
return 0;
}
#endregion Overriden Abstract Methods
public static LibraryProvider GetProviderForItem(PrintItemWrapper printItemWrapper)

9
Library/Provider/LibraryProviderSqlite.cs
View file

@ -276,20 +276,12 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
LibraryProvider.OnDataReloaded(null);
}
void SetProviderLocator(PrintItemWrapper itemToSetProviderLocatorOn)
{
List<ProviderLocatorNode> providerLocator = GetProviderLocator();
string providerLocatorJson = JsonConvert.SerializeObject(providerLocator);
itemToSetProviderLocatorOn.PrintItem.LibraryProviderLocatorJson = providerLocatorJson;
}
public void AddItem(PrintItemWrapper item, int indexToInsert = -1)
{
if (indexToInsert == -1)
{
indexToInsert = printItems.Count;
}
SetProviderLocator(item);
printItems.Insert(indexToInsert, item);
// Check if the collection we are adding to is the the currently visible collection.
List<ProviderLocatorNode> currentDisplayedCollection = GetProviderLocator();
@ -330,7 +322,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
foreach (PrintItem part in partFiles)
{
PrintItemWrapper item = new PrintItemWrapper(part);
SetProviderLocator(item);
printItems.Add(item);
}
}

1
Queue/QueueDataWidget.cs
View file

@ -318,7 +318,6 @@ namespace MatterHackers.MatterControl.PrintQueue
PrintItem newPrintItem = new PrintItem();
newPrintItem.Name = newName;
newPrintItem.FileLocation = newCopyFilename;
newPrintItem.LibraryProviderLocatorJson = printItemWrapper.PrintItem.LibraryProviderLocatorJson;
newPrintItem.ReadOnly = printItemWrapper.PrintItem.ReadOnly;
newPrintItem.Protected = printItemWrapper.PrintItem.Protected;
UiThread.RunOnIdle(AddPartCopyToQueue, new PartToAddToQueue()

4
Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
View file

@ -79,8 +79,6 @@ namespace MatterControl.Tests
Assert.IsTrue(Directory.Exists(createdDirectory));
PrintItemWrapper itemAtRoot = testProvider.GetPrintItemWrapperAsync(0).Result;
List<ProviderLocatorNode> providerLocator = itemAtRoot.PrintItem.GetLibraryProviderLocator();
Assert.IsTrue(providerLocator.Count == 1);
// add an item works correctly
LibraryProvider subProvider = testProvider.GetProviderForItem(testProvider.GetCollectionItem(0));
@ -138,8 +136,6 @@ namespace MatterControl.Tests
Assert.IsTrue(NamedCollectionExists(collectionName)); // assert that the record does exist in the DB
PrintItemWrapper itemAtRoot = testProvider.GetPrintItemWrapperAsync(0).Result;
List<ProviderLocatorNode> providerLocator = itemAtRoot.PrintItem.GetLibraryProviderLocator();
Assert.IsTrue(providerLocator.Count == 1);
// add an item works correctly
dataReloaded = false;