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

Updating MS and fixing tests

Browse source
This commit is contained in:
Lars Brubaker 2021-12-09 10:54:35 -08:00
parent d9ed44cfb9
commit 682d1e1c51
4 changed files with 63 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit dc55feeb1e043b0772aa2c21b4d6947e1cccc14f
Subproject commit ec9826137087ef6dc1a56a6b828c2fbc2b6e8a0b

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 8c801ba65845521e2a0e13a00f318952caa80336
Subproject commit 67c1489705612bb46e5969a5dee75e5fa6984c36

12
Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
View file

@ -144,19 +144,19 @@ namespace MatterHackers.MatterControl.Tests.Automation
var mainViewWidget = ApplicationController.Instance.MainView;
var tabControl = mainViewWidget.TabControl;
Assert.AreEqual(5, mainViewWidget.TabControl.AllTabs.Count());
Assert.AreEqual(6, mainViewWidget.TabControl.AllTabs.Count());
// open the design for editing
testRunner.ClickByName("Library Tab")
.DoubleClickByName("Library Row Item Collection")
.DoubleClickByName("Local Library Row Item Collection")
.DoubleClickByName("Row Item Cube Design")
.WaitFor(() => mainViewWidget.TabControl.AllTabs.Count() == 6);
.WaitFor(() => mainViewWidget.TabControl.AllTabs.Count() == 7);
// we have opened a new tab
Assert.AreEqual(6, mainViewWidget.TabControl.AllTabs.Count());
Assert.AreEqual(7, mainViewWidget.TabControl.AllTabs.Count());
// we are on the design tab
Assert.AreEqual(5, tabControl.SelectedTabIndex);
Assert.AreEqual(6, tabControl.SelectedTabIndex);
Assert.AreEqual("Cube Design", tabControl.SelectedTabKey);
// double click it again and prove that it goes to the currently open tab
@ -164,9 +164,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
.DoubleClickByName("Row Item Cube Design");
// we have not opened a new tab
Assert.AreEqual(6, mainViewWidget.TabControl.AllTabs.Count());
Assert.AreEqual(7, mainViewWidget.TabControl.AllTabs.Count());
// we are on the design tab
Assert.AreEqual(5, tabControl.SelectedTabIndex);
Assert.AreEqual(6, tabControl.SelectedTabIndex);
// rename in the library tab
// assert tab name has change

55
Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs
View file

@ -32,6 +32,61 @@ namespace MatterControl.Tests.MatterControl
}).ToList();
}
[Test, RunInApplicationDomain]
public void ModifyPrinterProfiles()
{
return;
StaticData.RootPath = TestContext.CurrentContext.ResolveProjectPath(4, "StaticData");
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
string profilePath = @"C:\\Users\\LarsBrubaker\\Downloads\\Pulse E Profiles";
allPrinters = (from printerFile in new DirectoryInfo(profilePath).GetFiles("*.printer", SearchOption.TopDirectoryOnly)
select new PrinterTestDetails
{
PrinterName = printerFile.Name,
Oem = printerFile.Directory.Name,
ConfigPath = printerFile.FullName,
RelativeFilePath = printerFile.FullName.Substring(printerSettingsDirectory.Length + 1),
PrinterSettings = PrinterSettings.LoadFile(printerFile.FullName)
}).ToList();
void ChangeSettings(PrinterSettings printerSettings)
{
// general
printerSettings.SetValue(SettingsKey.fill_density, "30%");
printerSettings.SetValue(SettingsKey.avoid_crossing_perimeters, "1");
printerSettings.SetValue(SettingsKey.merge_overlapping_lines, "1");
printerSettings.SetValue(SettingsKey.seam_placement, "Centered In Back");
printerSettings.SetValue(SettingsKey.expand_thin_walls, "1");
printerSettings.SetValue(SettingsKey.coast_at_end_distance, "0");
printerSettings.SetValue(SettingsKey.monotonic_solid_infill, "1");
printerSettings.SetValue(SettingsKey.infill_overlap_perimeter, "20%");
printerSettings.SetValue(SettingsKey.avoid_crossing_max_ratio, "3");
printerSettings.SetValue(SettingsKey.perimeter_start_end_overlap, "35");
// speed
printerSettings.SetValue(SettingsKey.external_perimeter_speed, "25");
printerSettings.SetValue(SettingsKey.perimeter_acceleration, "800");
printerSettings.SetValue(SettingsKey.default_acceleration, "1300");
printerSettings.SetValue(SettingsKey.bridge_over_infill, "1");
// adheasion
printerSettings.SetValue(SettingsKey.create_skirt, "1");
// support
printerSettings.SetValue(SettingsKey.retract_lift, ".4");
printerSettings.SetValue(SettingsKey.min_extrusion_before_retract, "0");
printerSettings.SetValue(SettingsKey.retract_before_travel_avoid, "20");
}
foreach (var printer in allPrinters)
{
ChangeSettings(printer.PrinterSettings);
printer.PrinterSettings.Save(Path.Combine(Path.GetDirectoryName(printer.ConfigPath), "output", printer.PrinterName), true);
}
int a = 0;
}
[Test, RunInApplicationDomain]
public void LayerGCodeHasExpectedValue()
{