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 06dfd81..74971ee 100644 --- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -67,5 +67,53 @@ landmarkType = "7"> + + + + + + + + + + diff --git a/Graphic Analysis 2/CollectionViewItem.swift b/Graphic Analysis 2/CollectionViewItem.swift index fe9443d..60dc153 100644 --- a/Graphic Analysis 2/CollectionViewItem.swift +++ b/Graphic Analysis 2/CollectionViewItem.swift @@ -11,10 +11,52 @@ import Cocoa class CollectionViewItem: NSCollectionViewItem { @IBOutlet var month: NSTextField! + @IBOutlet var day01: NSTextField! + @IBOutlet var day02: NSTextField! + @IBOutlet var day03: NSTextField! + @IBOutlet var day04: NSTextField! + @IBOutlet var day05: NSTextField! + @IBOutlet var day06: NSTextField! + @IBOutlet var day07: NSTextField! + @IBOutlet var day08: NSTextField! + @IBOutlet var day09: NSTextField! + @IBOutlet var day10: NSTextField! + @IBOutlet var day11: NSTextField! + @IBOutlet var day12: NSTextField! + @IBOutlet var day13: NSTextField! + @IBOutlet var day14: NSTextField! + @IBOutlet var day15: NSTextField! + @IBOutlet var day16: NSTextField! + @IBOutlet var day17: NSTextField! + @IBOutlet var day18: NSTextField! + @IBOutlet var day19: NSTextField! + @IBOutlet var day20: NSTextField! + @IBOutlet var day21: NSTextField! + @IBOutlet var day22: NSTextField! + @IBOutlet var day23: NSTextField! + @IBOutlet var day24: NSTextField! + @IBOutlet var day25: NSTextField! + @IBOutlet var day26: NSTextField! + @IBOutlet var day27: NSTextField! + @IBOutlet var day28: NSTextField! + @IBOutlet var day29: NSTextField! + @IBOutlet var day30: NSTextField! + @IBOutlet var day31: NSTextField! + var days: [NSTextField]? = nil + var monthFW: FileWrapper? = nil override func viewDidLoad() { super.viewDidLoad() view.wantsLayer = true view.layer?.backgroundColor = NSColor.white.cgColor + days = [day01, day02, day03, day04, day05, day06, day07, day08, day09, day10, day11, day12, day13, day14, day15, day16, day17, day18, day19, day20, day21, day22, day23, day24, day25, day26, day27, day28, day29, day30, day31] + } + + func setDays() { + guard monthFW != nil else { return } + for day in (monthFW?.fileWrappers)! { + guard let dayI = Int(day.key) else { continue } + days?[dayI-1].stringValue = day.key + } } } diff --git a/Graphic Analysis 2/CollectionViewItem.xib b/Graphic Analysis 2/CollectionViewItem.xib index 4b40529..02ce7c1 100644 --- a/Graphic Analysis 2/CollectionViewItem.xib +++ b/Graphic Analysis 2/CollectionViewItem.xib @@ -20,7 +20,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -310,6 +310,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Graphic Analysis 2/Document.swift b/Graphic Analysis 2/Document.swift index 908e620..5b765bc 100644 --- a/Graphic Analysis 2/Document.swift +++ b/Graphic Analysis 2/Document.swift @@ -64,7 +64,10 @@ extension Document : NSCollectionViewDataSource { func collectionView(_ itemForRepresentedObjectAtcollectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem { let item = collectionView.makeItem(withIdentifier: "CollectionViewItem", for: indexPath) guard let item2 = item as? CollectionViewItem else {return item } + guard months[indexPath.item] != nil else { return item } item2.month.stringValue = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][indexPath.item] + item2.monthFW = months[indexPath.item] + item2.setDays() return item2 } diff --git a/Graphic Analysis 2/Info.plist b/Graphic Analysis 2/Info.plist index 14636dc..a1bb67a 100644 --- a/Graphic Analysis 2/Info.plist +++ b/Graphic Analysis 2/Info.plist @@ -44,7 +44,7 @@ CFBundleShortVersionString 2.0 CFBundleVersion - 64 + 74 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/Graphic Analysis 2/buildnum.ver b/Graphic Analysis 2/buildnum.ver index 3ed2650..72024c0 100644 --- a/Graphic Analysis 2/buildnum.ver +++ b/Graphic Analysis 2/buildnum.ver @@ -1,2 +1,2 @@ version 2.0 -build 64 +build 74