Merge remote-tracking branch 'origin/1.5.1'

This commit is contained in:
Lars Brubaker 2016-02-24 12:31:39 -08:00
commit f6060939dd
4 changed files with 42 additions and 25 deletions

View file

@ -91,6 +91,8 @@ namespace MatterControl.Tests.MatterControl
[Test, Category("Leveling")]
public void Leveling7PointsCorectInterpolation()
{
StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", "..", "StaticData"));
PrintLevelingData levelingData = new PrintLevelingData();
double radius = 100;

View file

@ -61,6 +61,8 @@ namespace MatterControl.Tests
[Test]
public void LibraryProviderFileSystem_NavigationWorking()
{
StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", "..", "StaticData"));
string downloadsDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads");
string testLibraryDirectory = Path.Combine(downloadsDirectory, "LibraryProviderFileSystemTest");
if (Directory.Exists(testLibraryDirectory))

View file

@ -26,7 +26,7 @@ namespace MatterControl.Tests.MatterControl
Assert.True("B" == "B");
}*/
[Test, Category("PrinterConfigurationFiles")]
[Test, Category("PrinterConfigurationFiles"), Ignore("Not Finished")]
public void PrinterConfigTests()
{