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

Made the probe positions for print leveling be smaller on round beds.

Browse source 
Made the jog controls have a bit more space when window minimized in x.
This commit is contained in:
larsbrubaker 2014-02-24 17:42:52 -08:00
parent 0354f4d348
commit 09887e50e5
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
PrinterControls/ManualPrinterControls.cs
View file

@ -201,30 +201,30 @@ namespace MatterHackers.MatterControl
controlsTopToBottomLayout.Padding = new BorderDouble(3, 0);
terminalCommunicationsContainer = new DisableableWidget();
terminalCommunicationsContainer.AddChild(CreateTerminalControlsContainer());
AddTemperatureControls(controlsTopToBottomLayout);
FlowLayoutWidget centerControlsContainer = new FlowLayoutWidget ();
centerControlsContainer.HAnchor = HAnchor.ParentLeftRight;
FlowLayoutWidget centerControlsContainer = new FlowLayoutWidget();
centerControlsContainer.HAnchor = HAnchor.ParentLeftRight;
FlowLayoutWidget rightColumnContainer = new FlowLayoutWidget (FlowDirection.TopToBottom);
rightColumnContainer.AddChild (terminalCommunicationsContainer);
rightColumnContainer.Width = 230;
rightColumnContainer.VAnchor |= VAnchor.ParentTop;
AddMovementControls(centerControlsContainer);
AddMovementControls(centerControlsContainer);
// put in the terminal communications
{
terminalCommunicationsContainer = new DisableableWidget();
terminalCommunicationsContainer.AddChild(CreateTerminalControlsContainer());
AddFanControls(rightColumnContainer);
AddEePromControls(rightColumnContainer);
FlowLayoutWidget rightColumnContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
rightColumnContainer.AddChild(terminalCommunicationsContainer);
rightColumnContainer.Width = 180;
rightColumnContainer.VAnchor |= VAnchor.ParentTop;
centerControlsContainer.AddChild(rightColumnContainer);
AddFanControls(rightColumnContainer);
AddEePromControls(rightColumnContainer);
controlsTopToBottomLayout.AddChild (centerControlsContainer);
centerControlsContainer.AddChild(rightColumnContainer);
}
controlsTopToBottomLayout.AddChild(centerControlsContainer);
sdCardManagerContainer = new DisableableWidget();
sdCardManagerContainer.AddChild(CreateSdCardManagerContainer());
@ -239,9 +239,9 @@ namespace MatterHackers.MatterControl
AddAdjustmentControls(controlsTopToBottomLayout);
printLevelContainer = new DisableableWidget();
printLevelContainer.AddChild(CreatePrintLevelingControlsContainer());
controlsTopToBottomLayout.AddChild(printLevelContainer);
printLevelContainer = new DisableableWidget();
printLevelContainer.AddChild(CreatePrintLevelingControlsContainer());
controlsTopToBottomLayout.AddChild(printLevelContainer);
this.AddChild(controlsTopToBottomLayout);
AddHandlers();
@ -662,7 +662,7 @@ namespace MatterHackers.MatterControl
private GuiWidget CreateTerminalControlsContainer()
{
GroupBox terminalControlsContainer;
terminalControlsContainer = new GroupBox(new LocalizedString("Printer Communications").Translated);
terminalControlsContainer = new GroupBox(new LocalizedString("Communications").Translated);
terminalControlsContainer.Margin = new BorderDouble(0);
terminalControlsContainer.TextColor = ActiveTheme.Instance.PrimaryTextColor;

2
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -123,7 +123,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
switch (BedShape)
{
case MeshVisualizer.MeshViewerWidget.BedShape.Circular:
Vector2 firstPosition = new Vector2(printCenter.x, printCenter.y + (bedSize.y / 2) * .8);
Vector2 firstPosition = new Vector2(printCenter.x, printCenter.y + (bedSize.y / 2) * .5);
switch (index)
{
case 0: