Skip to content

Commit 11f2bed

Browse files
yepheryepher
committed
Merge pull request #39 from jpage4500/custom-draw
speed improvements; custom draw strings, cache data & type
2 parents 82c43d2 + 58115a5 commit 11f2bed

13 files changed

Lines changed: 292 additions & 465 deletions

‎CoreDataUtil.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,18 @@
2121
830D04EE1598CC4D003874CA /* MFLMainWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 830D04EC1598CC4D003874CA /* MFLMainWindowController.xib */; };
2222
832C9696159BD69E00AC8FA8 /* CoreData.ext in Resources */ = {isa = PBXBuildFile; fileRef = 832C9695159BD69E00AC8FA8 /* CoreData.ext */; };
2323
832C969B159BDBB000AC8FA8 /* MFLCoreDataEditorProjectLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 832C969A159BDBB000AC8FA8 /* MFLCoreDataEditorProjectLoader.m */; };
24-
833DF7F31593556000793430 /* MFLButtonTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DF7F21593556000793430 /* MFLButtonTableViewCell.m */; };
2524
833DF7FB1593718600793430 /* MFLTextTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DF7FA1593718600793430 /* MFLTextTableCellView.m */; };
2625
833DF7FE1593836600793430 /* MFLEntityTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 833DF7FD1593836600793430 /* MFLEntityTableCellView.m */; };
2726
833FF6FD187860F1003ADCEA /* MFLConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 833FF6FC187860F1003ADCEA /* MFLConstants.m */; };
2827
834D1481156B52ED00317376 /* ApplicationIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 834D1480156B52ED00317376 /* ApplicationIcon.icns */; };
2928
8359411F159217770045B287 /* refreshButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 8359411E159217770045B287 /* refreshButton.png */; };
3029
835941221592351D0045B287 /* MFLCoreDataCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 835941211592351D0045B287 /* MFLCoreDataCommon.m */; };
3130
83656E6619378FB7003D0E74 /* CoreDataUtilityStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6519378FB7003D0E74 /* CoreDataUtilityStyle.m */; };
32-
83656E6919379D0C003D0E74 /* TransformableDataTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6819379D0C003D0E74 /* TransformableDataTableViewCell.m */; };
3331
83656E6E1937A73B003D0E74 /* ObjectInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6C1937A73B003D0E74 /* ObjectInfoController.m */; };
3432
83656E6F1937A73B003D0E74 /* ObjectInfoController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83656E6D1937A73B003D0E74 /* ObjectInfoController.xib */; };
3533
837C067B1A0E646600F4D5D4 /* MFLBuild.m in Sources */ = {isa = PBXBuildFile; fileRef = 837C067A1A0E646600F4D5D4 /* MFLBuild.m */; };
3634
838055C915A3A67200D050E7 /* ApplicationIcon-CDP.icns in Resources */ = {isa = PBXBuildFile; fileRef = 838055C715A3A67200D050E7 /* ApplicationIcon-CDP.icns */; };
3735
838055CA15A3A67200D050E7 /* ApplicationIcon-MOM.icns in Resources */ = {isa = PBXBuildFile; fileRef = 838055C815A3A67200D050E7 /* ApplicationIcon-MOM.icns */; };
38-
83922D381598F264004C273C /* MFLCellBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 83922D371598F264004C273C /* MFLCellBuilder.m */; };
3936
83AE7D3019FF1AB400DD152B /* SimulatorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 83AE7D2F19FF1AB400DD152B /* SimulatorItem.m */; };
4037
83AE7D3219FF1CE900DD152B /* simulatorIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 83AE7D3119FF1CE900DD152B /* simulatorIcon.png */; };
4138
83B158FD158F6AE2002B46C2 /* MFLCoreDataIntrospection.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B158FC158F6AE2002B46C2 /* MFLCoreDataIntrospection.m */; };
@@ -119,8 +116,6 @@
119116
832C9695159BD69E00AC8FA8 /* CoreData.ext */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = CoreData.ext; sourceTree = "<group>"; };
120117
832C9699159BDBB000AC8FA8 /* MFLCoreDataEditorProjectLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLCoreDataEditorProjectLoader.h; sourceTree = "<group>"; };
121118
832C969A159BDBB000AC8FA8 /* MFLCoreDataEditorProjectLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLCoreDataEditorProjectLoader.m; sourceTree = "<group>"; };
122-
833DF7F11593556000793430 /* MFLButtonTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLButtonTableViewCell.h; sourceTree = "<group>"; };
123-
833DF7F21593556000793430 /* MFLButtonTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLButtonTableViewCell.m; sourceTree = "<group>"; };
124119
833DF7F91593718600793430 /* MFLTextTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLTextTableCellView.h; sourceTree = "<group>"; };
125120
833DF7FA1593718600793430 /* MFLTextTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLTextTableCellView.m; sourceTree = "<group>"; };
126121
833DF7FC1593836600793430 /* MFLEntityTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLEntityTableCellView.h; sourceTree = "<group>"; };
@@ -133,17 +128,13 @@
133128
835941211592351D0045B287 /* MFLCoreDataCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLCoreDataCommon.m; sourceTree = "<group>"; };
134129
83656E6419378FB7003D0E74 /* CoreDataUtilityStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreDataUtilityStyle.h; sourceTree = "<group>"; };
135130
83656E6519378FB7003D0E74 /* CoreDataUtilityStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreDataUtilityStyle.m; sourceTree = "<group>"; };
136-
83656E6719379D0C003D0E74 /* TransformableDataTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformableDataTableViewCell.h; sourceTree = "<group>"; };
137-
83656E6819379D0C003D0E74 /* TransformableDataTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransformableDataTableViewCell.m; sourceTree = "<group>"; };
138131
83656E6B1937A73B003D0E74 /* ObjectInfoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectInfoController.h; sourceTree = "<group>"; };
139132
83656E6C1937A73B003D0E74 /* ObjectInfoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectInfoController.m; sourceTree = "<group>"; };
140133
83656E6D1937A73B003D0E74 /* ObjectInfoController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ObjectInfoController.xib; sourceTree = "<group>"; };
141134
837C06791A0E646600F4D5D4 /* MFLBuild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLBuild.h; sourceTree = "<group>"; };
142135
837C067A1A0E646600F4D5D4 /* MFLBuild.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLBuild.m; sourceTree = "<group>"; };
143136
838055C715A3A67200D050E7 /* ApplicationIcon-CDP.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "ApplicationIcon-CDP.icns"; sourceTree = "<group>"; };
144137
838055C815A3A67200D050E7 /* ApplicationIcon-MOM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "ApplicationIcon-MOM.icns"; sourceTree = "<group>"; };
145-
83922D361598F264004C273C /* MFLCellBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLCellBuilder.h; sourceTree = "<group>"; };
146-
83922D371598F264004C273C /* MFLCellBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLCellBuilder.m; sourceTree = "<group>"; };
147138
83AE7D2E19FF1AB400DD152B /* SimulatorItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatorItem.h; sourceTree = "<group>"; };
148139
83AE7D2F19FF1AB400DD152B /* SimulatorItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimulatorItem.m; sourceTree = "<group>"; };
149140
83AE7D3119FF1CE900DD152B /* simulatorIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = simulatorIcon.png; sourceTree = "<group>"; };
@@ -282,16 +273,10 @@
282273
children = (
283274
5B330A6E1590CB1E00D79D4D /* EntityDataTableViewCell.h */,
284275
5B330A6F1590CB1E00D79D4D /* EntityDataTableViewCell.m */,
285-
833DF7F11593556000793430 /* MFLButtonTableViewCell.h */,
286-
833DF7F21593556000793430 /* MFLButtonTableViewCell.m */,
287-
83922D361598F264004C273C /* MFLCellBuilder.h */,
288-
83922D371598F264004C273C /* MFLCellBuilder.m */,
289276
833DF7FC1593836600793430 /* MFLEntityTableCellView.h */,
290277
833DF7FD1593836600793430 /* MFLEntityTableCellView.m */,
291278
833DF7F91593718600793430 /* MFLTextTableCellView.h */,
292279
833DF7FA1593718600793430 /* MFLTextTableCellView.m */,
293-
83656E6719379D0C003D0E74 /* TransformableDataTableViewCell.h */,
294-
83656E6819379D0C003D0E74 /* TransformableDataTableViewCell.m */,
295280
);
296281
name = TableViewCells;
297282
sourceTree = "<group>";
@@ -634,7 +619,6 @@
634619
buildActionMask = 2147483647;
635620
files = (
636621
C1CEFE621463779D00466EB3 /* main.m in Sources */,
637-
83656E6919379D0C003D0E74 /* TransformableDataTableViewCell.m in Sources */,
638622
83656E6619378FB7003D0E74 /* CoreDataUtilityStyle.m in Sources */,
639623
C1CEFE691463779D00466EB3 /* MFLAppDelegate.m in Sources */,
640624
837C067B1A0E646600F4D5D4 /* MFLBuild.m in Sources */,
@@ -647,12 +631,10 @@
647631
83B158FD158F6AE2002B46C2 /* MFLCoreDataIntrospection.m in Sources */,
648632
5B330A701590CB1E00D79D4D /* EntityDataTableViewCell.m in Sources */,
649633
835941221592351D0045B287 /* MFLCoreDataCommon.m in Sources */,
650-
833DF7F31593556000793430 /* MFLButtonTableViewCell.m in Sources */,
651634
833DF7FB1593718600793430 /* MFLTextTableCellView.m in Sources */,
652635
83656E6E1937A73B003D0E74 /* ObjectInfoController.m in Sources */,
653636
833DF7FE1593836600793430 /* MFLEntityTableCellView.m in Sources */,
654637
830D04ED1598CC4D003874CA /* MFLMainWindowController.m in Sources */,
655-
83922D381598F264004C273C /* MFLCellBuilder.m in Sources */,
656638
832C969B159BDBB000AC8FA8 /* MFLCoreDataEditorProjectLoader.m in Sources */,
657639
5B2BA5C4159C9FEB00AFEC9D /* CoreDataHistoryObject.m in Sources */,
658640
833FF6FD187860F1003ADCEA /* MFLConstants.m in Sources */,

‎CoreDataUtil/EntityDataTableView.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ - (IBAction) copyFormatted:(id)sender
164164

165165
- (IBAction) copyCell:(id)sender {
166166
MFLTextTableCellView *cell = [self viewAtColumn:rightClickedCol row:rightClickedRow makeIfNecessary:NO];
167-
NSLog(@"copyCell: r:%d, c:%d, %@", (int)rightClickedRow, (int)rightClickedCol, cell.infoField.stringValue);
167+
NSLog(@"copyCell: r:%d, c:%d, %@", (int)rightClickedRow, (int)rightClickedCol, cell.text);
168168

169169
NSPasteboard *pb = [NSPasteboard generalPasteboard];
170170
[pb declareTypes:@[NSStringPboardType] owner:nil];
171-
[pb setString:cell.infoField.stringValue forType:NSStringPboardType];
171+
[pb setString:cell.text forType:NSStringPboardType];
172172
}
173173

174174
@end

‎CoreDataUtil/MFLButtonTableViewCell.h‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎CoreDataUtil/MFLButtonTableViewCell.m‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎CoreDataUtil/MFLCellBuilder.h‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎CoreDataUtil/MFLCellBuilder.m‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎CoreDataUtil/MFLMainWindowController.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
@class EntityTableView;
1616
@class EntityDataTableView;
1717

18+
typedef NS_ENUM(NSUInteger, EViewType) {
19+
ViewTypeString = 0,
20+
ViewTypeNumber,
21+
ViewTypeDate,
22+
ViewTypeLink,
23+
ViewTypeTransformable,
24+
};
25+
1826
@interface MFLMainWindowController : NSWindowController <NSTableViewDataSource, NSTableViewDelegate, MFLCoreDataIntrospectionDelegate, NSOutlineViewDataSource, NSOutlineViewDelegate, NSSplitViewDelegate, EntityTableViewDataSource>
1927

2028
@property (weak) IBOutlet EntityTableView *dataSourceList;

0 commit comments

Comments
 (0)