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

Revise control names

Browse source
This commit is contained in:
John Lewin 2017-10-22 19:50:01 -07:00
parent e195d0154c
commit 6c21f79ef6
4 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControl.OpenGL/GCodeRenderer/ExtrusionColors.cs
View file

@ -1,6 +1,4 @@
using MatterHackers.Agg;
/*
/*
Copyright (c) 2014, Lars Brubaker
All rights reserved.
@ -31,6 +29,7 @@ either expressed or implied, of the FreeBSD Project.
using System.Collections.Generic;
using System.Linq;
using MatterHackers.Agg;
namespace MatterHackers.GCodeVisualizer
{

2
MatterControl.csproj
View file

@ -264,7 +264,7 @@
<Compile Include="SetupWizard\InputBoxPage.cs" />
<Compile Include="LocalizedString.cs" />
<Compile Include="PartPreviewWindow\BedSettings.cs" />
<Compile Include="PartPreviewWindow\ColorGradientWidget.cs" />
<Compile Include="PartPreviewWindow\SpeedsLegend.cs" />
<Compile Include="PartPreviewWindow\PartPreviewContent.cs" />
<Compile Include="PartPreviewWindow\View3D\DebugBvh.cs" />
<Compile Include="PartPreviewWindow\View3D\UndoCommands\UngroupCommand.cs" />

41
PartPreviewWindow/ColorGradientWidget.cs → PartPreviewWindow/SpeedsLegend.cs
View file

@ -1,4 +1,33 @@
using System;
/*
Copyright (c) 2017, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using MatterHackers.Agg;
@ -7,9 +36,9 @@ using MatterHackers.GCodeVisualizer;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ColorGradientWidget : FlowLayoutWidget
public class SpeedsLegend : FlowLayoutWidget
{
public ColorGradientWidget(GCodeFile gcodeFileTest, ThemeConfig theme, int pointSize)
public SpeedsLegend(GCodeFile gcodeFileTest, ThemeConfig theme, int pointSize)
: base(FlowDirection.TopToBottom)
{
HashSet<float> speeds = new HashSet<float>();
@ -59,7 +88,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
int feedrate = rangeValues[i];
this.AddChild(
new ColorToSpeedWidget(speedColors[i], millimetersPerSecond: feedrate / 60, pointSize: pointSize)
new SpeedLegendRow(speedColors[i], millimetersPerSecond: feedrate / 60, pointSize: pointSize)
{
Margin = new BorderDouble(2),
HAnchor = HAnchor.Stretch
@ -67,9 +96,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
public class ColorToSpeedWidget : FlowLayoutWidget
private class SpeedLegendRow : FlowLayoutWidget
{
public ColorToSpeedWidget(RGBA_Bytes color, double millimetersPerSecond, int pointSize)
public SpeedLegendRow(RGBA_Bytes color, double millimetersPerSecond, int pointSize)
: base(FlowDirection.LeftToRight)
{
this.AddChild(

2
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
new SectionWidget(
"Speeds".Localize(),
ActiveTheme.Instance.PrimaryTextColor,
new ColorGradientWidget(sceneContext.LoadedGCode, theme, pointSize: 12)
new SpeedsLegend(sceneContext.LoadedGCode, theme, pointSize: 12)
{
HAnchor = HAnchor.Stretch,
Visible = sceneContext.RendererOptions.RenderSpeeds,