diff --git a/contrib/mobile/Trackball.cpp b/contrib/mobile/Trackball.cpp index ad4d56ec5abcfe2512a657d471e96b2cfb7681fe..25a5714d632407165388dcc86959bcbd568d82f2 100644 --- a/contrib/mobile/Trackball.cpp +++ b/contrib/mobile/Trackball.cpp @@ -99,7 +99,7 @@ vsub(const double *src1, const double *src2, double *dst) void vcopy(const double *v1, double *v2) { - register int i; + /* register */ int i; for (i = 0 ; i < 3 ; i++) v2[i] = v1[i]; } @@ -186,13 +186,13 @@ trackball(double q[4], double p1x, double p1y, double p2x, double p2y) * Now, we want the cross product of P1 and P2 */ vcross(p2,p1,a); - + /* * Figure out how much to rotate around that axis. */ vsub(p1,p2,d); t = vlength(d); - + /* * Avoid problems with out-of-control values... */ @@ -225,9 +225,9 @@ tb_project_to_sphere(double r, double x, double y) d = sqrt(x*x + y*y); - if (d < r ) { + if (d < r ) { z = sqrt(r*r - d*d); - } else { + } else { z = 0.; } diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm index 14e1fc1d5060480f8c0c0e057969be40105e5819..c0a295398d7a4d74a253257f289ef3a9c94ed705 100644 --- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm +++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm @@ -65,34 +65,32 @@ NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:p]; if(!indexPath) return; NSMutableArray* section = [_sections objectAtIndex:indexPath.section]; - if(!section) return; - Parameter * parameter = [section objectAtIndex:indexPath.row]; - if(!parameter) return; - NSString *name = [parameter getName]; - NSLog(@"Long press on %@", name); - - std::vector<onelab::number> number; - onelab::server::instance()->get(number,[name UTF8String]); - if(number.size() && !number[0].getReadOnly()){ - NSLog(@" -- number param with value %g", number[0].getValue()); - UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:@"Manually edit %s", number[0].getShortName().c_str()] message:name delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"Ok", nil]; - alertView.alertViewStyle = UIAlertViewStylePlainTextInput; - [alertView textFieldAtIndex:0].text = [NSString stringWithFormat:@"%g", number[0].getValue()]; - [alertView show]; - [parameter refresh]; - } + if(!section) return; + Parameter * parameter = [section objectAtIndex:indexPath.row]; + if(!parameter) return; + NSString *name = [parameter getName]; + std::vector<onelab::number> number; + onelab::server::instance()->get(number,[name UTF8String]); + if(number.size() && !number[0].getReadOnly()){ + NSLog(@"Manual edit of parameter '%s' with value '%g'", number[0].getName().c_str(), number[0].getValue()); + UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:@"%s", number[0].getShortName().c_str()] message:name delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"Ok", nil]; + alertView.alertViewStyle = UIAlertViewStylePlainTextInput; + [alertView textFieldAtIndex:0].text = [NSString stringWithFormat:@"%g", number[0].getValue()]; + [alertView show]; + [parameter refresh]; + } } -(void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { - NSLog(@"%@ -> %@", [alertView message], [alertView textFieldAtIndex:0].text); - std::vector<onelab::number> number; - onelab::server::instance()->get(number,[[alertView message] UTF8String]); - if(number.size()){ - double value = [[alertView textFieldAtIndex:0].text doubleValue]; - number[0].setValue(value); - onelab::server::instance()->set(number[0]); - [self refreshTableView]; - } + NSLog(@"%@ -> %@", [alertView message], [alertView textFieldAtIndex:0].text); + std::vector<onelab::number> number; + onelab::server::instance()->get(number,[[alertView message] UTF8String]); + if(number.size()){ + double value = [[alertView textFieldAtIndex:0].text doubleValue]; + number[0].setValue(value); + onelab::server::instance()->set(number[0]); + [self refreshTableView]; + } } - (void)indexDidChangeForSegmentedControl:(id)sender {