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

Turned off switching to gcode view (was confusing when switching queue items).

Browse source
This commit is contained in:
Lars Brubaker 2015-01-10 12:47:06 -08:00
parent 2cdd3e24df
commit b891465f27
4 changed files with 6 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControlApplication.cs
View file

@ -198,9 +198,6 @@ namespace MatterHackers.MatterControl
DesktopPosition = new Point2D(xpos, ypos);
}
// make sure when we start up, we are not showing the 3D view
UserSettings.Instance.Fields.EmbededViewShowingGCode = false;
ShowAsSystemWindow();
}

18
PartPreviewWindow/PartPreviewContent.cs
View file

@ -153,24 +153,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
this.AddChild(tabControl);
// if the embeded view was on the gcode tab than makes sure it stays there
if (UserSettings.Instance.Fields.EmbededViewShowingGCode)
{
SwitchToGcodeView();
}
tabControl.TabBar.TabIndexChanged += (sender, e) =>
{
if (tabControl.TabBar.SelectedTabName == "Layer View Tab")
{
UserSettings.Instance.Fields.EmbededViewShowingGCode = true;
}
else
{
UserSettings.Instance.Fields.EmbededViewShowingGCode = false;
}
};
}
public void SwitchToGcodeView()

13
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -342,7 +342,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
else
{
selectLayerSlider.Value = currentLayer-1;
selectLayerSlider.Value = currentLayer - 1;
layerRenderRatioSlider.SecondValue = PrinterConnectionAndCommunication.Instance.RatioIntoCurrentLayer;
layerRenderRatioSlider.FirstValue = 0;
}
@ -651,9 +651,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
if (windowMode == WindowMode.Embeded)
{
if (syncToPrint.Checked &&
(PrinterConnectionAndCommunication.Instance.PrinterIsPaused
|| PrinterConnectionAndCommunication.Instance.PrinterIsPrinting))
bool printerIsRunningPrint = PrinterConnectionAndCommunication.Instance.PrinterIsPaused || PrinterConnectionAndCommunication.Instance.PrinterIsPrinting;
if (syncToPrint.Checked && printerIsRunningPrint)
{
SetAnimationPosition();
//navigationWidget.Visible = false;
@ -729,11 +729,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GuiWidget widgetThatHasKeyDownHooked = null;
public override void OnDraw(Graphics2D graphics2D)
{
bool printerIsRunningPrint = PrinterConnectionAndCommunication.Instance.PrinterIsPaused || PrinterConnectionAndCommunication.Instance.PrinterIsPrinting;
if (syncToPrint != null
&& syncToPrint.Checked
&&
(PrinterConnectionAndCommunication.Instance.PrinterIsPaused
|| PrinterConnectionAndCommunication.Instance.PrinterIsPrinting))
&& printerIsRunningPrint)
{
SetAnimationPosition();
}

14
SettingsManagement/UserSettingsFields.cs
View file

@ -44,7 +44,6 @@ namespace MatterHackers.MatterControl
string StartCountDurringExitKey = "StartCountDurringExit";
string IsSimpleModeKey = "IsSimpleMode";
string EmbededViewShowingGCodeKey = "EmbededViewShowingGCode";
public bool IsSimpleMode
{
@ -71,19 +70,6 @@ namespace MatterHackers.MatterControl
set { SetInt(StartCountDurringExitKey, value); }
}
public bool EmbededViewShowingGCode
{
get
{
return GetBool(EmbededViewShowingGCodeKey, false);
}
set
{
SetBool(EmbededViewShowingGCodeKey, value);
}
}
public void SetBool(string keyToSet, bool value)
{
if (value)