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

Merge pull request #2673 from jlewin/design_tools

Browse source 
Revise BedMeshGenerator use
This commit is contained in:
Lars Brubaker 2017-11-16 19:17:21 -08:00 • committed by GitHub
commit a018d72145
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ApplicationView/PrinterModels.cs
View file

@ -193,8 +193,6 @@ namespace MatterHackers.MatterControl
public GCodeRenderInfo RenderInfo { get; set; }
BedMeshGenerator bedGenerator;
private Mesh _bedMesh;
public Mesh Mesh
{
@ -202,12 +200,10 @@ namespace MatterHackers.MatterControl
{
if (_bedMesh == null)
{
bedGenerator = new BedMeshGenerator();
//Construct the thing
var bedAndVolume = bedGenerator.CreatePrintBedAndVolume(Printer);
_bedMesh = bedAndVolume.bed;
_buildVolumeMesh = bedAndVolume.volume;
// Load bed and build volume meshes
var bedGenerator = new BedMeshGenerator();
(_bedMesh, _buildVolumeMesh) = bedGenerator.CreatePrintBedAndVolume(Printer);
Task.Run(() =>
{

4
Library/Widgets/PrintLibraryWidget.cs
View file

@ -39,6 +39,7 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.Library;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrintQueue;
namespace MatterHackers.MatterControl.PrintLibrary
@ -407,7 +408,8 @@ namespace MatterHackers.MatterControl.PrintLibrary
// Singleselect - disallow containers
return listView.SelectedItems.Count == 1
&& selectedListItems.FirstOrDefault()?.Model is ILibraryItem firstItem
&& !(firstItem is ILibraryContainer);
&& !(firstItem is ILibraryContainer)
&& ApplicationController.Instance.DragDropData?.Printer.Connection.CommunicationState == CommunicationStates.Connected;
}
});