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

Merge pull request #3408 from larsbrubaker/design_tools

Browse source 
Make the more button open the site
This commit is contained in:
Lars Brubaker 2018-06-12 09:37:56 -07:00 • committed by GitHub
commit 3fe1837823
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs
View file

@ -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

18
PartPreviewWindow/StartPage/ExploreSection.cs
View file

@ -112,13 +112,21 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
};
moreButton.Click += (s, e1) =>
{
var scroll = this.Parents<ScrollableWidget>().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<ScrollableWidget>().FirstOrDefault();
var position = scroll.ScrollPositionFromTop;
maxStuff += 6;
AddContent();
maxStuff += 6;
AddContent();
scroll.ScrollPositionFromTop = position;
scroll.ScrollPositionFromTop = position;
}
};
this.AddChild(moreButton);
}

16
StaticData/SliceSettings/Properties.json
View file

@ -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",