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

Merge remote-tracking branch 'origin/development' into development

Browse source
This commit is contained in:
larsbrubaker 2014-03-11 11:09:50 -07:00
commit 30ba01ddab
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
PartPreviewWindow/GcodeViewBasic.cs
View file

@ -54,6 +54,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public class GcodeViewBasic : PartPreviewBaseWidget
{
public Slider selectLayerSlider;
public Slider layerStartRenderRatioSlider;
TextWidget gcodeProcessingStateInfoText;
GCodeViewWidget gcodeViewWidget;
PrintItemWrapper printItem;
@ -525,7 +526,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
selectLayerSlider.ValueChanged += new EventHandler(selectLayerSlider_ValueChanged);
gcodeViewWidget.ActiveLayerChanged += new EventHandler(gcodeViewWidget_ActiveLayerChanged);
AddChild(selectLayerSlider);
SetSliderSize();
layerStartRenderRatioSlider = new Slider(new Vector2(), 10);
layerStartRenderRatioSlider.ValueChanged += new EventHandler(layerStartRenderRatioSlider_ValueChanged);
AddChild(layerStartRenderRatioSlider);
SetSliderSizes();
// let's change the active layer so that it is set to the first layer with data
gcodeViewWidget.ActiveLayerIndex = gcodeViewWidget.ActiveLayerIndex + 1;
@ -535,6 +541,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
void layerStartRenderRatioSlider_ValueChanged(object sender, EventArgs e)
{
throw new NotImplementedException();
}
void gcodeViewWidget_ActiveLayerChanged(object sender, EventArgs e)
{
if (gcodeViewWidget.ActiveLayerIndex != (int)(selectLayerSlider.Value + .5))
@ -550,13 +561,16 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
void PartPreviewGCode_BoundsChanged(object sender, EventArgs e)
{
SetSliderSize();
SetSliderSizes();
}
void SetSliderSize()
void SetSliderSizes()
{
selectLayerSlider.OriginRelativeParent = new Vector2(gcodeDispalyWidget.Width - 20, 80);
selectLayerSlider.TotalWidthInPixels = gcodeDispalyWidget.Height - 80;
layerStartRenderRatioSlider.OriginRelativeParent = new Vector2(20, 70);
layerStartRenderRatioSlider.TotalWidthInPixels = layerStartRenderRatioSlider.Width - 80;
}
private void AddHandlers()