diff --git a/contrib/mobile/iOS/Onelab/EAGLView.mm b/contrib/mobile/iOS/Onelab/EAGLView.mm index 0155e55d4dd2ba7367d7df5be6bc50c4d9675b97..7555624d5321238733b64fbb95a4798d80552c33 100644 --- a/contrib/mobile/iOS/Onelab/EAGLView.mm +++ b/contrib/mobile/iOS/Onelab/EAGLView.mm @@ -33,10 +33,10 @@ CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer; eaglLayer.opaque = YES; eaglLayer.drawableProperties = - [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], - kEAGLDrawablePropertyRetainedBacking, - kEAGLColorFormatRGBA8, - kEAGLDrawablePropertyColorFormat, nil]; + [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], + kEAGLDrawablePropertyRetainedBacking, + kEAGLColorFormatRGBA8, + kEAGLDrawablePropertyColorFormat, nil]; context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1]; if (!context || ![EAGLContext setCurrentContext:context]) { //[self release]; diff --git a/contrib/mobile/iOS/Onelab/ModelViewController.mm b/contrib/mobile/iOS/Onelab/ModelViewController.mm index ac352bb2fe774f893e73eed472bc4083dd1af084..95d0679d16f24100a4493b926db16ac7e4667ca3 100644 --- a/contrib/mobile/iOS/Onelab/ModelViewController.mm +++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm @@ -74,6 +74,7 @@ [self.navigationController setToolbarHidden:YES animated:YES]; if(self.initialModel != nil){ [self.glView load:self.initialModel]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshParameters" object:nil]; //[self.initialModel release]; self.initialModel = nil; [_loadingAlert dismissWithClickedButtonIndex:-1 animated:YES]; @@ -156,7 +157,7 @@ { onelab_cb("stop"); } -- (IBAction)pinch:(UIPinchGestureRecognizer *)sender +-(IBAction)pinch:(UIPinchGestureRecognizer *)sender { if([sender numberOfTouches] > 2) return; float mScale = scaleFactor; diff --git a/contrib/mobile/iOS/Onelab/Onelab-Info.plist b/contrib/mobile/iOS/Onelab/Onelab-Info.plist index 8d8d83ac590847c7686aa14e31c2f656d4e45d2c..68885ed02eb881f8d43e628fa7bf1da591b6137b 100644 --- a/contrib/mobile/iOS/Onelab/Onelab-Info.plist +++ b/contrib/mobile/iOS/Onelab/Onelab-Info.plist @@ -40,14 +40,10 @@ <array> <string>onelab</string> </array> - <key>NSDocumentClass</key> - <string>Document</string> + <key>CFBundleTypeName</key> + <string>Onelab package</string> <key>LSTypeIsPackage</key> - <true/> - <key>CFBundleTypeName</key> - <string>Onelab</string> - <key>LSHandlerRank</key> - <string>None</string> + <true/> </dict> </array> <key>LSRequiresIPhoneOS</key> diff --git a/contrib/mobile/iOS/Onelab/OptionsViewController.mm b/contrib/mobile/iOS/Onelab/OptionsViewController.mm index a572a7d6f2b461f7b064b8c7441b2c7c7a2db7e9..18cdaf55c64c5d39d59fec9160f78e78782abb3f 100644 --- a/contrib/mobile/iOS/Onelab/OptionsViewController.mm +++ b/contrib/mobile/iOS/Onelab/OptionsViewController.mm @@ -50,6 +50,8 @@ [control addTarget:self action:@selector(indexDidChangeForSegmentedControl:) forControlEvents:UIControlEventValueChanged]; if(![[UIDevice currentDevice].model isEqualToString:@"iPad"] && ![[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)]; + else + self.navigationItem.hidesBackButton = true; } - (void)viewWillAppear:(BOOL)animated { diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm index 8567af011c58e8f6fdfd8d555590883dbb41217c..468ed6f9e2aa3afc1371fce8dfdbfc62a2fdfc9b 100644 --- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm +++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm @@ -101,6 +101,12 @@ [self.tableView insertRowsAtIndexPaths:[[NSArray alloc] initWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic]; [self.tableView endUpdates]; } +- (void)removeParemeterNumber:(onelab::number)p atIndex:(NSIndexPath*)index +{ + [self.tableView beginUpdates]; + [self.tableView deleteRowsAtIndexPaths: [NSArray arrayWithObject:index] withRowAnimation:UITableViewRowAnimationAutomatic]; + [self.tableView endUpdates]; +} - (void)addSection:(NSMutableArray*)s withTitle:(NSString*)t withParameterNumber:(onelab::number)p { [_sections addObject:s]; @@ -137,7 +143,10 @@ for(int iparameter = 0; iparameter<[section count]; iparameter++) { if([[[section objectAtIndex: iparameter] getName] isEqualToString:name]) { // The parameter is in the section Parameter * p = [section objectAtIndex: iparameter]; - [p refresh]; // just refresh the parameter + if(number[i].getVisible()) + [p refresh]; // just refresh the parameter + else + [self removeParemeterNumber:number[i] atIndex:[NSIndexPath indexPathForRow:iparameter inSection:iSection]]; found = true; break; }