[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - ios/shared
Ptyl Dragon
ptyl at cloudon.com
Fri Nov 1 14:20:33 CET 2013
ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h | 6
ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m | 25 ++-
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h | 7
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m | 82 ++++++++--
4 files changed, 100 insertions(+), 20 deletions(-)
New commits:
commit 9e274de101a5b35665973a6cb17f41a85d2cd25f
Author: Ptyl Dragon <ptyl at cloudon.com>
Date: Fri Nov 1 15:19:42 2013 +0200
added linking of width and height
Change-Id: I2282fcfffed5c17eb1798d3198d6f04dc27208e9
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
index df0f70b..8465b5d 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
@@ -8,12 +8,15 @@
#import "MLOObject.h"
+typedef enum {WIDTH_IS_HEIGHT,WIDTH_IS_NOT_HEIGHT} MLOTestingTileParametersMode;
+#define MLOTestingTileParametersModeString(enum) [@[@"WIDTH_IS_HEIGHT",@"WIDTH_IS_NOT_HEIGHT"] objectAtIndex:enum]
+
typedef void (^MLOTestingTileParameterExtractor)(CGFloat value);
@class MLOTestingTileParametersViewController;
@interface MLOTestingTileParameter : MLOObject
--(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label extractor1:(MLOTestingTileParameterExtractor) extractor extractor2:(MLOTestingTileParameterExtractor) linkedExtractor defaultValue:(NSInteger) defaultValue;
--(void)extract:(BOOL) isExtractor1;
+-(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label widthIsNotHeightExtractor:(MLOTestingTileParameterExtractor) widthIsNotHeightExtractor widthIsHeightExtractor:(MLOTestingTileParameterExtractor) widthIsHeightExtractor defaultValue:(NSInteger) defaultValue;
+-(void)extractMode:(MLOTestingTileParametersMode) mode;
-(void)setParamFrame:(CGRect) paramFrame;
-(void)addToSuperview;
@end
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index b5fcd8d..9c0af4f 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -11,8 +11,8 @@
@interface MLOTestingTileParameter ()
@property MLOTestingTileParametersViewController * params;
- at property (nonatomic,strong) MLOTestingTileParameterExtractor extractor1;
- at property (nonatomic,strong) MLOTestingTileParameterExtractor extractor2;
+ at property (nonatomic,strong) MLOTestingTileParameterExtractor widthIsHeightExtractor;
+ at property (nonatomic,strong) MLOTestingTileParameterExtractor widthIsNotHeightExtractor;
@property UILabel * label;
@property UITextField * data;
@property UITextField * step;
@@ -25,13 +25,13 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
@implementation MLOTestingTileParameter
--(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label extractor1:(MLOTestingTileParameterExtractor) extractor1 extractor2:(MLOTestingTileParameterExtractor) extractor2 defaultValue:(NSInteger) defaultValue{
+-(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label widthIsNotHeightExtractor:(MLOTestingTileParameterExtractor) widthIsNotHeightExtractor widthIsHeightExtractor:(MLOTestingTileParameterExtractor) widthIsHeightExtractor defaultValue:(NSInteger) defaultValue{
NSLog(@"Creating tile testing param %@ with default value %d",label,defaultValue);
self = [self init];
if(self){
self.params = params;
- self.extractor1 = extractor1;
- self.extractor2 = extractor2;
+ self.widthIsHeightExtractor = widthIsHeightExtractor;
+ self.widthIsNotHeightExtractor = widthIsNotHeightExtractor;
self.defaultValue = defaultValue;
[self initLabel:label];
self.dataStepper = [self createStepper];
@@ -169,16 +169,20 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
return [self.data.text floatValue];
}
--(void)extract:(BOOL) isExtractor1{
-
- NSLog(@"%@ extract %d",self,isExtractor1?1:2);
-
- CGFloat dataValue = [self currentDataValue];
+-(MLOTestingTileParameterExtractor) getExtractor:(MLOTestingTileParametersMode) mode{
+ switch (mode) {
+ case WIDTH_IS_HEIGHT:
+ return self.widthIsHeightExtractor;
+ case WIDTH_IS_NOT_HEIGHT:
+ return self.widthIsNotHeightExtractor;
+ }
+}
- if(isExtractor1){
- self.extractor1(dataValue);
- }else{
- self.extractor2(dataValue);
+-(void)extractMode:(MLOTestingTileParametersMode) mode{
+ MLOTestingTileParameterExtractor extractor = [self getExtractor:mode];
+ if(extractor!=nil){
+ NSLog(@"%@ extract %@",self,MLOTestingTileParametersModeString(mode));
+ extractor([self currentDataValue]);
}
}
@end
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index c544f2a..4a235e1 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -17,6 +17,8 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
@property MLOAppRoleTileTester * tester;
@property NSArray * params;
@property UIButton * renderButton;
+ at property UIButton * modeButton;
+ at property MLOTestingTileParametersMode mode;
@end
@implementation MLOTestingTileParametersViewController
@@ -24,7 +26,9 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
self = [self init];
if(self){
self.tester = tester;
+ self.mode = WIDTH_IS_HEIGHT;
[self initParams];
+ [self initModeButton];
[self initRenderButton];
}
@@ -39,30 +43,30 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
-(void)initParams{
self.params = @[[self createParam:@"contextWidth"
- extractor1:^(CGFloat value){self.contextWidth = value;}
- extractor2:^(CGFloat value){self.contextWidth = self.contextHeight = value;}
+ widthIsNotHeightExtractor:^(CGFloat value){self.contextWidth = value;}
+ widthIsHeightExtractor:^(CGFloat value){self.contextWidth = self.contextHeight = value;}
value:CONTEXT_WIDTH_DEFAULT],
- [self createConditionalParam:@"contextHeight"
- extractor:^(CGFloat value){self.contextHeight = value;}
- value:CONTEXT_HEIGHT_DEFAULT],
+ [self createParam:@"contextHeight"
+ widthIsNotHeightExtractor:^(CGFloat value){self.contextHeight = value;}
+ value:CONTEXT_HEIGHT_DEFAULT],
- [self createNormalParam:@"tilePosX"
- extractor:^(CGFloat value){self.tilePosX = value;}
- value:TILE_POS_X_DEFAULT],
+ [self createParam:@"tilePosX"
+ anyExtractor:^(CGFloat value){self.tilePosX = value;}
+ value:TILE_POS_X_DEFAULT],
- [self createNormalParam:@"tilePosY"
- extractor:^(CGFloat value){self.tilePosY = value;}
- value:TILE_POS_Y_DEFAULT],
+ [self createParam:@"tilePosY"
+ anyExtractor:^(CGFloat value){self.tilePosY = value;}
+ value:TILE_POS_Y_DEFAULT],
[self createParam:@"tileWidth"
- extractor1:^(CGFloat value){self.tileWidth = value;}
- extractor2:^(CGFloat value){self.tileWidth = self.tileHeight = value;}
+ widthIsNotHeightExtractor:^(CGFloat value){self.tileWidth = value;}
+ widthIsHeightExtractor:^(CGFloat value){self.tileWidth = self.tileHeight = value;}
value:TILE_WIDTH_DEFAULT],
- [self createConditionalParam:@"tileHeight"
- extractor:^(CGFloat value){self.tileHeight = value;}
- value:TILE_HEIGHT_DEFAULT]
+ [self createParam:@"tileHeight"
+ widthIsNotHeightExtractor:^(CGFloat value){self.tileHeight = value;}
+ value:TILE_HEIGHT_DEFAULT]
];
}
@@ -73,16 +77,39 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
self.renderButton =button;
}
+-(void)initModeButton{
+ UIButton * button =[UIButton buttonWithType:UIButtonTypeRoundedRect];
+ [button addTarget:self action:@selector(changeMode) forControlEvents:UIControlEventTouchDown];
+ [button setTitle:MLOTestingTileParametersModeString(self.mode) forState:UIControlStateNormal];
+ self.modeButton =button;
+}
+
+-(void)changeMode{
--(MLOTestingTileParameter *) createNormalParam:(NSString *)name extractor:(MLOTestingTileParameterExtractor) extractor value:(CGFloat)defaultValue{
- return [self createParam:name extractor1:extractor extractor2:extractor value:defaultValue];}
+ switch (self.mode) {
+ case WIDTH_IS_HEIGHT:
+ self.mode = WIDTH_IS_NOT_HEIGHT;
+ break;
+ case WIDTH_IS_NOT_HEIGHT:
+ self.mode = WIDTH_IS_HEIGHT;
+ break;
+ }
--(MLOTestingTileParameter *) createConditionalParam:(NSString *)name extractor:(MLOTestingTileParameterExtractor) extractor value:(CGFloat)defaultValue{
- return [self createParam:name extractor1:extractor extractor2:nil value:defaultValue];
+ [self.modeButton setTitle:MLOTestingTileParametersModeString(self.mode) forState:UIControlStateNormal];
}
--(MLOTestingTileParameter *) createParam:(NSString *)name extractor1:(MLOTestingTileParameterExtractor) extractor1 extractor2:(MLOTestingTileParameterExtractor) extractor2 value:(CGFloat)defaultValue{
- return [[MLOTestingTileParameter alloc] initWithParams:self label:name extractor1:extractor1 extractor2:extractor2 defaultValue:defaultValue];
+
+
+-(MLOTestingTileParameter *) createParam:(NSString *)name anyExtractor:(MLOTestingTileParameterExtractor) anyExtractor value:(CGFloat)defaultValue{
+ return [self createParam:name widthIsNotHeightExtractor:anyExtractor widthIsHeightExtractor:anyExtractor value:defaultValue];
+}
+
+-(MLOTestingTileParameter *) createParam:(NSString *)name widthIsNotHeightExtractor:(MLOTestingTileParameterExtractor) widthIsNotHeightExtractor value:(CGFloat)defaultValue{
+ return [self createParam:name widthIsNotHeightExtractor:widthIsNotHeightExtractor widthIsHeightExtractor:nil value:defaultValue];
+}
+
+-(MLOTestingTileParameter *) createParam:(NSString *)name widthIsNotHeightExtractor:(MLOTestingTileParameterExtractor) extractor1 widthIsHeightExtractor:(MLOTestingTileParameterExtractor) extractor2 value:(CGFloat)defaultValue{
+ return [[MLOTestingTileParameter alloc] initWithParams:self label:name widthIsNotHeightExtractor:extractor1 widthIsHeightExtractor:extractor2 defaultValue:defaultValue];
}
@@ -103,9 +130,14 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
paramHeight)];
originY+=paramHeight;
}
- self.renderButton.frame = CGRectMake(0,
+ CGFloat halfWidth = width/2.0f;
+ self.modeButton.frame = CGRectMake(0,
+ originY,
+ halfWidth,
+ RENDER_BUTTON_HEIGHT);
+ self.renderButton.frame = CGRectMake(halfWidth,
originY,
- width,
+ halfWidth,
RENDER_BUTTON_HEIGHT);
}
@@ -117,13 +149,14 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
}
[self.view addSubview:self.renderButton];
+ [self.view addSubview:self.modeButton];
}
-(void)renderTile{
NSLog(@"%@ renderTile",self);
for (MLOTestingTileParameter * param in self.params) {
- [param extract];
+ [param extractMode:self.mode];
}
[self.tester.renderer render];
}
commit 5b3da48eb94750de7fb2f029afc6d45ef753c4b1
Author: Ptyl Dragon <ptyl at cloudon.com>
Date: Fri Nov 1 14:47:04 2013 +0200
in progress of linkinh width and height
Change-Id: I2d7f5a7bd41b8d2c4a62d199abb81afc466fc2ce
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
index 2f31281..df0f70b 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
@@ -8,13 +8,12 @@
#import "MLOObject.h"
-
typedef void (^MLOTestingTileParameterExtractor)(CGFloat value);
@class MLOTestingTileParametersViewController;
@interface MLOTestingTileParameter : MLOObject
--(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label extractor:(MLOTestingTileParameterExtractor) extractor defaultValue:(NSInteger) defaultValue;
--(void)extract;
+-(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label extractor1:(MLOTestingTileParameterExtractor) extractor extractor2:(MLOTestingTileParameterExtractor) linkedExtractor defaultValue:(NSInteger) defaultValue;
+-(void)extract:(BOOL) isExtractor1;
-(void)setParamFrame:(CGRect) paramFrame;
-(void)addToSuperview;
@end
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index 1107eef..b5fcd8d 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -11,7 +11,8 @@
@interface MLOTestingTileParameter ()
@property MLOTestingTileParametersViewController * params;
- at property (nonatomic,strong) MLOTestingTileParameterExtractor extractor;
+ at property (nonatomic,strong) MLOTestingTileParameterExtractor extractor1;
+ at property (nonatomic,strong) MLOTestingTileParameterExtractor extractor2;
@property UILabel * label;
@property UITextField * data;
@property UITextField * step;
@@ -24,12 +25,13 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
@implementation MLOTestingTileParameter
--(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label extractor:(MLOTestingTileParameterExtractor) extractor defaultValue:(NSInteger) defaultValue{
+-(MLOTestingTileParameter *)initWithParams:(MLOTestingTileParametersViewController *) params label:(NSString *)label extractor1:(MLOTestingTileParameterExtractor) extractor1 extractor2:(MLOTestingTileParameterExtractor) extractor2 defaultValue:(NSInteger) defaultValue{
NSLog(@"Creating tile testing param %@ with default value %d",label,defaultValue);
self = [self init];
if(self){
self.params = params;
- self.extractor = extractor;
+ self.extractor1 = extractor1;
+ self.extractor2 = extractor2;
self.defaultValue = defaultValue;
[self initLabel:label];
self.dataStepper = [self createStepper];
@@ -167,9 +169,16 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
return [self.data.text floatValue];
}
--(void)extract{
- NSLog(@"%@ extract",self);
+-(void)extract:(BOOL) isExtractor1{
- self.extractor([self currentDataValue]);
+ NSLog(@"%@ extract %d",self,isExtractor1?1:2);
+
+ CGFloat dataValue = [self currentDataValue];
+
+ if(isExtractor1){
+ self.extractor1(dataValue);
+ }else{
+ self.extractor2(dataValue);
+ }
}
@end
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h
index 47c6a6e..ffbf903 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h
@@ -9,6 +9,13 @@
#import "MLOViewController.h"
#import "MLOTestingTileSubviewControllerProtocol.h"
+static const CGFloat CONTEXT_WIDTH_DEFAULT = 600;
+static const CGFloat CONTEXT_HEIGHT_DEFAULT = 600;
+static const CGFloat TILE_POS_X_DEFAULT = 500;
+static const CGFloat TILE_POS_Y_DEFAULT = 620;
+static const CGFloat TILE_WIDTH_DEFAULT = 1000;
+static const CGFloat TILE_HEIGHT_DEFAULT = 1020;
+
@interface MLOTestingTileParametersViewController : MLOViewController<MLOTestingTileSubviewControllerProtocol>
@property CGFloat contextWidth, contextHeight, tilePosX, tilePosY, tileWidth, tileHeight;
-(void)renderTile;
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index 4feee1e..c544f2a 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -18,7 +18,6 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
@property NSArray * params;
@property UIButton * renderButton;
@end
-
@implementation MLOTestingTileParametersViewController
-(id)initWithTester:(MLOAppRoleTileTester *)tester{
@@ -39,12 +38,31 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
}
-(void)initParams{
- self.params = @[[self createParam:@"contextWidth" extractor:^(CGFloat value){self.contextWidth = value;} value:600],
- [self createParam:@"contextHeight" extractor:^(CGFloat value){self.contextHeight = value;} value:600],
- [self createParam:@"tilePosX" extractor:^(CGFloat value){self.tilePosX = value;} value:500],
- [self createParam:@"tilePosY" extractor:^(CGFloat value){self.tilePosY = value;} value:620],
- [self createParam:@"tileWidth" extractor:^(CGFloat value){self.tileWidth = value;} value:1000],
- [self createParam:@"tileHeight" extractor:^(CGFloat value){self.tileHeight = value;} value:1020]
+ self.params = @[[self createParam:@"contextWidth"
+ extractor1:^(CGFloat value){self.contextWidth = value;}
+ extractor2:^(CGFloat value){self.contextWidth = self.contextHeight = value;}
+ value:CONTEXT_WIDTH_DEFAULT],
+
+ [self createConditionalParam:@"contextHeight"
+ extractor:^(CGFloat value){self.contextHeight = value;}
+ value:CONTEXT_HEIGHT_DEFAULT],
+
+ [self createNormalParam:@"tilePosX"
+ extractor:^(CGFloat value){self.tilePosX = value;}
+ value:TILE_POS_X_DEFAULT],
+
+ [self createNormalParam:@"tilePosY"
+ extractor:^(CGFloat value){self.tilePosY = value;}
+ value:TILE_POS_Y_DEFAULT],
+
+ [self createParam:@"tileWidth"
+ extractor1:^(CGFloat value){self.tileWidth = value;}
+ extractor2:^(CGFloat value){self.tileWidth = self.tileHeight = value;}
+ value:TILE_WIDTH_DEFAULT],
+
+ [self createConditionalParam:@"tileHeight"
+ extractor:^(CGFloat value){self.tileHeight = value;}
+ value:TILE_HEIGHT_DEFAULT]
];
}
@@ -56,8 +74,15 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
}
--(MLOTestingTileParameter *) createParam:(NSString *)name extractor:(MLOTestingTileParameterExtractor) extractor value:(CGFloat)defaultValue{
- return [[MLOTestingTileParameter alloc] initWithParams:self label:name extractor:extractor defaultValue:defaultValue];
+-(MLOTestingTileParameter *) createNormalParam:(NSString *)name extractor:(MLOTestingTileParameterExtractor) extractor value:(CGFloat)defaultValue{
+ return [self createParam:name extractor1:extractor extractor2:extractor value:defaultValue];}
+
+-(MLOTestingTileParameter *) createConditionalParam:(NSString *)name extractor:(MLOTestingTileParameterExtractor) extractor value:(CGFloat)defaultValue{
+ return [self createParam:name extractor1:extractor extractor2:nil value:defaultValue];
+}
+
+-(MLOTestingTileParameter *) createParam:(NSString *)name extractor1:(MLOTestingTileParameterExtractor) extractor1 extractor2:(MLOTestingTileParameterExtractor) extractor2 value:(CGFloat)defaultValue{
+ return [[MLOTestingTileParameter alloc] initWithParams:self label:name extractor1:extractor1 extractor2:extractor2 defaultValue:defaultValue];
}
More information about the Libreoffice-commits
mailing list