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

fixing tests

Browse source
This commit is contained in:
Lars Brubaker 2023-04-07 10:54:04 -07:00
parent a165f08d8a
commit ffc7c8f038
5 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControlLib/ApplicationView/Application.cs
View file

@ -698,8 +698,10 @@ namespace MatterHackers.MatterControl
reporter?.Invoke(0.91, (loading != null) ? loading : "OnLoadActions");
applicationController.OnLoadActions();
// Wired up to MainView.Load with the intent to fire startup actions and tasks in order with reporting
async void InitialWindowLoad(object s, EventArgs e)
SingleWindowProvider.SetWindowTheme(applicationController.Theme);
// Wired up to MainView.Load with the intent to fire startup actions and tasks in order with reporting
async void InitialWindowLoad(object s, EventArgs e)
{
try
{

9
MatterControlLib/ApplicationView/Config/BedConfig.cs
View file

@ -228,7 +228,14 @@ namespace MatterHackers.MatterControl
{
if (moveToOpenPosition)
{
PlatingHelper.MoveToOpenPositionRelativeGroup(item, itemsToAvoid);
if (itemsToAvoid.Count() == 0)
{
PlatingHelper.PlaceOnBed(item);
}
else
{
PlatingHelper.MoveToOpenPositionRelativeGroup(item, itemsToAvoid);
}
}
},
addUndoCheckPoint: addUndoCheckPoint));

18
StaticData/Translations/Master.txt
View file

@ -946,6 +946,9 @@ Translated:Color Name
English:Color View
Translated:Color View
English:Columns
Translated:Columns
English:Combine
Translated:Combine
@ -1597,6 +1600,9 @@ Translated:Ending Angle
English:Ensure the nozzle is clear of any debri or filament
Translated:Ensure the nozzle is clear of any debri or filament
English:Enter
Translated:Enter
English:Enter a Design Name Here
Translated:Enter a Design Name Here
@ -2149,6 +2155,9 @@ Translated:Generate Supports
English:Generates an outline around the support material to improve strength and hold up interface layers.
Translated:Generates an outline around the support material to improve strength and hold up interface layers.
English:Generating Config
Translated:Generating Config
English:Generating Lithophane
Translated:Generating Lithophane
@ -5098,6 +5107,9 @@ Translated:Starting Angle
English:Starting firmware update...
Translated:Starting firmware update...
English:Starting slicer
Translated:Starting slicer
English:Starting Sync
Translated:Starting Sync
@ -6058,6 +6070,9 @@ Translated:Total Time Printed
English:Touch Screen Mode
Translated:Touch Screen Mode
English:Trace
Translated:Trace
English:Transform
Translated:Transform
@ -6475,6 +6490,9 @@ Translated:We will use this paper to measure the distance between the nozzle and
English:Wedge
Translated:Wedge
English:Welcome to {0}
Translated:Welcome to {0}
English:Welcome to MatterControl
Translated:Welcome to MatterControl

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 4cec2340ebc82909e9202efb6b09e72e1d3042cd
Subproject commit b37ff21706c047c88be01d9afe3df6e578179f5e

13
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -39,6 +39,7 @@ using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.UI.Tests;
using MatterHackers.DataConverters3D;
using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.CustomWidgets;
@ -776,7 +777,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
case "Scripting Row Item Collection":
case "Primitives Row Item Collection":
// If visible, navigate into Libraries container before opening target
testRunner.DoubleClickByName("Design Apps Row Item Collection")
testRunner.DoubleClickByName("Bundled Row Item Collection")
.Delay();
break;
@ -983,11 +984,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
int overrideHeight = -1,
string defaultTestImages = null)
{
// Walk back a step in the stack and output the callers name
// StackTrace st = new StackTrace(false);
// Debug.WriteLine("\r\n ***** Running automation test: {0} {1} ", st.GetFrames().Skip(1).First().GetMethod().Name, DateTime.Now);
Clipboard.SetSystemClipboard(new SimulatedClipboard());
if (staticDataPathOverride == null)
// Walk back a step in the stack and output the callers name
// StackTrace st = new StackTrace(false);
// Debug.WriteLine("\r\n ***** Running automation test: {0} {1} ", st.GetFrames().Skip(1).First().GetMethod().Name, DateTime.Now);
if (staticDataPathOverride == null)
{
// Popping one directory above MatterControl, then back down into MatterControl ensures this works in MCCentral as well and MatterControl
staticDataPathOverride = StaticDataPath;