diff --git a/contrib/mobile/iOS/Onelab/AppDelegate.mm b/contrib/mobile/iOS/Onelab/AppDelegate.mm
index f155763c203b73b77d9a1a2a738e9d3be31e9c9f..a8cdeca66c9cf52efee579622a145004b577520b 100644
--- a/contrib/mobile/iOS/Onelab/AppDelegate.mm
+++ b/contrib/mobile/iOS/Onelab/AppDelegate.mm
@@ -29,9 +29,9 @@
NSLog(@"Leaving models as-is (version %@)", prefsv);
}
- // Check if there is a model to open
+ // Check if there is a model to extract (unzip)
NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
- [Utils openModelURL:url];
+ if(url) [Utils openModelURL:url];
return YES;
}
@@ -39,6 +39,7 @@
- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
{
[Utils openModelURL:url];
+
return YES;
}
diff --git a/contrib/mobile/iOS/Onelab/ModelListController.mm b/contrib/mobile/iOS/Onelab/ModelListController.mm
index 8804b3117d562f19ad91f16d792b55136a6dd9a8..d9063a2049fb02555a1e5fcfae9875d12982e8a4 100644
--- a/contrib/mobile/iOS/Onelab/ModelListController.mm
+++ b/contrib/mobile/iOS/Onelab/ModelListController.mm
@@ -73,6 +73,7 @@
{
return [models count];
}
+
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
UITableViewCell *cell;
@@ -126,7 +127,7 @@
if(indexPath == nil) return;
UIActionSheet *actionSheet;
if([[models objectAtIndex:indexPath.row] getUrl])
- actionSheet = [[UIActionSheet alloc] initWithTitle:[[models objectAtIndex:indexPath.row] getName] delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil otherButtonTitles: @"Open model", @"Remove model", @"More information", nil];
+ actionSheet = [[UIActionSheet alloc] initWithTitle:[[models objectAtIndex:indexPath.row] getName] delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil otherButtonTitles: @"Open model", @"Remove model", @"View model website", nil];
else
actionSheet = [[UIActionSheet alloc] initWithTitle:[[models objectAtIndex:indexPath.row] getName] delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil otherButtonTitles: @"Open model", @"Remove model", nil];
actionSheet.tag = indexPath.row;
@@ -142,8 +143,8 @@
case 1:
{
NSString *file = [[models objectAtIndex:actionSheet.tag] getFile];
- // just remove xml file; should probably remove the whole directory to save space?
- [[NSFileManager defaultManager] removeItemAtPath:file error:nil];
+ NSString *path = [file stringByDeletingLastPathComponent];
+ [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
[self refreshList];
}
break;
diff --git a/contrib/mobile/iOS/Onelab/ModelViewController.mm b/contrib/mobile/iOS/Onelab/ModelViewController.mm
index 3c761e99ea8917974488611989eab909169257ab..034102dad528db1b866574e1ed77bf5c6ea7334e 100644
--- a/contrib/mobile/iOS/Onelab/ModelViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm
@@ -170,6 +170,7 @@
}
[[UIApplication sharedApplication] endBackgroundTask: _computeBackgroundTaskIdentifier];
_computeBackgroundTaskIdentifier = UIBackgroundTaskInvalid;
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshParameters" object:nil];
});
dispatch_group_notify(group, queue, ^{
diff --git a/contrib/mobile/iOS/Onelab/OptionsViewController.mm b/contrib/mobile/iOS/Onelab/OptionsViewController.mm
index a269bd0000aa5e4fc7dbf1a64e693438cbc88506..6890a680bc0b9dfb7254c11fb0f7c3f15c379e7f 100644
--- a/contrib/mobile/iOS/Onelab/OptionsViewController.mm
+++ b/contrib/mobile/iOS/Onelab/OptionsViewController.mm
@@ -72,6 +72,7 @@
{
[self performSelectorOnMainThread:@selector(refreshOptions) withObject:nil waitUntilDone:NO];
}
+
- (void)refreshOptions
{
NSInteger nrow = [self.tableView numberOfRowsInSection:1];
@@ -98,11 +99,8 @@
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
- /**
- Section Name
- 0 Options (Show mesh, Show geometry)
- 1 Post-processing
- **/
+ // Section 0: Display options
+ // Section 1: Result options
}
-(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
@@ -143,8 +141,8 @@
case 0:
{
[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
- UISwitch *showHideOptions = [[UISwitch alloc] initWithFrame: CGRectMake(10, 10, 100, 30)];
- UILabel *lblOptions = [[UILabel alloc] initWithFrame:CGRectMake(10 + (showHideOptions.frame.size.width)+25 , 10, (cell.bounds.size.width - (showHideOptions.frame.size.width) - 25), 30)];
+ UISwitch *showHideOptions = [[UISwitch alloc] initWithFrame: CGRectMake(15, 7, 100, 30)];
+ UILabel *lblOptions = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHideOptions.frame.size.width), 10, (tableView.frame.size.width - (showHideOptions.frame.size.width) - 50), 30)];
if(indexPath.row == 0) {
[lblOptions setText:@"Show geometry points"];
[showHideOptions setOn:(CTX::instance()->geom.points)];
@@ -183,8 +181,8 @@
[cell setSelectionStyle:UITableViewCellSelectionStyleGray];
int i = PView::list.size() - 1 - indexPath.row;
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- UISwitch *showHide = [[UISwitch alloc] initWithFrame: CGRectMake(10, 10, 100, 30)];
- UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHide.frame.size.width), 10, (cell.bounds.size.width - showHide.frame.size.width - 50), 30)];
+ UISwitch *showHide = [[UISwitch alloc] initWithFrame: CGRectMake(15, 7, 100, 30)];
+ UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHide.frame.size.width), 10, (tableView.frame.size.width - showHide.frame.size.width - 50), 30)];
[showHide setOn:(PView::list[i]->getOptions()->visible == 1)];
[showHide setTag:i];
[showHide addTarget:self action:@selector(PViewVisible:) forControlEvents:UIControlEventValueChanged];
diff --git a/contrib/mobile/iOS/Onelab/Parameter.mm b/contrib/mobile/iOS/Onelab/Parameter.mm
index 47974c805cc5a453fdb71c7fc9637e18904ac8ce..3a343f5b4e641790e3f8f2a922a4bc672298329c 100644
--- a/contrib/mobile/iOS/Onelab/Parameter.mm
+++ b/contrib/mobile/iOS/Onelab/Parameter.mm
@@ -383,7 +383,7 @@
+(double)getHeight
{
- return 60.0f;
+ return 65.0f;
}
@end
diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.h b/contrib/mobile/iOS/Onelab/ParametersViewController.h
index 058946213d362940731552ea8b10f210e5d04af4..e6b378eea2ee6730da46136b5eed5047d1fdc828 100644
--- a/contrib/mobile/iOS/Onelab/ParametersViewController.h
+++ b/contrib/mobile/iOS/Onelab/ParametersViewController.h
@@ -8,12 +8,10 @@
@private
NSMutableArray *_sections;
NSMutableArray *_sectionstitle;
- NSDate *_lastRefresh;
-
+ NSDate *_lastRefresh;
UIBarButtonItem *runButton;
UIBarButtonItem *stopButton;
-
- UISegmentedControl *control;
+ UISegmentedControl *control;
}
@property (strong, nonatomic) ModelListController *modelListController;
diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm
index 9a4399f48d883cf6ae76ad69107971a4f30ea669..08cfe1ce458d93f700abe5e7a216cb1579c48cd4 100644
--- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm
@@ -14,7 +14,6 @@
- (void)awakeFromNib
{
self.clearsSelectionOnViewWillAppear = NO;
- self.preferredContentSize = CGSizeMake(320.0, 600.0);
[super awakeFromNib];
}
@@ -339,37 +338,37 @@
}
[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
[cell setUserInteractionEnabled:!([tmp isReadOnly])];
- [tmp setLabelFrame:CGRectMake(20, 5, cell.frame.size.width - 40, cell.frame.size.height/2)];
+ [tmp setLabelFrame:CGRectMake(20, 5, tableView.frame.size.width - 40, cell.frame.size.height/2)];
[cell addSubview:[tmp getLabel]];
if([tmp isKindOfClass:[ParameterStringList class]]) {
ParameterStringList *param = (ParameterStringList *)tmp;
- [param setFrame:CGRectMake(20, 35, cell.frame.size.width - 40, cell.frame.size.height/2)];
+ [param setFrame:CGRectMake(20, 35, tableView.frame.size.width - 40, cell.frame.size.height/2)];
[cell addSubview:[param getUIView]];
}
else if([tmp isKindOfClass:[ParameterNumberList class]]) {
ParameterNumberList *param = (ParameterNumberList *)tmp;
- [param setFrame:CGRectMake(20, 35, cell.frame.size.width - 40, cell.frame.size.height/2)];
+ [param setFrame:CGRectMake(20, 35, tableView.frame.size.width - 40, cell.frame.size.height/2)];
[cell addSubview:[param getUIView]];
}
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(20, 5, cell.frame.size.width - 40, cell.frame.size.height)];
+ [param setLabelFrame:CGRectMake(85, 5, tableView.frame.size.width - 95, cell.frame.size.height/1.5)];
+ [param setFrame:CGRectMake(20, 5, tableView.frame.size.width - 40, cell.frame.size.height)];
[cell addSubview:[param getCheckbox]];
}
else if([tmp isKindOfClass:[ParameterNumberStepper class]]) {
ParameterNumberStepper *param = (ParameterNumberStepper *)tmp;
- [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, cell.frame.size.width - 40, cell.frame.size.height/2)];
+ [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, tableView.frame.size.width - 40, cell.frame.size.height/2.5)];
[cell addSubview:[param getStepper]];
}
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)];
+ [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, tableView.frame.size.width - 40, cell.frame.size.height/1.5)];
[cell addSubview:[param getSlider]];
}
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)];
+ [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, tableView.frame.size.width - 40, cell.frame.size.height/1.75)];
[cell addSubview:[param getTextbox]];
}
diff --git a/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard b/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
index 815015453c9e6c7ddfcb6acc979585607414f197..f29dd1a4f00d585511cabd556965a018c4593527 100644
--- a/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
+++ b/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="dwa-Pq-2vA">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A282b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="dwa-Pq-2vA">
<dependencies>
- <deployment defaultVersion="1792" identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<scenes>
<!--Navigation Controller-->
@@ -14,10 +13,12 @@
<navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="6">
<rect key="frame" x="0.0" y="-44" width="0.0" height="44"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</navigationBar>
<toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="YDU-Oo-Ie9">
- <rect key="frame" x="0.0" y="724" width="320" height="44"/>
+ <rect key="frame" x="0.0" y="556" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</toolbar>
<connections>
<segue destination="19" kind="relationship" relationship="rootViewController" id="25"/>
@@ -25,9 +26,9 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="13" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="316" y="-806"/>
+ <point key="canvasLocation" x="142" y="-548"/>
</scene>
- <!--Model View Controller - ONELAB-->
+ <!--ONELAB-->
<scene sceneID="16">
<objects>
<viewController storyboardIdentifier="ModelViewController" title="ONELAB" id="4" customClass="ModelViewController" sceneMemberID="viewController">
@@ -36,23 +37,23 @@
<viewControllerLayoutGuide type="bottom" id="EYA-0D-qDB"/>
</layoutGuides>
<view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="26" customClass="EAGLView">
- <rect key="frame" x="0.0" y="0.0" width="703" height="768"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HN2-fw-mfe">
<rect key="frame" x="47" y="727" width="636" height="21"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="BfX-qT-0mL">
- <rect key="frame" x="20" y="728" width="20" height="20"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <rect key="frame" x="20" y="560" width="20" height="20"/>
+ <animations/>
</activityIndicatorView>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="right" contentVerticalAlignment="top" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GRU-nz-BNs">
<rect key="frame" x="652" y="80" width="40" height="40"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <animations/>
<constraints>
<constraint firstAttribute="height" constant="40" id="NTn-Hp-n22"/>
<constraint firstAttribute="width" constant="40" id="lvs-wL-1eu"/>
@@ -65,6 +66,7 @@
</connections>
</button>
</subviews>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="GRU-nz-BNs" secondAttribute="trailing" constant="20" id="5SK-5e-5sv"/>
@@ -74,7 +76,6 @@
<constraint firstItem="EYA-0D-qDB" firstAttribute="top" secondItem="HN2-fw-mfe" secondAttribute="bottom" constant="20" id="eo2-1G-DDU"/>
<constraint firstItem="EYA-0D-qDB" firstAttribute="top" secondItem="BfX-qT-0mL" secondAttribute="bottom" constant="20" id="tlt-kB-Qwe"/>
</constraints>
- <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
<connections>
<outletCollection property="gestureRecognizers" destination="Nb5-mS-uY7" appends="YES" id="aF3-Oi-e8B"/>
<outletCollection property="gestureRecognizers" destination="Rg0-JN-2rY" appends="YES" id="Idn-LL-Eok"/>
@@ -83,7 +84,6 @@
</view>
<toolbarItems/>
<navigationItem key="navigationItem" title="ONELAB" id="53"/>
- <size key="freeformSize" width="703" height="768"/>
<connections>
<outlet property="doubleTap" destination="MRc-vF-047" id="mdb-zu-B2d"/>
<outlet property="glView" destination="26" id="i7d-I7-Zhz"/>
@@ -109,25 +109,27 @@
</connections>
</pinchGestureRecognizer>
</objects>
- <point key="canvasLocation" x="1144" y="330"/>
+ <point key="canvasLocation" x="857" y="523"/>
</scene>
- <!--Post Pro View Controller - Post-processing-->
+ <!--Post-processing-->
<scene sceneID="i13-tZ-4on">
<objects>
<tableViewController storyboardIdentifier="PostProViewController" id="89M-FT-oxV" customClass="PostProViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="4WQ-dq-nwm">
- <rect key="frame" x="0.0" y="0.0" width="320" height="768"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="postProCell" id="rgB-ht-LVb">
- <rect key="frame" x="0.0" y="86" width="320" height="44"/>
+ <rect key="frame" x="0.0" y="86" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rgB-ht-LVb" id="4vv-Gp-Zf0">
- <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</tableViewCellContentView>
+ <animations/>
</tableViewCell>
</prototypes>
<connections>
@@ -137,12 +139,12 @@
</tableView>
<navigationItem key="navigationItem" title="Post-processing" id="Zld-KM-OS3"/>
<connections>
- <segue destination="59P-em-ZXH" kind="push" identifier="showPViewSegue" id="UaH-Jh-G3U"/>
+ <segue destination="59P-em-ZXH" kind="show" identifier="showPViewSegue" id="UaH-Jh-G3U"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="3Aw-Tm-Dq6" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="1277" y="-806"/>
+ <point key="canvasLocation" x="1621" y="-548"/>
</scene>
<!--Post Processing View Controller-->
<scene sceneID="inJ-Ob-bP0">
@@ -153,54 +155,54 @@
<viewControllerLayoutGuide type="bottom" id="zl2-C9-6GO"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="bA2-5p-eQu">
- <rect key="frame" x="0.0" y="0.0" width="320" height="768"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="PView Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zvL-DY-CD8">
<rect key="frame" x="20" y="75" width="280" height="32"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="24"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<pickerView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KcQ-1V-heQ">
<rect key="frame" x="0.0" y="95" width="320" height="216"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <animations/>
</pickerView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="21" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NrM-45-dY4">
<rect key="frame" x="111" y="318" width="65" height="30"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="Intervals" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ol0-Ou-YBJ">
<rect key="frame" x="0.0" y="322" width="89" height="21"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="Raise (Z)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IVB-fp-jdZ">
<rect key="frame" x="0.0" y="361" width="89" height="21"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="-5" maxValue="5" translatesAutoresizingMaskIntoConstraints="NO" id="mjo-81-vMy">
<rect key="frame" x="109" y="356" width="187" height="31"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <animations/>
</slider>
<stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="p1D-j1-egi">
<rect key="frame" x="200" y="319" width="94" height="29"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <animations/>
<connections>
<action selector="stepperValueChanged:" destination="59P-em-ZXH" eventType="valueChanged" id="lia-6x-IaS"/>
</connections>
</stepper>
</subviews>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
- <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
</view>
<navigationItem key="navigationItem" id="Zf1-f8-ob0"/>
<connections>
@@ -213,7 +215,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="URb-SK-Z2A" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="1754" y="-806"/>
+ <point key="canvasLocation" x="2350" y="-553"/>
</scene>
<!--Split View Controller-->
<scene sceneID="18">
@@ -230,15 +232,16 @@
</splitViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="17" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-879" y="-806"/>
+ <point key="canvasLocation" x="-679" y="-548"/>
</scene>
<!--About View Controller-->
<scene sceneID="JzC-rN-mWe">
<objects>
<viewController id="VJs-Jj-MrK" customClass="AboutViewController" sceneMemberID="viewController">
<webView key="view" contentMode="scaleToFill" id="5gX-R5-60b">
- <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</webView>
<navigationItem key="navigationItem" id="Jgu-H8-Skt"/>
@@ -248,35 +251,38 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="aMz-Ds-IMq" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-879" y="77"/>
+ <point key="canvasLocation" x="-687" y="489"/>
</scene>
- <!--Model List Controller - Model list-->
+ <!--Model list-->
<scene sceneID="af3-vl-hzw">
<objects>
<tableViewController id="dVI-Oo-Sq4" customClass="ModelListController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="OmH-vi-qhj">
- <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ModelsCell" id="dad-rm-zwY">
- <rect key="frame" x="0.0" y="86" width="768" height="44"/>
+ <rect key="frame" x="0.0" y="86" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dad-rm-zwY" id="smI-Gj-Wpi">
- <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</tableViewCellContentView>
+ <animations/>
</tableViewCell>
</prototypes>
</tableView>
<navigationItem key="navigationItem" title="Model list" id="sdX-f6-lSz"/>
<connections>
- <segue destination="VJs-Jj-MrK" kind="push" identifier="showAboutSegue" id="s46-1w-abC"/>
+ <segue destination="VJs-Jj-MrK" kind="show" identifier="showAboutSegue" id="s46-1w-abC"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="zLU-RU-aDe" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-1912" y="-934"/>
+ <point key="canvasLocation" x="-1493.75" y="-547.265625"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="Rhc-IE-crY">
@@ -287,6 +293,7 @@
<navigationBar key="navigationBar" contentMode="scaleToFill" id="3bj-vr-d0C">
<rect key="frame" x="0.0" y="-44" width="0.0" height="44"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</navigationBar>
<connections>
<segue destination="dVI-Oo-Sq4" kind="relationship" relationship="rootViewController" id="4oJ-sM-Hd3"/>
@@ -294,34 +301,37 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4VW-NK-Xj1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-2892" y="-934"/>
+ <point key="canvasLocation" x="-2259.375" y="-547.265625"/>
</scene>
- <!--Parameters View Controller - Master-->
+ <!--Master-->
<scene sceneID="24">
<objects>
<tableViewController title="Master" clearsSelectionOnViewWillAppear="NO" id="19" customClass="ParametersViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="20">
- <rect key="frame" x="0.0" y="0.0" width="320" height="768"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
- <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsCell" textLabel="tIi-5l-S0i" style="IBUITableViewCellStyleDefault" id="ZSw-0O-9Pw">
- <rect key="frame" x="0.0" y="119" width="320" height="44"/>
+ <rect key="frame" x="0.0" y="113.5" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZSw-0O-9Pw" id="PXw-eV-JUQ">
- <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tIi-5l-S0i">
- <rect key="frame" x="15" y="0.0" width="290" height="43"/>
+ <rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</label>
</subviews>
+ <animations/>
</tableViewCellContentView>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableViewCell>
</prototypes>
@@ -333,12 +343,12 @@
</tableView>
<navigationItem key="navigationItem" title="Settings" id="40"/>
<connections>
- <segue destination="89M-FT-oxV" kind="push" id="fTD-MC-twP"/>
+ <segue destination="89M-FT-oxV" kind="show" id="fTD-MC-twP"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="23" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="795" y="-806"/>
+ <point key="canvasLocation" x="857" y="-548"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="50">
@@ -349,6 +359,7 @@
<navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="43">
<rect key="frame" x="0.0" y="-44" width="0.0" height="44"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</navigationBar>
<connections>
<segue destination="4" kind="relationship" relationship="rootViewController" id="52"/>
@@ -356,15 +367,10 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="49" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="336" y="340"/>
+ <point key="canvasLocation" x="94" y="523"/>
</scene>
</scenes>
<resources>
<image name="icon_rotate.png" width="512" height="512"/>
</resources>
- <simulatedMetricsContainer key="defaultSimulatedMetrics">
- <simulatedStatusBarMetrics key="statusBar"/>
- <simulatedOrientationMetrics key="orientation"/>
- <simulatedScreenMetrics key="destination"/>
- </simulatedMetricsContainer>
</document>
diff --git a/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard b/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard
index b462f4f5497798a2f0aa6c6f68e7f5f7d8d11d61..1d488f8da591600d6a6ff37a31e8599e932e05f1 100644
--- a/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard
+++ b/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard
@@ -1,41 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vAG-uz-hfU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A282b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vAG-uz-hfU">
<dependencies>
- <deployment defaultVersion="1792" identifier="iOS"/>
- <development version="5100" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+ <deployment identifier="iOS"/>
+ <development version="6000" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<scenes>
- <!--Model List Controller - Models-->
+ <!--Models-->
<scene sceneID="Y4S-jQ-WHz">
<objects>
<tableViewController id="aNd-kg-MlN" customClass="ModelListController" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="E1y-UA-Su2">
- <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="model" id="8lY-sK-IU2">
- <rect key="frame" x="0.0" y="86" width="320" height="44"/>
+ <rect key="frame" x="0.0" y="86" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8lY-sK-IU2" id="DGR-CE-eWT">
- <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</tableViewCellContentView>
+ <animations/>
</tableViewCell>
</prototypes>
</tableView>
<navigationItem key="navigationItem" title="Models" id="l1y-cb-Mvd"/>
<connections>
- <segue destination="NyB-7w-cP0" kind="push" identifier="showModelSegue" id="urr-vz-3XW"/>
- <segue destination="uZG-Bw-GZA" kind="push" identifier="showAboutSegue" id="Ctu-pA-E38"/>
+ <segue destination="NyB-7w-cP0" kind="show" identifier="showModelSegue" id="urr-vz-3XW"/>
+ <segue destination="uZG-Bw-GZA" kind="show" identifier="showAboutSegue" id="Ctu-pA-E38"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5qi-J8-Zn2" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-329" y="160"/>
+ <point key="canvasLocation" x="-616.875" y="169.01408450704224"/>
</scene>
- <!--Model View Controller - ONELAB-->
+ <!--ONELAB-->
<scene sceneID="ghQ-lt-1PF">
<objects>
<viewController storyboardIdentifier="ModelViewController" id="NyB-7w-cP0" customClass="ModelViewController" sceneMemberID="viewController">
@@ -44,24 +47,26 @@
<viewControllerLayoutGuide type="bottom" id="PQs-jS-IB8"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="zrj-Dd-WPc" customClass="EAGLView">
- <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yT7-IR-qUJ">
- <rect key="frame" x="40" y="538" width="260" height="20"/>
+ <rect key="frame" x="40" y="570" width="540" height="20"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="Fuh-zG-zVR">
- <rect key="frame" x="10" y="538" width="20" height="20"/>
+ <rect key="frame" x="10" y="570" width="20" height="20"/>
+ <animations/>
<constraints>
<constraint firstAttribute="width" constant="20" id="f9c-ZY-6q4"/>
</constraints>
</activityIndicatorView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="top" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ct3-iA-CZQ">
- <rect key="frame" x="280" y="74" width="30" height="30"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <rect key="frame" x="560" y="74" width="30" height="30"/>
+ <animations/>
<constraints>
<constraint firstAttribute="height" constant="30" id="59F-eB-IWj"/>
<constraint firstAttribute="width" constant="30" id="Cor-0l-wdz"/>
@@ -74,6 +79,7 @@
</connections>
</button>
</subviews>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<gestureRecognizers/>
<constraints>
@@ -99,7 +105,7 @@
<outlet property="progressIndicator" destination="Fuh-zG-zVR" id="ifr-7g-7Dv"/>
<outlet property="progressLabel" destination="yT7-IR-qUJ" id="onn-gw-Mnv"/>
<outlet property="singleTap" destination="7R3-zZ-cpa" id="Xlw-Pp-Szf"/>
- <segue destination="0h7-h3-thM" kind="push" identifier="showSettingsSegue" id="cJz-7s-fgZ"/>
+ <segue destination="0h7-h3-thM" kind="show" identifier="showSettingsSegue" id="cJz-7s-fgZ"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="aSF-6U-E6q" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -119,15 +125,16 @@
</connections>
</pinchGestureRecognizer>
</objects>
- <point key="canvasLocation" x="142" y="160"/>
+ <point key="canvasLocation" x="266.25" y="169.01408450704224"/>
</scene>
<!--About View Controller-->
<scene sceneID="3Qf-fF-DaH">
<objects>
<viewController id="uZG-Bw-GZA" customClass="AboutViewController" sceneMemberID="viewController">
<webView key="view" contentMode="scaleToFill" id="EMj-bY-w8n">
- <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</webView>
<navigationItem key="navigationItem" id="0mC-fS-N0z"/>
@@ -137,7 +144,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="RFr-BW-Q0P" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="166" y="926"/>
+ <point key="canvasLocation" x="311.25" y="978.16901408450701"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="YFg-Co-Dc2">
@@ -148,6 +155,7 @@
<navigationBar key="navigationBar" contentMode="scaleToFill" id="HV6-65-Zcg">
<rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
<autoresizingMask key="autoresizingMask"/>
+ <animations/>
</navigationBar>
<connections>
<segue destination="aNd-kg-MlN" kind="relationship" relationship="rootViewController" id="Hxi-aR-q5B"/>
@@ -155,24 +163,27 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Fbk-Ng-NrK" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-863" y="160"/>
+ <point key="canvasLocation" x="-1618.125" y="169.01408450704224"/>
</scene>
- <!--Parameters View Controller - Parameters-->
+ <!--Parameters-->
<scene sceneID="WMF-B6-2e0">
<objects>
<tableViewController id="0h7-h3-thM" customClass="ParametersViewController" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="XKe-Ex-Vcl">
- <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="setting" id="Ryv-6O-Xsf">
- <rect key="frame" x="0.0" y="86" width="320" height="44"/>
- <autoresizingMask key="autoresizingMask"/>
+ <rect key="frame" x="0.0" y="86" width="600" height="44"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ryv-6O-Xsf" id="e1l-jJ-ItW">
- <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
- <autoresizingMask key="autoresizingMask"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+ <animations/>
</tableViewCellContentView>
+ <animations/>
</tableViewCell>
</prototypes>
<connections>
@@ -184,29 +195,32 @@
<barButtonItem key="backBarButtonItem" title="Model" id="SL3-OD-Ie0"/>
</navigationItem>
<connections>
- <segue destination="tLo-wG-spu" kind="push" id="50g-yc-iQZ"/>
+ <segue destination="tLo-wG-spu" kind="show" id="50g-yc-iQZ"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="l6Y-Ow-J7G" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="636" y="160"/>
+ <point key="canvasLocation" x="1192.5" y="169.01408450704224"/>
</scene>
- <!--Options View Controller - Options-->
+ <!--Options-->
<scene sceneID="hN1-wg-Dof">
<objects>
<tableViewController id="tLo-wG-spu" customClass="OptionsViewController" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="AUf-bU-fWv">
- <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="postProCell" id="7gg-dw-9nK">
- <rect key="frame" x="0.0" y="86" width="320" height="44"/>
+ <rect key="frame" x="0.0" y="86" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7gg-dw-9nK" id="ejA-3y-SSJ">
- <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
- <autoresizingMask key="autoresizingMask"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+ <animations/>
</tableViewCellContentView>
+ <animations/>
</tableViewCell>
</prototypes>
<connections>
@@ -216,12 +230,12 @@
</tableView>
<navigationItem key="navigationItem" title="Options" id="qUi-6A-krJ"/>
<connections>
- <segue destination="pfu-w8-zq5" kind="push" id="DuR-Aa-VLN"/>
+ <segue destination="pfu-w8-zq5" kind="show" id="DuR-Aa-VLN"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="WwS-KQ-5Gs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="1118" y="160"/>
+ <point key="canvasLocation" x="2096.25" y="169.01408450704224"/>
</scene>
<!--Post Processing View Controller-->
<scene sceneID="nXH-mg-3hY">
@@ -232,11 +246,12 @@
<viewControllerLayoutGuide type="bottom" id="4M7-bd-GcK"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Lh8-gQ-vBl">
- <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="PView Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z3z-Xo-nQF">
- <rect key="frame" x="20" y="70" width="280" height="36"/>
+ <rect key="frame" x="20" y="70" width="560" height="36"/>
+ <animations/>
<constraints>
<constraint firstAttribute="height" constant="36" id="zTU-8R-I6z"/>
</constraints>
@@ -245,10 +260,11 @@
<nil key="highlightedColor"/>
</label>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h3e-8g-CWy">
- <rect key="frame" x="14" y="114" width="292" height="434"/>
+ <rect key="frame" x="14" y="114" width="572" height="466"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Intervals" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="elK-Av-NO2">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Intervals" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="elK-Av-NO2">
<rect key="frame" x="-8" y="172" width="91" height="21"/>
+ <animations/>
<constraints>
<constraint firstAttribute="width" constant="91" id="g2R-zm-Dt4"/>
</constraints>
@@ -256,33 +272,39 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
- <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rgB-dz-6XG">
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rgB-dz-6XG">
<rect key="frame" x="91" y="168" width="71" height="30"/>
+ <animations/>
<constraints>
<constraint firstAttribute="width" constant="71" id="DMh-ns-x7e"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Raise (Z)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bfu-t9-dAj">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Raise (Z)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bfu-t9-dAj">
<rect key="frame" x="-8" y="217" width="91" height="21"/>
+ <animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
- <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="-5" maxValue="5" translatesAutoresizingMaskIntoConstraints="NO" id="BC5-E7-rEF">
+ <slider opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="-5" maxValue="5" translatesAutoresizingMaskIntoConstraints="NO" id="BC5-E7-rEF">
<rect key="frame" x="89" y="213" width="185" height="31"/>
+ <animations/>
</slider>
- <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="fq0-E8-V07">
+ <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="fq0-E8-V07">
<rect key="frame" x="178" y="168" width="94" height="29"/>
+ <animations/>
<connections>
<action selector="stepperValueChanged:" destination="pfu-w8-zq5" eventType="valueChanged" id="d8w-ZF-KcK"/>
</connections>
</stepper>
- <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xW0-cN-kxL">
- <rect key="frame" x="17" y="0.0" width="258" height="162"/>
+ <pickerView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xW0-cN-kxL">
+ <rect key="frame" x="17" y="0.0" width="538" height="162"/>
+ <animations/>
</pickerView>
</subviews>
+ <animations/>
<constraints>
<constraint firstItem="BC5-E7-rEF" firstAttribute="leading" secondItem="Bfu-t9-dAj" secondAttribute="trailing" constant="8" symbolic="YES" id="171-4w-6wl"/>
<constraint firstItem="Bfu-t9-dAj" firstAttribute="leading" secondItem="elK-Av-NO2" secondAttribute="leading" id="1t0-hf-2Hf"/>
@@ -304,6 +326,7 @@
</constraints>
</scrollView>
</subviews>
+ <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="z3z-Xo-nQF" firstAttribute="top" secondItem="KBG-YI-tIA" secondAttribute="bottom" constant="6" id="3sW-ft-cxl"/>
@@ -326,15 +349,10 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="p63-tL-CUK" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="1596" y="160"/>
+ <point key="canvasLocation" x="2992.5" y="169.01408450704224"/>
</scene>
</scenes>
<resources>
<image name="icon_rotate.png" width="512" height="512"/>
</resources>
- <simulatedMetricsContainer key="defaultSimulatedMetrics">
- <simulatedStatusBarMetrics key="statusBar"/>
- <simulatedOrientationMetrics key="orientation"/>
- <simulatedScreenMetrics key="destination" type="retina4"/>
- </simulatedMetricsContainer>
</document>