From 2ee52deea6d6624d0afc50ca0e2c76a7ff196a15 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 16 Jun 2016 10:22:38 -0700 Subject: [PATCH] More settings moved to GetValue bed_size bed_shape build_height bed_temperature min_fan_speed also Moved BedShape out of class and into namespace --- BrailleBuilder/BrailleBuilderMainWindow.cs | 5 +- BrailleBuilder/View3DBrailleBuilder.cs | 2 +- .../PrintLeveling/LevelWizardBase.cs | 9 ++- .../BaseClasses/PartPreview3DWidget.cs | 2 +- PartPreviewWindow/PartPreviewContent.cs | 9 ++- PartPreviewWindow/View3D/View3DWidget.cs | 6 +- PartPreviewWindow/ViewGcodeBasic.cs | 8 +- .../Settings/SettingsProfile.cs | 74 +++++++++---------- StaticData/Translations/Master.txt | 3 + Submodules/agg-sharp | 2 +- TextCreator/TextCreatorMainWindow.cs | 5 +- TextCreator/View3DTextCreator.cs | 2 +- 12 files changed, 64 insertions(+), 63 deletions(-) diff --git a/BrailleBuilder/BrailleBuilderMainWindow.cs b/BrailleBuilder/BrailleBuilderMainWindow.cs index 566f4a485..7c54b806c 100644 --- a/BrailleBuilder/BrailleBuilderMainWindow.cs +++ b/BrailleBuilder/BrailleBuilderMainWindow.cs @@ -29,6 +29,7 @@ either expressed or implied, of the FreeBSD Project. using MatterHackers.Agg.UI; using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.Plugins.BrailleBuilder @@ -47,9 +48,9 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder double buildHeight = ActiveSliceSettings.Instance.GetValue("build_height"); part3DView = new View3DBrailleBuilder( - new Vector3(ActiveSliceSettings.Instance.GetValue("bed_size"), buildHeight), + new Vector3(ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size), buildHeight), ActiveSliceSettings.Instance.GetValue("print_center"), - ActiveSliceSettings.Instance.BedShape()); + ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape)); #if __ANDROID__ this.AddChild(new SoftKeyboardContentOffset(part3DView)); diff --git a/BrailleBuilder/View3DBrailleBuilder.cs b/BrailleBuilder/View3DBrailleBuilder.cs index 40bb3ae5a..defb8823d 100644 --- a/BrailleBuilder/View3DBrailleBuilder.cs +++ b/BrailleBuilder/View3DBrailleBuilder.cs @@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder private TypeFace brailTypeFace; private TypeFace boldTypeFace; - public View3DBrailleBuilder(Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape) + public View3DBrailleBuilder(Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape) { boldTypeFace = TypeFace.LoadFrom(StaticData.Instance.ReadAllText(Path.Combine("Fonts", "LiberationMono.svg"))); brailTypeFace = TypeFace.LoadFrom(StaticData.Instance.ReadAllText(Path.Combine("Fonts", "Braille.svg"))); diff --git a/ConfigurationPage/PrintLeveling/LevelWizardBase.cs b/ConfigurationPage/PrintLeveling/LevelWizardBase.cs index 03c8dc254..f04472c39 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizardBase.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizardBase.cs @@ -30,6 +30,7 @@ either expressed or implied, of the FreeBSD Project. using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; using System; @@ -79,12 +80,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static Vector2 GetPrintLevelPositionToSample(int index) { - Vector2 bedSize = ActiveSliceSettings.Instance.GetValue("bed_size"); + Vector2 bedSize = ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size); Vector2 printCenter = ActiveSliceSettings.Instance.GetValue("print_center"); - switch (ActiveSliceSettings.Instance.BedShape()) + switch (ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape)) { - case MeshVisualizer.MeshViewerWidget.BedShape.Circular: + case BedShape.Circular: Vector2 firstPosition = new Vector2(printCenter.x, printCenter.y + (bedSize.y / 2) * .5); switch (index) { @@ -101,7 +102,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling throw new IndexOutOfRangeException(); } - case MeshVisualizer.MeshViewerWidget.BedShape.Rectangular: + case BedShape.Rectangular: default: switch (index) { diff --git a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs index 2fb9750bb..bb7c4bff4 100644 --- a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs +++ b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow meshViewerWidget.CreatePrintBed( new Vector3(ActiveSliceSettings.Instance.GetValue("bed_size"), buildHeight), ActiveSliceSettings.Instance.GetValue("print_center"), - ActiveSliceSettings.Instance.BedShape()); + ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape)); PutOemImageOnBed(); })); } diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs index f8c049091..a4d969c14 100644 --- a/PartPreviewWindow/PartPreviewContent.cs +++ b/PartPreviewWindow/PartPreviewContent.cs @@ -33,6 +33,7 @@ using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrintQueue; using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; using System; using System.IO; @@ -99,9 +100,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // put in the 3D view partPreviewView = new View3DWidget(printItem, - new Vector3(ActiveSliceSettings.Instance.GetValue("bed_size"), buildHeight), + new Vector3(ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size), buildHeight), ActiveSliceSettings.Instance.GetValue("print_center"), - ActiveSliceSettings.Instance.BedShape(), + ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape), windowMode, autoRotate3DView, openMode); @@ -116,9 +117,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } viewGcodeBasic = new ViewGcodeBasic(printItem, - new Vector3(ActiveSliceSettings.Instance.GetValue("bed_size"), buildHeight), + new Vector3(ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size), buildHeight), ActiveSliceSettings.Instance.GetValue("print_center"), - ActiveSliceSettings.Instance.BedShape(), gcodeWindowMode); + ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape), gcodeWindowMode); if (windowMode == View3DWidget.WindowMode.StandAlone) { diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 92c5346dc..7541763e0 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public event EventHandler SelectedTransformChanged; - public View3DWidget(PrintItemWrapper printItemWrapper, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, WindowMode windowType, AutoRotate autoRotate, OpenMode openMode = OpenMode.Viewing) + public View3DWidget(PrintItemWrapper printItemWrapper, Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape, WindowMode windowType, AutoRotate autoRotate, OpenMode openMode = OpenMode.Viewing) { this.openMode = openMode; this.windowType = windowType; @@ -2110,8 +2110,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { AxisAlignedBoundingBox allBounds = MeshViewerWidget.GetAxisAlignedBoundingBox(MeshGroups); bool onBed = allBounds.minXYZ.z > -.001 && allBounds.minXYZ.z < .001; // really close to the bed - RectangleDouble bedRect = new RectangleDouble(0, 0, ActiveSliceSettings.Instance.GetValue("bed_size").x, ActiveSliceSettings.Instance.GetValue("bed_size").y); - bedRect.Offset(ActiveSliceSettings.Instance.GetValue("print_center") - ActiveSliceSettings.Instance.GetValue("bed_size") / 2); + RectangleDouble bedRect = new RectangleDouble(0, 0, ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size).x, ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size).y); + bedRect.Offset(ActiveSliceSettings.Instance.GetValue("print_center") - ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size) / 2); bool inBounds = bedRect.Contains(new Vector2(allBounds.minXYZ)) && bedRect.Contains(new Vector2(allBounds.maxXYZ)); diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 6e505c971..26db5fa37 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -87,10 +87,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private Vector2 bedCenter; private Vector3 viewerVolume; - private MeshViewerWidget.BedShape bedShape; + private BedShape bedShape; private int sliderWidth; - public ViewGcodeBasic(PrintItemWrapper printItem, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, WindowMode windowMode) + public ViewGcodeBasic(PrintItemWrapper printItem, Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape, WindowMode windowMode) { this.viewerVolume = viewerVolume; this.bedShape = bedShape; @@ -126,8 +126,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow || stringEvent.Data == "bed_shape" || stringEvent.Data == "center_part_on_bed") { - viewerVolume = new Vector3(ActiveSliceSettings.Instance.GetValue("bed_size"), ActiveSliceSettings.Instance.GetValue("build_height")); - bedShape = ActiveSliceSettings.Instance.BedShape(); + viewerVolume = new Vector3(ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size), ActiveSliceSettings.Instance.GetValue("build_height")); + bedShape = ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape); bedCenter = ActiveSliceSettings.Instance.GetValue("print_center"); double buildHeight = ActiveSliceSettings.Instance.GetValue("build_height"); diff --git a/SlicerConfiguration/Settings/SettingsProfile.cs b/SlicerConfiguration/Settings/SettingsProfile.cs index 598c995a3..3e752df64 100644 --- a/SlicerConfiguration/Settings/SettingsProfile.cs +++ b/SlicerConfiguration/Settings/SettingsProfile.cs @@ -48,14 +48,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration using DataStorage; using Agg.PlatformAbstract; using Newtonsoft.Json.Linq; - + using MeshVisualizer; public enum SettingsKey { + bed_shape, bed_size, + bed_temperature, has_heated_bed, resume_position_before_z_home, z_homes_to_max, nozzle_diameter, + min_fan_speed, }; public class SettingsProfile @@ -243,16 +246,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration layeredProfile.SetMaterialPreset(extruderIndex, text); } - public double BedTemperature() - { - double targetTemp = 0; - if (this.GetValue("has_heated_bed")) - { - double.TryParse(GetValue("bed_temperature"), out targetTemp); - } - return targetTemp; - } - public int[] LayerToPauseOn() { string[] userValues = GetValue("layer_to_pause").Split(';'); @@ -283,11 +276,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - public double MinFanSpeed() - { - return ParseDouble(GetValue("min_fan_speed")); - } - internal string MaterialPresetKey(int extruderIndex) { return layeredProfile.GetMaterialPresetKey(extruderIndex); @@ -303,25 +291,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration return firstLayerValue; } - public MeshVisualizer.MeshViewerWidget.BedShape BedShape() - { - switch (GetValue("bed_shape")) - { - case "rectangular": - return MeshVisualizer.MeshViewerWidget.BedShape.Rectangular; - - case "circular": - return MeshVisualizer.MeshViewerWidget.BedShape.Circular; - - default: -#if DEBUG - throw new NotImplementedException(string.Format("'{0}' is not a known bed_shape.", GetValue("bed_shape"))); -#else - return MeshVisualizer.MeshViewerWidget.BedShape.Rectangular; -#endif - } - } - public int ExtruderCount() { if (this.GetValue("extruders_share_temperature")) @@ -456,7 +425,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { if (typeof(T) == typeof(bool)) { - return (T)(object) (this.GetValue(settingsKey) == "1"); + return (T)(object)(this.GetValue(settingsKey) == "1"); } else if (typeof(T) == typeof(int)) { @@ -464,7 +433,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration int.TryParse(this.GetValue(settingsKey), out result); return (T)(object)(result); } - else if(typeof(T) == typeof(Vector2)) + else if (typeof(T) == typeof(Vector2)) { string[] twoValues = GetValue(settingsKey).Split(','); if (twoValues.Length != 2) @@ -488,7 +457,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { return (T)(object)(GetValue("layer_height") * ratio); } - else if(settingsKey == "first_layer_extrusion_width") + else if (settingsKey == "first_layer_extrusion_width") { return (T)(object)(GetValue("layer_height") * ratio); } @@ -496,10 +465,35 @@ namespace MatterHackers.MatterControl.SlicerConfiguration return (T)(object)(ratio); } + if (settingsKey == SettingsKey.bed_temperature.ToString() + && !this.GetValue("has_heated_bed")) + { + return (T)(object)(0); + } + double result; double.TryParse(this.GetValue(settingsKey), out result); return (T)(object)(result); } + else if (typeof(T) == typeof(BedShape)) + { + switch (GetValue(settingsKey.ToString())) + { + case "rectangular": + return (T)(object)(BedShape.Rectangular); + + case "circular": + return (T)(object)(BedShape.Circular); + + default: +#if DEBUG + throw new NotImplementedException(string.Format("'{0}' is not a known bed_shape.", GetValue("bed_shape"))); +#else + return MeshVisualizer.MeshViewerWidget.BedShape.Rectangular; +#endif + } + } + return (T)default(T); } @@ -684,10 +678,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration return false; } - if (MinFanSpeed() > 100) + if (GetValue(SettingsKey.min_fan_speed) > 100) { string error = "The Minimum Fan Speed can only go as high as 100%.".Localize(); - string details = string.Format("It is currently set to {0}.".Localize(), MinFanSpeed()); + string details = string.Format("It is currently set to {0}.".Localize(), GetValue(SettingsKey.min_fan_speed)); string location = "Location: 'Settings & Controls' -> 'Settings' -> 'Filament' -> 'Cooling'".Localize(); StyledMessageBox.ShowMessageBox(null, string.Format("{0}\n\n{1}\n\n{2}", error, details, location), "Slice Error".Localize()); return false; diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 0eb9a3185..ec9898bf2 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -5032,3 +5032,6 @@ Translated:You have successfully imported a new printer profile. You can find '{ English:Import Successful Translated:Import Successful +English:The distance between the first layer (the bottom) and the top of the support material. A good value depends on the type of material. For PLA and ABS a value between 0.1 and 0.3 generaly works well. +Translated:The distance between the first layer (the bottom) and the top of the support material. A good value depends on the type of material. For PLA and ABS a value between 0.1 and 0.3 generaly works well. + diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 02f057d6f..a13efdb37 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 02f057d6f7ba993ec5206b1857cf82721bd973a2 +Subproject commit a13efdb37e1768456083351888fa1b1493b3d21d diff --git a/TextCreator/TextCreatorMainWindow.cs b/TextCreator/TextCreatorMainWindow.cs index 48c96f034..7bf73d717 100644 --- a/TextCreator/TextCreatorMainWindow.cs +++ b/TextCreator/TextCreatorMainWindow.cs @@ -29,6 +29,7 @@ either expressed or implied, of the FreeBSD Project. using MatterHackers.Agg.UI; using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.Plugins.TextCreator @@ -47,9 +48,9 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator double buildHeight = ActiveSliceSettings.Instance.GetValue("build_height"); part3DView = new View3DTextCreator( - new Vector3(ActiveSliceSettings.Instance.GetValue("bed_size"), buildHeight), + new Vector3(ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_size), buildHeight), ActiveSliceSettings.Instance.GetValue("print_center"), - ActiveSliceSettings.Instance.BedShape()); + ActiveSliceSettings.Instance.GetValue(SettingsKey.bed_shape)); #if __ANDROID__ this.AddChild(new SoftKeyboardContentOffset(part3DView)); diff --git a/TextCreator/View3DTextCreator.cs b/TextCreator/View3DTextCreator.cs index 662f5afee..396e6ff23 100644 --- a/TextCreator/View3DTextCreator.cs +++ b/TextCreator/View3DTextCreator.cs @@ -132,7 +132,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator private TypeFace boldTypeFace; - public View3DTextCreator(Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape) + public View3DTextCreator(Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape) { boldTypeFace = TypeFace.LoadFrom(StaticData.Instance.ReadAllText(Path.Combine("Fonts", "LiberationSans-Bold.svg")));