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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work

Browse source
This commit is contained in:
Gregory Diaz 2015-05-21 17:44:27 -07:00
commit 5f9d67422c
6 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private static string slicingErrorMessage = "Slicing Error.\nPlease review your slice settings.".Localize();
private static string pressGenerateMessage = "Press 'generate' to view layers".Localize();
private static string fileNotFoundMessage = "File not found on disk.".Localize();
private static string fileTooBigToLoad = "GCode file too big to load for '{0}'.".Localize();
private static string fileTooBigToLoad = "GCode file too big to preview ({0}).".Localize();
private Vector2 bedCenter;
private Vector3 viewerVolume;

3
PrintLibrary/LibraryData.cs
View file

@ -126,6 +126,9 @@ namespace MatterHackers.MatterControl.PrintLibrary
}
PrintItems.Insert(indexToInsert, item);
OnItemAdded(new IndexArgs(indexToInsert));
item.PrintItem.PrintItemCollectionID = LibraryData.Instance.LibraryCollection.Id;
item.PrintItem.Commit();
}
public void RemoveItem(PrintItemWrapper printItemWrapper)

3
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -1473,7 +1473,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
timeSinceLastReadAnything.Restart();
// we want this while loop to be as fast as possible. Don't allow any significant work to happen in here
while (CommunicationState == CommunicationStates.AttemptingToConnect
|| (PrinterIsConnected && serialPort.IsOpen && !Disconnecting && readThreadHolder.IsCurrentThread()))
|| (PrinterIsConnected && serialPort != null && serialPort.IsOpen && !Disconnecting && readThreadHolder.IsCurrentThread()))
{
if (PrinterIsPrinting
&& PrinterIsConnected
@ -1993,6 +1993,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
{
CancelPrint();
MarkActivePrintCanceled();
CommunicationState = CommunicationStates.Printing;
}
}
break;

3
StaticData/Translations/Master.txt
View file

@ -3256,3 +3256,6 @@ Translated:Check For Update
English:solid_shell
Translated:solid_shell
English:GCode file too big to preview ({0}).
Translated:GCode file too big to preview ({0}).

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 05acae9f2e159f10925e74341453050de2e4bb21
Subproject commit bee144be24db9a914e37deeb1cf0bd8a4e9d1c62

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit c154f5df59722b5ee926b2a9b86985c2cbf5dfa0
Subproject commit d31a961ee34e85afacd50166699a565dcf5daef0