Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch to merge with ideastouch #22

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Xcode
build/*
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "iOSPlot/JSONKit"]
path = iOSPlot/JSONKit
url = git://github.com/johnezang/JSONKit.git
[submodule "iOSPlot/FPPopover"]
path = iOSPlot/FPPopover
url = https://github.com/50pixels/FPPopover.git
Binary file added iOSPlot/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions iOSPlot/FPPopover
Submodule FPPopover added at 9fbe74
21 changes: 21 additions & 0 deletions iOSPlot/PieChartPopover.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// PieChartPopover.h
// PlotCreator
//
// Created by gustavo halperin on 8/16/12.
//
//

#import <UIKit/UIKit.h>

@interface PieChartPopover : UIViewController

@property (strong, nonatomic) IBOutlet NSString *chartTitle;
@property (strong, nonatomic) IBOutlet NSString *chartSubTitle;
@property (strong, nonatomic) IBOutlet NSString *chartContent;

@property (strong, nonatomic) IBOutlet UILabel *titleLabel;
@property (strong, nonatomic) IBOutlet UILabel *subTitleLabel;
@property (strong, nonatomic) IBOutlet UITextView *contentTextView;

@end
59 changes: 59 additions & 0 deletions iOSPlot/PieChartPopover.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
//
// PieChartPopover.m
// PlotCreator
//
// Created by gustavo halperin on 8/16/12.
//
//

#import "PieChartPopover.h"

@interface PieChartPopover ()

@end

@implementation PieChartPopover
@synthesize chartTitle = _chartTitle;
@synthesize chartSubTitle = _chartSubTitle;
@synthesize chartContent = _chartContent;
@synthesize titleLabel = _titleLabel;
@synthesize subTitleLabel = _subTitleLabel;
@synthesize contentTextView = _contentTextView;

- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
// Custom initialization
}
return self;
}

- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
self.titleLabel.text = _chartTitle;
self.subTitleLabel.text = _chartSubTitle;
self.contentTextView.text = _chartContent;
}

- (void)viewDidUnload
{
[super viewDidUnload];
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;
[self setChartTitle:nil];
[self setChartSubTitle:nil];
[self setChartContent:nil];
[self setTitleLabel:nil];
[self setSubTitleLabel:nil];
[self setContentTextView:nil];
}

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
return YES;
}

@end
Loading