From adc51a0c13c5a2327d1efe039b0ce376445e76f7 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Fri, 23 Aug 2013 08:50:38 +0000
Subject: [PATCH] iOS: Renaming classes
---
.../iOS/Onelab.xcodeproj/project.pbxproj | 48 ++++++++--------
.../mobile/iOS/Onelab/ModelListController.mm | 4 +-
...ViewController.h => ModelViewController.h} | 2 +-
...ewController.mm => ModelViewController.mm} | 6 +-
...ewController.h => OptionsViewController.h} | 4 +-
...Controller.mm => OptionsViewController.mm} | 15 ++---
.../iOS/Onelab/{parameter.h => Parameter.h} | 12 ++--
.../iOS/Onelab/{parameter.mm => Parameter.mm} | 12 ++--
...ontroller.h => ParametersViewController.h} | 6 +-
...troller.mm => ParametersViewController.mm} | 55 +++++++++----------
.../mobile/iOS/Onelab/SplitViewController.h | 8 +--
.../mobile/iOS/Onelab/SplitViewController.mm | 12 ++--
.../Onelab/en.lproj/iPadStoryboard.storyboard | 8 +--
13 files changed, 93 insertions(+), 99 deletions(-)
rename contrib/mobile/iOS/Onelab/{DetailViewController.h => ModelViewController.h} (84%)
rename contrib/mobile/iOS/Onelab/{DetailViewController.mm => ModelViewController.mm} (99%)
rename contrib/mobile/iOS/Onelab/{PostProViewController.h => OptionsViewController.h} (59%)
rename contrib/mobile/iOS/Onelab/{PostProViewController.mm => OptionsViewController.mm} (97%)
rename contrib/mobile/iOS/Onelab/{parameter.h => Parameter.h} (78%)
rename contrib/mobile/iOS/Onelab/{parameter.mm => Parameter.mm} (98%)
rename contrib/mobile/iOS/Onelab/{MasterViewController.h => ParametersViewController.h} (74%)
rename contrib/mobile/iOS/Onelab/{MasterViewController.mm => ParametersViewController.mm} (88%)
diff --git a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
index 34cd4555d0..42d093315b 100644
--- a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
+++ b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
@@ -7,15 +7,15 @@
objects = {
/* Begin PBXBuildFile section */
- 9C1C10FA17BA5E7D00BFD483 /* PostProViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C1C10F917BA5E7D00BFD483 /* PostProViewController.mm */; };
+ 9C1C10FA17BA5E7D00BFD483 /* OptionsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C1C10F917BA5E7D00BFD483 /* OptionsViewController.mm */; };
9C6A645817A7C3DB00DEDAFC /* drawString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C6A645617A7C3DB00DEDAFC /* drawString.cpp */; };
9C95B7F61726C88E00C0CCE2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C95B7F51726C88E00C0CCE2 /* main.mm */; };
9C96083B1712C16300E1D4A0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C96083A1712C16300E1D4A0 /* UIKit.framework */; };
9C96083D1712C16300E1D4A0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C96083C1712C16300E1D4A0 /* Foundation.framework */; };
9C96083F1712C16300E1D4A0 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C96083E1712C16300E1D4A0 /* CoreGraphics.framework */; };
9C96084B1712C16400E1D4A0 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C96084A1712C16300E1D4A0 /* AppDelegate.mm */; };
- 9C9608511712C16400E1D4A0 /* MasterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C9608501712C16400E1D4A0 /* MasterViewController.mm */; };
- 9C9608541712C16400E1D4A0 /* DetailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C9608531712C16400E1D4A0 /* DetailViewController.mm */; };
+ 9C9608511712C16400E1D4A0 /* ParametersViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C9608501712C16400E1D4A0 /* ParametersViewController.mm */; };
+ 9C9608541712C16400E1D4A0 /* ModelViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C9608531712C16400E1D4A0 /* ModelViewController.mm */; };
9C9608741712C47200E1D4A0 /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C9608731712C47200E1D4A0 /* EAGLView.mm */; };
9C9608991712C7B600E1D4A0 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C9608981712C7B600E1D4A0 /* Accelerate.framework */; };
9C96089B1712C7BE00E1D4A0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C96089A1712C7BE00E1D4A0 /* OpenGLES.framework */; };
@@ -32,7 +32,7 @@
9CE08E12178AEB1600A83B4B /* petsc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CE08E0F178AEB1600A83B4B /* petsc.framework */; };
9CE08E13178AEC5F00A83B4B /* drawContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CE08E01178AE6BE00A83B4B /* drawContext.cpp */; };
9CE08E17178AEC5F00A83B4B /* Trackball.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CE08E04178AE6BE00A83B4B /* Trackball.cpp */; };
- 9CE18C2017B27EDB009BA06E /* parameter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9CE18C1F17B27EDB009BA06E /* parameter.mm */; };
+ 9CE18C2017B27EDB009BA06E /* Parameter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9CE18C1F17B27EDB009BA06E /* Parameter.mm */; };
9CE1A65717B0F39D00E5152F /* Utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9CE1A65617B0F39D00E5152F /* Utils.mm */; };
9CE1A65A17B0FB9700E5152F /* iPhoneiPodStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9CE1A65817B0FB9600E5152F /* iPhoneiPodStoryboard.storyboard */; };
9CEAE86E17AF824B00813524 /* iosGModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CEAE86D17AF824B00813524 /* iosGModel.cpp */; };
@@ -42,8 +42,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 9C1C10F817BA5E7D00BFD483 /* PostProViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostProViewController.h; sourceTree = "<group>"; };
- 9C1C10F917BA5E7D00BFD483 /* PostProViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PostProViewController.mm; sourceTree = "<group>"; };
+ 9C1C10F817BA5E7D00BFD483 /* OptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsViewController.h; sourceTree = "<group>"; };
+ 9C1C10F917BA5E7D00BFD483 /* OptionsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OptionsViewController.mm; sourceTree = "<group>"; };
9C6A645617A7C3DB00DEDAFC /* drawString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drawString.cpp; sourceTree = "<group>"; usesTabs = 1; };
9C6A645717A7C3DB00DEDAFC /* drawString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drawString.h; sourceTree = "<group>"; usesTabs = 1; };
9C95B7F51726C88E00C0CCE2 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
@@ -53,10 +53,10 @@
9C96083E1712C16300E1D4A0 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
9C9608491712C16300E1D4A0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; usesTabs = 1; };
9C96084A1712C16300E1D4A0 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; usesTabs = 1; };
- 9C96084F1712C16400E1D4A0 /* MasterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MasterViewController.h; sourceTree = "<group>"; usesTabs = 1; };
- 9C9608501712C16400E1D4A0 /* MasterViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MasterViewController.mm; sourceTree = "<group>"; usesTabs = 1; };
- 9C9608521712C16400E1D4A0 /* DetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DetailViewController.h; sourceTree = "<group>"; usesTabs = 1; };
- 9C9608531712C16400E1D4A0 /* DetailViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DetailViewController.mm; sourceTree = "<group>"; usesTabs = 1; };
+ 9C96084F1712C16400E1D4A0 /* ParametersViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParametersViewController.h; sourceTree = "<group>"; usesTabs = 1; };
+ 9C9608501712C16400E1D4A0 /* ParametersViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ParametersViewController.mm; sourceTree = "<group>"; usesTabs = 1; };
+ 9C9608521712C16400E1D4A0 /* ModelViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ModelViewController.h; sourceTree = "<group>"; usesTabs = 1; };
+ 9C9608531712C16400E1D4A0 /* ModelViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ModelViewController.mm; sourceTree = "<group>"; usesTabs = 1; };
9C96085B1712C16400E1D4A0 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
9C9608721712C47200E1D4A0 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EAGLView.h; sourceTree = "<group>"; usesTabs = 1; };
9C9608731712C47200E1D4A0 /* EAGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EAGLView.mm; sourceTree = "<group>"; usesTabs = 1; };
@@ -79,8 +79,8 @@
9CE08E0D178AEB1600A83B4B /* GetDP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GetDP.framework; path = Onelab/frameworks/GetDP.framework; sourceTree = "<group>"; };
9CE08E0E178AEB1600A83B4B /* Gmsh.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Gmsh.framework; path = Onelab/frameworks/Gmsh.framework; sourceTree = "<group>"; };
9CE08E0F178AEB1600A83B4B /* petsc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = petsc.framework; path = Onelab/frameworks/petsc.framework; sourceTree = "<group>"; };
- 9CE18C1E17B27EDB009BA06E /* parameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter.h; sourceTree = "<group>"; usesTabs = 1; };
- 9CE18C1F17B27EDB009BA06E /* parameter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = parameter.mm; sourceTree = "<group>"; usesTabs = 1; };
+ 9CE18C1E17B27EDB009BA06E /* Parameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Parameter.h; sourceTree = "<group>"; usesTabs = 1; };
+ 9CE18C1F17B27EDB009BA06E /* Parameter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Parameter.mm; sourceTree = "<group>"; usesTabs = 1; };
9CE1A65517B0F39C00E5152F /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; usesTabs = 1; };
9CE1A65617B0F39D00E5152F /* Utils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Utils.mm; sourceTree = "<group>"; usesTabs = 1; };
9CE1A65917B0FB9700E5152F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/iPhoneiPodStoryboard.storyboard; sourceTree = "<group>"; };
@@ -172,18 +172,18 @@
9CE08E04178AE6BE00A83B4B /* Trackball.cpp */,
9CE1A65517B0F39C00E5152F /* Utils.h */,
9CE1A65617B0F39D00E5152F /* Utils.mm */,
- 9CE18C1E17B27EDB009BA06E /* parameter.h */,
- 9CE18C1F17B27EDB009BA06E /* parameter.mm */,
+ 9CE18C1E17B27EDB009BA06E /* Parameter.h */,
+ 9CE18C1F17B27EDB009BA06E /* Parameter.mm */,
9CEAECC517A91CD20014D229 /* ModelListController.h */,
9CEAECC617A91CD20014D229 /* ModelListController.mm */,
9CEAE87B17AFD5BB00813524 /* SplitViewController.h */,
9CEAE87C17AFD5BB00813524 /* SplitViewController.mm */,
- 9C96084F1712C16400E1D4A0 /* MasterViewController.h */,
- 9C9608501712C16400E1D4A0 /* MasterViewController.mm */,
- 9C9608521712C16400E1D4A0 /* DetailViewController.h */,
- 9C9608531712C16400E1D4A0 /* DetailViewController.mm */,
- 9C1C10F817BA5E7D00BFD483 /* PostProViewController.h */,
- 9C1C10F917BA5E7D00BFD483 /* PostProViewController.mm */,
+ 9C96084F1712C16400E1D4A0 /* ParametersViewController.h */,
+ 9C9608501712C16400E1D4A0 /* ParametersViewController.mm */,
+ 9C9608521712C16400E1D4A0 /* ModelViewController.h */,
+ 9C9608531712C16400E1D4A0 /* ModelViewController.mm */,
+ 9C1C10F817BA5E7D00BFD483 /* OptionsViewController.h */,
+ 9C1C10F917BA5E7D00BFD483 /* OptionsViewController.mm */,
9CF34DE217C62FC500A3D5E3 /* PostProcessingViewController.h */,
9CF34DE317C62FC500A3D5E3 /* PostProcessingViewController.mm */,
9C9608721712C47200E1D4A0 /* EAGLView.h */,
@@ -273,8 +273,8 @@
9CE08E13178AEC5F00A83B4B /* drawContext.cpp in Sources */,
9CE08E17178AEC5F00A83B4B /* Trackball.cpp in Sources */,
9C96084B1712C16400E1D4A0 /* AppDelegate.mm in Sources */,
- 9C9608511712C16400E1D4A0 /* MasterViewController.mm in Sources */,
- 9C9608541712C16400E1D4A0 /* DetailViewController.mm in Sources */,
+ 9C9608511712C16400E1D4A0 /* ParametersViewController.mm in Sources */,
+ 9C9608541712C16400E1D4A0 /* ModelViewController.mm in Sources */,
9C9608741712C47200E1D4A0 /* EAGLView.mm in Sources */,
9C96089F1712C8EB00E1D4A0 /* emulatorFix.c in Sources */,
9C95B7F61726C88E00C0CCE2 /* main.mm in Sources */,
@@ -283,10 +283,10 @@
9CEAE86E17AF824B00813524 /* iosGModel.cpp in Sources */,
9CEAE87D17AFD5BB00813524 /* SplitViewController.mm in Sources */,
9CE1A65717B0F39D00E5152F /* Utils.mm in Sources */,
- 9CE18C2017B27EDB009BA06E /* parameter.mm in Sources */,
+ 9CE18C2017B27EDB009BA06E /* Parameter.mm in Sources */,
9CC6EBB717BA0A38001CA21A /* drawGeom.cpp in Sources */,
9CC6EBB917BA1CC7001CA21A /* drawMesh.cpp in Sources */,
- 9C1C10FA17BA5E7D00BFD483 /* PostProViewController.mm in Sources */,
+ 9C1C10FA17BA5E7D00BFD483 /* OptionsViewController.mm in Sources */,
9CF34DE417C62FC500A3D5E3 /* PostProcessingViewController.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/contrib/mobile/iOS/Onelab/ModelListController.mm b/contrib/mobile/iOS/Onelab/ModelListController.mm
index 92b2aee953..7b8e36e643 100644
--- a/contrib/mobile/iOS/Onelab/ModelListController.mm
+++ b/contrib/mobile/iOS/Onelab/ModelListController.mm
@@ -122,8 +122,8 @@
{
if ([[segue identifier] isEqualToString:@"showModelSegue"])
{
- DetailViewController *detailViewControler = [segue destinationViewController];
- detailViewControler.initialModel = selectedModel;
+ ModelViewController *modelViewController = [segue destinationViewController];
+ modelViewController.initialModel = selectedModel;
}
}
@end
diff --git a/contrib/mobile/iOS/Onelab/DetailViewController.h b/contrib/mobile/iOS/Onelab/ModelViewController.h
similarity index 84%
rename from contrib/mobile/iOS/Onelab/DetailViewController.h
rename to contrib/mobile/iOS/Onelab/ModelViewController.h
index 4f3352839d..2ddd46edbb 100644
--- a/contrib/mobile/iOS/Onelab/DetailViewController.h
+++ b/contrib/mobile/iOS/Onelab/ModelViewController.h
@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h>
#import "EAGLView.h"
-@interface DetailViewController : UIViewController <UISplitViewControllerDelegate, UIActionSheetDelegate>
+@interface ModelViewController : UIViewController <UISplitViewControllerDelegate, UIActionSheetDelegate>
{
@private
double scaleFactor;
diff --git a/contrib/mobile/iOS/Onelab/DetailViewController.mm b/contrib/mobile/iOS/Onelab/ModelViewController.mm
similarity index 99%
rename from contrib/mobile/iOS/Onelab/DetailViewController.mm
rename to contrib/mobile/iOS/Onelab/ModelViewController.mm
index 978da58f1c..308ad56dfc 100644
--- a/contrib/mobile/iOS/Onelab/DetailViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm
@@ -7,17 +7,17 @@
//
#import <QuartzCore/QuartzCore.h>
-#import "DetailViewController.h"
+#import "ModelViewController.h"
#import "iosGModel.h"
#import "AppDelegate.h"
-@interface DetailViewController ()
+@interface ModelViewController ()
@property (strong, nonatomic) UIPopoverController *masterPopoverController;
- (void)configureView;
@end
-@implementation DetailViewController
+@implementation ModelViewController
#pragma mark - Managing the detail item
@synthesize glView;
diff --git a/contrib/mobile/iOS/Onelab/PostProViewController.h b/contrib/mobile/iOS/Onelab/OptionsViewController.h
similarity index 59%
rename from contrib/mobile/iOS/Onelab/PostProViewController.h
rename to contrib/mobile/iOS/Onelab/OptionsViewController.h
index 0d16297eab..b62a02a88c 100644
--- a/contrib/mobile/iOS/Onelab/PostProViewController.h
+++ b/contrib/mobile/iOS/Onelab/OptionsViewController.h
@@ -8,11 +8,9 @@
#import <UIKit/UIKit.h>
-@interface PostProViewController : UITableViewController <UITextFieldDelegate>
+@interface OptionsViewController : UITableViewController <UITextFieldDelegate>
{
@private
- UIViewController *_prevViewController;
UISegmentedControl *control;
}
-- (void)setPreviousViewController:(UIViewController*)prev;
@end
diff --git a/contrib/mobile/iOS/Onelab/PostProViewController.mm b/contrib/mobile/iOS/Onelab/OptionsViewController.mm
similarity index 97%
rename from contrib/mobile/iOS/Onelab/PostProViewController.mm
rename to contrib/mobile/iOS/Onelab/OptionsViewController.mm
index 91974db7d1..d963c7d70e 100644
--- a/contrib/mobile/iOS/Onelab/PostProViewController.mm
+++ b/contrib/mobile/iOS/Onelab/OptionsViewController.mm
@@ -6,8 +6,8 @@
// Copyright (c) 2013 Maxime Graulich. All rights reserved.
//
-#import "PostProViewController.h"
-#import "MasterViewController.h"
+#import "OptionsViewController.h"
+#import "ParametersViewController.h"
#import "PostProcessingViewController.h"
#include <gmsh/Context.h>
@@ -15,11 +15,11 @@
#include <gmsh/PViewData.h>
#include <gmsh/PViewOptions.h>
-@interface PostProViewController ()
+@interface OptionsViewController ()
@end
-@implementation PostProViewController
+@implementation OptionsViewController
- (id)initWithStyle:(UITableViewStyle)style
{
@@ -52,11 +52,6 @@
[super viewWillAppear:animated];
}
-- (void)setPreviousViewController:(UIViewController*)prev
-{
- _prevViewController = prev;
-}
-
- (void)indexDidChangeForSegmentedControl:(id)sender
{
//[self.navigationController setViewControllers:[[NSArray alloc] initWithObjects:_prevViewController, nil] animated:NO];
@@ -77,7 +72,9 @@
NSMutableArray *array = [[NSMutableArray alloc] init];
for(NSInteger i = nrow; i<PView::list.size(); i++)
[array addObject:[NSIndexPath indexPathForRow:i-nrow inSection:1]];
+ [self.tableView beginUpdates];
[self.tableView insertRowsAtIndexPaths:[NSArray arrayWithArray:array] withRowAnimation:UITableViewRowAnimationAutomatic];
+ [self.tableView endUpdates];
}
}
diff --git a/contrib/mobile/iOS/Onelab/parameter.h b/contrib/mobile/iOS/Onelab/Parameter.h
similarity index 78%
rename from contrib/mobile/iOS/Onelab/parameter.h
rename to contrib/mobile/iOS/Onelab/Parameter.h
index 329e2afc87..2bc3ad64a2 100644
--- a/contrib/mobile/iOS/Onelab/parameter.h
+++ b/contrib/mobile/iOS/Onelab/Parameter.h
@@ -11,7 +11,7 @@
#import "drawContext.h"
-@interface parameter : NSObject
+@interface Parameter : NSObject
{
@protected
NSString *name;
@@ -27,7 +27,7 @@
-(void)refresh;
@end
-@interface parameterStringList : parameter <UIPickerViewDataSource, UIPickerViewDelegate>
+@interface ParameterStringList : Parameter <UIPickerViewDataSource, UIPickerViewDelegate>
{
@protected
UIPickerView *picker;
@@ -37,7 +37,7 @@
@end
-@interface parameterNumberList : parameter <UIPickerViewDataSource, UIPickerViewDelegate, UITextFieldDelegate>
+@interface ParameterNumberList : Parameter <UIPickerViewDataSource, UIPickerViewDelegate, UITextFieldDelegate>
{
@protected
UIPickerView *picker;
@@ -46,7 +46,7 @@
-(UIPickerView *)getList;
@end
-@interface parameterNumberCheckbox : parameter
+@interface ParameterNumberCheckbox : Parameter
{
@protected
UISwitch *checkbox;
@@ -55,7 +55,7 @@
-(UISwitch *)getCheckbox;
@end
-@interface parameterNumberRange : parameter
+@interface ParameterNumberRange : Parameter
{
@protected
UISlider *slider;
@@ -64,7 +64,7 @@
-(UISlider *)getSlider;
@end
-@interface parameterNumberTextbox : parameter <UITextFieldDelegate>
+@interface ParameterNumberTextbox : Parameter <UITextFieldDelegate>
{
@protected
UITextField *textbox;
diff --git a/contrib/mobile/iOS/Onelab/parameter.mm b/contrib/mobile/iOS/Onelab/Parameter.mm
similarity index 98%
rename from contrib/mobile/iOS/Onelab/parameter.mm
rename to contrib/mobile/iOS/Onelab/Parameter.mm
index 79e3bfa60c..3464103061 100644
--- a/contrib/mobile/iOS/Onelab/parameter.mm
+++ b/contrib/mobile/iOS/Onelab/Parameter.mm
@@ -8,7 +8,7 @@
#import "parameter.h"
-@implementation parameter
+@implementation Parameter
-(id)init
{
self = [super init];
@@ -49,7 +49,7 @@
}
@end
-@implementation parameterStringList
+@implementation ParameterStringList
-(id) initWithString:(onelab::string)string
{
self = [super init];
@@ -131,7 +131,7 @@
}
@end
-@implementation parameterNumberList
+@implementation ParameterNumberList
-(id) initWithNumber:(onelab::number) number
{
self = [super init];
@@ -203,7 +203,7 @@
}
@end
-@implementation parameterNumberCheckbox
+@implementation ParameterNumberCheckbox
-(id) initWithNumber:(onelab::number) number
{
self = [super init];
@@ -255,7 +255,7 @@
}
@end
-@implementation parameterNumberRange
+@implementation ParameterNumberRange
-(id) initWithNumber:(onelab::number) number
{
self = [super init];
@@ -315,7 +315,7 @@
}
@end
-@implementation parameterNumberTextbox
+@implementation ParameterNumberTextbox
-(id)initWithNumber:(onelab::number)number
{
self = [super init];
diff --git a/contrib/mobile/iOS/Onelab/MasterViewController.h b/contrib/mobile/iOS/Onelab/ParametersViewController.h
similarity index 74%
rename from contrib/mobile/iOS/Onelab/MasterViewController.h
rename to contrib/mobile/iOS/Onelab/ParametersViewController.h
index fffafe15a6..51bb5e273b 100644
--- a/contrib/mobile/iOS/Onelab/MasterViewController.h
+++ b/contrib/mobile/iOS/Onelab/ParametersViewController.h
@@ -9,9 +9,9 @@
#import <UIKit/UIKit.h>
#import <Gmsh/onelab.h>
-@class DetailViewController;
+@class ModelListController;
-@interface MasterViewController : UITableViewController
+@interface ParametersViewController : UITableViewController
{
@private
NSMutableArray *_sections;
@@ -24,7 +24,7 @@
UISegmentedControl *control;
}
-@property (strong, nonatomic) DetailViewController *detailViewController;
+@property (strong, nonatomic) ModelListController *modelListController;
- (void)resetParameters:(id)sender;
diff --git a/contrib/mobile/iOS/Onelab/MasterViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm
similarity index 88%
rename from contrib/mobile/iOS/Onelab/MasterViewController.mm
rename to contrib/mobile/iOS/Onelab/ParametersViewController.mm
index e4ed839fa4..879b214f9e 100644
--- a/contrib/mobile/iOS/Onelab/MasterViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm
@@ -6,18 +6,18 @@
// Copyright (c) 2013 Maxime Graulich. All rights reserved.
//
-#import "MasterViewController.h"
-#import "DetailViewController.h"
-#import "PostProViewController.h"
+#import "ParametersViewController.h"
+#import "ModelViewController.h"
+#import "OptionsViewController.h"
#import "AppDelegate.h"
#import "parameter.h"
-@interface MasterViewController () {
+@interface ParametersViewController () {
}
@end
-@implementation MasterViewController
+@implementation ParametersViewController
- (void)awakeFromNib
{
@@ -69,31 +69,30 @@
- (void)indexDidChangeForSegmentedControl:(id)sender
{
- PostProViewController *postProViewController = [[PostProViewController alloc] init];
- [postProViewController setPreviousViewController:self];
+ OptionsViewController *optionsViewController = [[OptionsViewController alloc] init];
//[self.navigationController setViewControllers:[[NSArray alloc] initWithObjects:postProViewController, nil] animated:NO];
- [postProViewController.navigationItem setHidesBackButton:YES];
- [self.navigationController pushViewController:postProViewController animated:YES];
+ [optionsViewController.navigationItem setHidesBackButton:YES];
+ [self.navigationController pushViewController:optionsViewController animated:YES];
}
- (void)addParameterNumber:(onelab::number)p atIndexPath:(NSIndexPath*)indexPath
{
NSLog(@"Add %s at (%d,%d)", p.getName().c_str(), indexPath.section, indexPath.row);
NSMutableArray* section = [_sections objectAtIndex:indexPath.section];
if(p.getChoices().size() && p.getChoices().size() == p.getValueLabels().size()) { // enumeration
- parameterNumberList *param = [[parameterNumberList alloc] initWithNumber:p];
+ ParameterNumberList *param = [[ParameterNumberList alloc] initWithNumber:p];
[section addObject:param];
}
else if(p.getChoices().size() == 2 && p.getChoices()[0] == 0 && p.getChoices()[1] == 1) { // check box
- parameterNumberCheckbox *param = [[parameterNumberCheckbox alloc] initWithNumber:p];
+ ParameterNumberCheckbox *param = [[ParameterNumberCheckbox alloc] initWithNumber:p];
[section addObject:param];
}
else if(p.getStep() == 0) { // text box
- parameterNumberTextbox *param = [[parameterNumberTextbox alloc] initWithNumber:p];
+ ParameterNumberTextbox *param = [[ParameterNumberTextbox alloc] initWithNumber:p];
[section addObject:param];
}
else
{
- parameterNumberRange *param = [[parameterNumberRange alloc] initWithNumber:p];
+ ParameterNumberRange *param = [[ParameterNumberRange alloc] initWithNumber:p];
[section addObject:param];
}
[self.tableView beginUpdates];
@@ -103,7 +102,7 @@
- (void)addParameterString:(onelab::string)p atIndexPath:(NSIndexPath*)indexPath
{
NSMutableArray* section = [_sections objectAtIndex:indexPath.section];
- parameterStringList *param = [[parameterStringList alloc] initWithString:p];
+ ParameterStringList *param = [[ParameterStringList alloc] initWithString:p];
[section addObject:param];
[self.tableView beginUpdates];
[self.tableView insertRowsAtIndexPaths:[[NSArray alloc] initWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
@@ -149,7 +148,7 @@
NSMutableArray *section = [_sections objectAtIndex:iSection];
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];
+ Parameter * p = [section objectAtIndex: iparameter];
[p refresh]; // just refresh the parameter
found = true;
break;
@@ -180,7 +179,7 @@
NSMutableArray *section = [_sections objectAtIndex:iSection];
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];
+ Parameter * p = [section objectAtIndex: iparameter];
[p refresh]; // just refresh the parameter
found = true;
break;
@@ -279,7 +278,7 @@
if(indexPath.section >= _sections.count) return [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
NSMutableArray *sectionContent = [_sections objectAtIndex:[indexPath section]];
if(indexPath.row >= sectionContent.count) return [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
- parameter *tmp = [sectionContent objectAtIndex:[indexPath row]];
+ Parameter *tmp = [sectionContent objectAtIndex:[indexPath row]];
UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
if(cell == nil)
@@ -290,29 +289,29 @@
[cell setUserInteractionEnabled:!([tmp isReadOnly])];
[tmp setLabelFrame:CGRectMake(20, 5, cell.frame.size.width - 40, cell.frame.size.height/2)];
[cell addSubview:[tmp getLabel]];
- if([tmp isKindOfClass:[parameterStringList class]]) {
- parameterStringList *param = (parameterStringList *)tmp;
+ if([tmp isKindOfClass:[ParameterStringList class]]) {
+ ParameterStringList *param = (ParameterStringList *)tmp;
[param setFrame:CGRectMake(20, 35, cell.frame.size.width - 40, 162)];
[cell addSubview:[param getList]];
}
- else if([tmp isKindOfClass:[parameterNumberList class]]) {
- parameterNumberList *param = (parameterNumberList *)tmp;
+ else if([tmp isKindOfClass:[ParameterNumberList class]]) {
+ ParameterNumberList *param = (ParameterNumberList *)tmp;
[param setFrame:CGRectMake(20, 35, cell.frame.size.width - 40, 162)];
[cell addSubview:[param getList]];
}
- else if([tmp isKindOfClass:[parameterNumberCheckbox class]]) {
- parameterNumberCheckbox *param = (parameterNumberCheckbox *)tmp;
+ else if([tmp isKindOfClass:[ParameterNumberCheckbox class]]) {
+ ParameterNumberCheckbox *param = (ParameterNumberCheckbox *)tmp;
[param setLabelFrame:CGRectMake(100, 5, cell.frame.size.width - 110, cell.frame.size.height)];
[param setFrame:CGRectMake(10, 5, cell.frame.size.width - 40, cell.frame.size.height)];
[cell addSubview:[param getCheckbox]];
}
- else if([tmp isKindOfClass:[parameterNumberRange class]]) {
- parameterNumberRange *param = (parameterNumberRange *)tmp;
+ else if([tmp isKindOfClass:[ParameterNumberRange class]]) {
+ ParameterNumberRange *param = (ParameterNumberRange *)tmp;
[param setFrame:CGRectMake(20, cell.frame.size.height/2+5, cell.frame.size.width - 40, cell.frame.size.height/2)];
[cell addSubview:[param getSlider]];
}
- else if([tmp isKindOfClass:[parameterNumberTextbox class]]) {
- parameterNumberTextbox *param = (parameterNumberTextbox *)tmp;
+ else if([tmp isKindOfClass:[ParameterNumberTextbox class]]) {
+ ParameterNumberTextbox *param = (ParameterNumberTextbox *)tmp;
[param setFrame:CGRectMake(20, cell.frame.size.height/2+5, cell.frame.size.width - 40, cell.frame.size.height/2)];
[cell addSubview:[param getTextbox]];
}
@@ -322,7 +321,7 @@
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
- parameter *param = [[_sections objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
+ Parameter *param = [[_sections objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
return [[param class] getHeight];
}
diff --git a/contrib/mobile/iOS/Onelab/SplitViewController.h b/contrib/mobile/iOS/Onelab/SplitViewController.h
index 9a02c18e09..70fff38c60 100644
--- a/contrib/mobile/iOS/Onelab/SplitViewController.h
+++ b/contrib/mobile/iOS/Onelab/SplitViewController.h
@@ -8,12 +8,12 @@
#import <UIKit/UIKit.h>
-#import "MasterViewController.h"
-#import "DetailViewController.h"
+#import "ParametersViewController.h"
+#import "ModelViewController.h"
@interface SplitViewController : UISplitViewController{
- DetailViewController *detailViewController;
- MasterViewController *masterViewController;
+ ModelViewController *modelViewController;
+ ParametersViewController *parametersViewController;
}
@property (nonatomic, retain) NSString *initialModel;
diff --git a/contrib/mobile/iOS/Onelab/SplitViewController.mm b/contrib/mobile/iOS/Onelab/SplitViewController.mm
index 8431eba784..d3ca0b1ffc 100644
--- a/contrib/mobile/iOS/Onelab/SplitViewController.mm
+++ b/contrib/mobile/iOS/Onelab/SplitViewController.mm
@@ -29,23 +29,23 @@
// Do any additional setup after loading the view.
UINavigationController *right = [self.viewControllers objectAtIndex:1]; // right UINavigationController (Detail)
for(UIViewController *v in right.viewControllers){
- if ([v isKindOfClass:[DetailViewController class]]) {
- detailViewController = (DetailViewController *)v;
+ if ([v isKindOfClass:[ModelViewController class]]) {
+ modelViewController = (ModelViewController *)v;
}
}
UINavigationController *left = [self.viewControllers objectAtIndex:0]; // left UINavigationController (Master)
for(UIViewController *v in left.viewControllers){
- if ([v isKindOfClass:[MasterViewController class]]) {
- masterViewController = (MasterViewController *)v;
+ if ([v isKindOfClass:[ParametersViewController class]]) {
+ parametersViewController = (ParametersViewController *)v;
}
}
- self.delegate = detailViewController;
+ self.delegate = modelViewController;
[self setPresentsWithGesture:NO];
}
-(void)viewDidAppear:(BOOL)animated
{
- if(self.initialModel != nil) [detailViewController.glView load:self.initialModel];
+ if(self.initialModel != nil) [modelViewController.glView load:self.initialModel];
}
- (void)didReceiveMemoryWarning
diff --git a/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard b/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
index fe2668e88f..c2c924febf 100644
--- a/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
+++ b/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
@@ -27,10 +27,10 @@
</objects>
<point key="canvasLocation" x="316" y="-806"/>
</scene>
- <!--Detail View Controller - Detail-->
+ <!--Model View Controller - Detail-->
<scene sceneID="16">
<objects>
- <viewController storyboardIdentifier="DetailViewController" title="Detail" id="4" customClass="DetailViewController" sceneMemberID="viewController">
+ <viewController storyboardIdentifier="ModelViewController" title="Detail" id="4" customClass="ModelViewController" sceneMemberID="viewController">
<view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="26" customClass="EAGLView">
<rect key="frame" x="0.0" y="20" width="703" height="704"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -216,10 +216,10 @@
</objects>
<point key="canvasLocation" x="-2892" y="-934"/>
</scene>
- <!--Master View Controller - Master-->
+ <!--Parameters View Controller - Master-->
<scene sceneID="24">
<objects>
- <tableViewController storyboardIdentifier="" title="Master" clearsSelectionOnViewWillAppear="NO" id="19" customClass="MasterViewController" sceneMemberID="viewController">
+ <tableViewController storyboardIdentifier="" title="Master" clearsSelectionOnViewWillAppear="NO" id="19" customClass="ParametersViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="singleLineEtched" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="20">
<rect key="frame" x="0.0" y="20" width="320" height="748"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
--
GitLab