From bda26aa45a535ca69e3838b35100e7747d5c5b8d Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 12 Jun 2018 09:01:58 -0700 Subject: [PATCH 1/2] Make the more button open the site issue: MatterHackers/MCCentral#3591 Change 'more' button to a link to web site --- PartPreviewWindow/StartPage/ExploreSection.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/PartPreviewWindow/StartPage/ExploreSection.cs b/PartPreviewWindow/StartPage/ExploreSection.cs index daf253312..d913af76f 100644 --- a/PartPreviewWindow/StartPage/ExploreSection.cs +++ b/PartPreviewWindow/StartPage/ExploreSection.cs @@ -112,13 +112,21 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab }; moreButton.Click += (s, e1) => { - var scroll = this.Parents().FirstOrDefault(); - var position = scroll.ScrollPositionFromTop; + // if we can go out to the site than do that + if (content.group_link != null) + { + ApplicationController.Instance.LaunchBrowser(content.group_link); + } + else // show more itmes in the list + { + var scroll = this.Parents().FirstOrDefault(); + var position = scroll.ScrollPositionFromTop; - maxStuff += 6; - AddContent(); + maxStuff += 6; + AddContent(); - scroll.ScrollPositionFromTop = position; + scroll.ScrollPositionFromTop = position; + } }; this.AddChild(moreButton); } From e800b652d2a43aac5c3cb9301d18a54a4017f87b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 12 Jun 2018 09:30:25 -0700 Subject: [PATCH 2/2] Changed gcode width calculation back to what it was. Took out dead code --- .../RenderFeatures/RenderFeatureExtrusion.cs | 2 +- StaticData/SliceSettings/Properties.json | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs b/MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs index b503255a5..30a8b90bd 100644 --- a/MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs +++ b/MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs @@ -68,7 +68,7 @@ namespace MatterHackers.GCodeVisualizer if (moveLength > .1) // we get truncation errors from the slice engine when the length is very small, so don't do them { double area = extrusionVolumeMm3 / moveLength; - width = area / layerHeight * 2; + width = area / layerHeight; } } else diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 1319320df..6c67f2cce 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -309,14 +309,6 @@ "ShowIfSet": "!sla_printer", "DefaultValue": "1" }, - { - "SlicerConfigName": "extrusion_width", - "PresentationName": "Default Extrusion Width", - "HelpText": "Leave this as 0 to allow automatic calculation of extrusion width.", - "DataEditType": "DOUBLE_OR_PERCENT", - "Units": "mm or % leave 0 for auto", - "DefaultValue": "0" - }, { "SlicerConfigName": "filament_cost", "PresentationName": "Cost", @@ -638,14 +630,6 @@ "ReloadUiWhenChanged": true, "DefaultValue": "0" }, - { - "SlicerConfigName": "infill_extrusion_width", - "PresentationName": "Infill", - "HelpText": "Leave this as 0 to allow automatic calculation of extrusion width.", - "DataEditType": "DOUBLE_OR_PERCENT", - "Units": "mm or %", - "DefaultValue": "0" - }, { "SlicerConfigName": "infill_overlap_perimeter", "PresentationName": "Infill Overlap",