Skip to content

Commit 75f1c47

Browse files
committed
cleaning
1 parent 9dd56dc commit 75f1c47

22 files changed

+682
-2656
lines changed

AppController.h

+4-64
Original file line numberDiff line numberDiff line change
@@ -8,65 +8,33 @@
88

99
#import <Cocoa/Cocoa.h>
1010
#import <WebKit/WebKit.h>
11-
#import "TrackNode.h"
12-
#import "ControlController.h"
13-
#import "PointNode.h"
1411

1512
@class PreferencesController;
1613
@class PhotoNode;
14+
@class SideBarDataSource;
1715

1816
@interface AppController : NSObject {
1917
IBOutlet NSWindow *mainWindow;
20-
IBOutlet NSArrayController *datos;
21-
IBOutlet NSTreeController *links;
22-
IBOutlet NSTableView *tabla;
2318

24-
IBOutlet NSProgressIndicator *progress;
25-
IBOutlet NSTextFieldCell *progressText;
26-
27-
IBOutlet NSTextFieldCell *__weak statusBar;
2819
IBOutlet NSTextFieldCell *timeOffsetTXT;
2920
IBOutlet NSSlider *timeOffset;
3021
IBOutlet NSPopUpButton *timeZones;
3122

3223
IBOutlet WebView *web;
3324

34-
IBOutlet ControlController *control;
35-
IBOutlet NSButton *iniLock;
36-
IBOutlet NSButton *finLock;
37-
3825
IBOutlet NSImageView *imageViewer;
39-
40-
IBOutlet NSForm *deviceInfo;
41-
42-
NSMutableArray *rootArray;
43-
NSArray *points;
44-
NSTreeNode *wayPoints;
45-
NSTreeNode *tracks;
46-
NSTreeNode *photos;
47-
48-
int selectedPoint;
26+
4927
PhotoNode *selectedPhoto;
50-
int iniMapaPoint;
51-
int finMapaPoint;
5228
TrackNode *selectedTrack;
53-
54-
NSMutableDictionary *photosByName;
55-
56-
NSString *devicePath;
5729

5830
NSDateFormatter *sISO8601;
31+
IBOutlet __weak SideBarDataSource *sideBarDS;
32+
IBOutlet __weak NSOutlineView *sideBar;
5933
}
6034

61-
@property (readonly) NSTextFieldCell *statusBar;
62-
@property (copy) NSString *devicePath;
63-
@property (copy) PhotoNode *selectedPhoto;
64-
65-
- (void)addImages:(NSArray *)arrayPhotos;
6635

6736
- (IBAction)readFromLoggerAction:(id)sender;
6837
- (IBAction)addImagesAction:(id)sender;
69-
- (IBAction)noveSelectedPoind:(id)sender;
7038

7139
- (IBAction)setPrecisionOffSet:(id)sender;
7240

@@ -82,50 +50,22 @@
8250

8351
- (void)positionImages;
8452

85-
-(IBAction)setIniMapPointAction:(id)sender;
86-
-(IBAction)setFinMapPointAction:(id)sender;
87-
-(void)setIniMapPoint:(int)point;
88-
-(void)setFinMapPoint:(int)point;
89-
-(void)updateMap;
90-
91-
- (NSDictionary *)encodeTrack:(int)ini to:(int)fin;
92-
93-
- (void)addImagesFromDisk:(NSArray *)files;
94-
95-
- (IBAction)updateView:(id)sender;
9653
- (void)updateTrack:(TrackNode *)node;
97-
- (void)updateWayPoint:(PointNode *)node;
98-
99-
- (void)setSelectedPoint:(int)index;
10054

10155
- (void)awakeFromNib;
102-
- (NSProgressIndicator *)progress;
10356
- (NSNumber *)calcAngle:(long)angle;
10457
- (NSDate *)calcDate:(long) date;
105-
- (GPSPoint *)findPoint:(NSDate *)fecha ini:(int)ini fin:(int)fin;
10658

107-
- (NSDate *)calcDateXML:(NSXMLNode *)date;
10859

10960
- (NSString *)encode:(double)pos;
110-
- (NSNumber *)calcAngleXML:(NSXMLNode *)angle;
111-
112-
- (void)parsePoints:(NSArray *)tmpPoints;
11361

11462
- (void)webView:(WebView *)sender setStatusText:(NSString *)text;
11563
- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame;
11664
- (void)webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)windowObject forFrame:(WebFrame *)frame;
11765
+ (BOOL)isSelectorExcludedFromWebScript:(SEL)selector;
11866

119-
- (void)selectPhotoById:(NSString *)txt;
12067
- (void)selectPhoto:(PhotoNode *)ph;
12168

122-
- (void)readFromGPXFile:(NSString *)file;
123-
- (void)readFromNMEA0183:(NSURL *)file;
124-
12569
- (IBAction)updateTimeOffset:(id)sender;
12670

127-
static void initUSB(AppController *app);
128-
static void MyDeviceAddedCallback(void *refCon, io_iterator_t it);
129-
static void MyDeviceRemovedCallback(void *refCon, io_iterator_t it);
130-
13171
@end

0 commit comments

Comments
 (0)