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

Switch to GCode view on load if is GCode content

Browse source
This commit is contained in:
John Lewin 2018-05-07 17:15:08 -07:00
parent e46737072e
commit 9a43326fd5
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ApplicationView/PrinterModels.cs
View file

@ -84,6 +84,12 @@ namespace MatterHackers.MatterControl
// Store // Store
this.EditContext = editContext; this.EditContext = editContext;
var contentInfo = editContext.SourceItem as ILibraryAsset;
if (contentInfo != null)
{
this.ContentType = contentInfo.ContentType;
}
// Load // Load
if (editContext.SourceItem is ILibraryAssetStream contentStream if (editContext.SourceItem is ILibraryAssetStream contentStream
&& contentStream.ContentType == "gcode") && contentStream.ContentType == "gcode")
@ -351,6 +357,8 @@ namespace MatterHackers.MatterControl
public bool EditableScene { get; private set; } public bool EditableScene { get; private set; }
public string ContentType { get; private set; }
internal void RenderGCode3D(DrawEventArgs e) internal void RenderGCode3D(DrawEventArgs e)
{ {
if (this.RenderInfo != null) if (this.RenderInfo != null)

6
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -240,6 +240,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (printerTabPage?.printerActionsBar?.modelViewButton is GuiWidget button) if (printerTabPage?.printerActionsBar?.modelViewButton is GuiWidget button)
{ {
button.Enabled = sceneContext.EditableScene; button.Enabled = sceneContext.EditableScene;
if (sceneContext.ContentType == "gcode"
&& printerTabPage?.printerActionsBar?.layers3DButton is GuiWidget gcodeButton)
{
gcodeButton.InvokeClick();
}
} }
this.Invalidate(); this.Invalidate();

4
PartPreviewWindow/ViewControls3D.cs
View file

@ -30,13 +30,10 @@ either expressed or implied, of the FreeBSD Project.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using MatterHackers.Agg; using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.ImageProcessing;
using MatterHackers.Agg.Platform; using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI; using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D; using MatterHackers.DataConverters3D;
@ -44,7 +41,6 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.Library; using MatterHackers.MatterControl.Library;
using MatterHackers.MeshVisualizer;
using MatterHackers.VectorMath; using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.PartPreviewWindow namespace MatterHackers.MatterControl.PartPreviewWindow