From 6be1916c89ea13314bc76f7b432ae3558c8a3753 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 21 May 2015 15:09:59 -0700 Subject: [PATCH 1/3] Improved the message for gcode loading error. --- PartPreviewWindow/ViewGcodeBasic.cs | 2 +- StaticData/Translations/Master.txt | 3 +++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 62272f2f9..e493ac467 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -78,7 +78,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; diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index e202fd0cf..ebd6d9e33 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -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}). + diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 05acae9f2..bee144be2 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 05acae9f2e159f10925e74341453050de2e4bb21 +Subproject commit bee144be24db9a914e37deeb1cf0bd8a4e9d1c62 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index c154f5df5..d31a961ee 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit c154f5df59722b5ee926b2a9b86985c2cbf5dfa0 +Subproject commit d31a961ee34e85afacd50166699a565dcf5daef0 From 707c983e0a6c042088beed28cfecd30a1ccd3cfb Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 21 May 2015 16:34:30 -0700 Subject: [PATCH 2/3] Made sure that canceling while pause actually finishes the printing of the cancel code (that it works as expected). --- PrinterCommunication/PrinterConnectionAndCommunication.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index 0e94f8fce..a21e4ce2e 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -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; From 851f42e8a59a7a0a3b3dd5ca68c14b52b9a6125f Mon Sep 17 00:00:00 2001 From: Gregory Diaz Date: Thu, 21 May 2015 16:36:25 -0700 Subject: [PATCH 3/3] Fixed Add to Library bug where print item was getting added to UI but not being committed to the database. --- PrintLibrary/LibraryData.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PrintLibrary/LibraryData.cs b/PrintLibrary/LibraryData.cs index 55347bb93..5c612718a 100644 --- a/PrintLibrary/LibraryData.cs +++ b/PrintLibrary/LibraryData.cs @@ -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)