From 1e56a6247bfe8e1b32178335a17a440eb4f646f7 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sun, 18 Jun 2017 22:54:00 +0200 Subject: [PATCH] Improved ProgressIndicator --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 18 ------------------ Graphic Analysis 2/Document.swift | 6 ++++-- Graphic Analysis 2/Info.plist | 2 +- Graphic Analysis 2/buildnum.ver | 2 +- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 8f73b99..fe2b454 100644 --- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,22 +2,4 @@ - - - - - - diff --git a/Graphic Analysis 2/Document.swift b/Graphic Analysis 2/Document.swift index a7319f4..e256e7b 100644 --- a/Graphic Analysis 2/Document.swift +++ b/Graphic Analysis 2/Document.swift @@ -149,7 +149,7 @@ class Document: NSDocument { window.days = self.days[i] self.pdfWindows[i] = (window.window?.contentView?.dataWithPDF(inside: (window.window?.contentView?.bounds)!))! DispatchQueue.main.async { - self.exportProgress.increment(by: 100/12) + self.exportProgress.increment(by: 100/13) } } } @@ -163,8 +163,10 @@ class Document: NSDocument { context.endPDFPage() } context.closePDF() - data.write(to: savePanel.url!, atomically: true) + DispatchQueue.main.async { + self.exportProgress.increment(by: 100/13) + } pthread_mutex_lock(&(NSApp.delegate as! AppDelegate).lock) self.pdfBegin = false pthread_mutex_unlock(&(NSApp.delegate as! AppDelegate).lock) diff --git a/Graphic Analysis 2/Info.plist b/Graphic Analysis 2/Info.plist index 392ab50..1ad191f 100644 --- a/Graphic Analysis 2/Info.plist +++ b/Graphic Analysis 2/Info.plist @@ -44,7 +44,7 @@ CFBundleShortVersionString 2.0 CFBundleVersion - 411 + 414 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/Graphic Analysis 2/buildnum.ver b/Graphic Analysis 2/buildnum.ver index 474d811..8bb3013 100644 --- a/Graphic Analysis 2/buildnum.ver +++ b/Graphic Analysis 2/buildnum.ver @@ -1,2 +1,2 @@ version 2.0 -build 411 +build 414