Commit f5a0c4e3 authored by Ken Martin's avatar Ken Martin

updated to avoid constraint warning

The cload load box was causing some sort of sizing constraint
issue when animated. No clue why. Turned animaiton off and the
issue goes away. Also added file type icons.
parent de345070
Pipeline #8260 passed with stage
......@@ -16,6 +16,7 @@
1312F9571C6502270064AA4C /* vtk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1312F9561C6502270064AA4C /* vtk.framework */; };
1312F9591C6503EC0064AA4C /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1312F9581C6503EC0064AA4C /* GLKit.framework */; };
1312F95F1C650B050064AA4C /* SettingsTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1312F95E1C650B050064AA4C /* SettingsTableViewController.mm */; };
135BC9A11C777D12009C8169 /* iOSapplication.icns in Resources */ = {isa = PBXBuildFile; fileRef = 135BC9A01C777D12009C8169 /* iOSapplication.icns */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -34,6 +35,7 @@
1312F95D1C650B050064AA4C /* SettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsTableViewController.h; sourceTree = "<group>"; };
1312F95E1C650B050064AA4C /* SettingsTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsTableViewController.mm; sourceTree = "<group>"; };
1312F9631C68EADF0064AA4C /* PlaneView.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PlaneView.entitlements; sourceTree = "<group>"; };
135BC9A01C777D12009C8169 /* iOSapplication.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = iOSapplication.icns; path = iOSapplication.icns; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -70,6 +72,7 @@
1312F93A1C65005D0064AA4C /* PlaneView */ = {
isa = PBXGroup;
children = (
135BC9A01C777D12009C8169 /* iOSapplication.icns */,
1312F9631C68EADF0064AA4C /* PlaneView.entitlements */,
1312F93E1C65005D0064AA4C /* AppDelegate.h */,
1312F93F1C65005D0064AA4C /* AppDelegate.m */,
......@@ -162,6 +165,7 @@
files = (
1312F94A1C65005D0064AA4C /* Main.storyboard in Resources */,
1312F94C1C65005D0064AA4C /* Assets.xcassets in Resources */,
135BC9A11C777D12009C8169 /* iOSapplication.icns in Resources */,
1312F94F1C65005D0064AA4C /* LaunchScreen.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
......@@ -83,9 +83,6 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2v7-wh-jRL">
<rect key="frame" x="550" y="11" width="22" height="22"/>
</button>
</subviews>
</tableViewCellContentView>
</tableViewCell>
......
......@@ -8,7 +8,9 @@
<array>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<array>
<string>iOSapplication</string>
</array>
<key>CFBundleTypeName</key>
<string>VTK Unstructured Grid</string>
<key>LSItemContentTypes</key>
......@@ -18,7 +20,9 @@
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<array>
<string>iOSapplication</string>
</array>
<key>CFBundleTypeName</key>
<string>VTK Structured Grid</string>
<key>LSItemContentTypes</key>
......@@ -28,7 +32,9 @@
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<array>
<string>iOSapplication</string>
</array>
<key>CFBundleTypeName</key>
<string>VTK Rectlinear Grid</string>
<key>LSItemContentTypes</key>
......@@ -38,7 +44,9 @@
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<array>
<string>iOSapplication</string>
</array>
<key>CFBundleTypeName</key>
<string>VTK Image Data</string>
<key>LSItemContentTypes</key>
......@@ -102,6 +110,10 @@
<string>VTK XML Unstructured Grid</string>
<key>UTTypeIdentifier</key>
<string>com.kitware.vtu</string>
<key>UTTypeSize320IconFile</key>
<string>iOSapplication</string>
<key>UTTypeSize64IconFile</key>
<string>iOSapplication</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.ostype</key>
......@@ -121,6 +133,10 @@
<string>VTK XML Structured Grid</string>
<key>UTTypeIdentifier</key>
<string>com.kitware.vts</string>
<key>UTTypeSize320IconFile</key>
<string>iOSapplication</string>
<key>UTTypeSize64IconFile</key>
<string>iOSapplication</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.ostype</key>
......@@ -140,6 +156,10 @@
<string>VTK XML Rectilinear Grid</string>
<key>UTTypeIdentifier</key>
<string>com.kitware.vtr</string>
<key>UTTypeSize320IconFile</key>
<string>iOSapplication</string>
<key>UTTypeSize64IconFile</key>
<string>iOSapplication</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.ostype</key>
......@@ -158,7 +178,11 @@
<key>UTTypeDescription</key>
<string>VTK XML Image Data</string>
<key>UTTypeIdentifier</key>
<string>com.kitware.vts</string>
<string>com.kitware.vti</string>
<key>UTTypeSize320IconFile</key>
<string>iOSapplication</string>
<key>UTTypeSize64IconFile</key>
<string>iOSapplication</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.ostype</key>
......
......@@ -57,22 +57,30 @@
if (indexPath.row == 1)
{
UIDocumentMenuViewController *documentPicker =
[[UIDocumentMenuViewController alloc]
UIDocumentPickerViewController *documentPicker =
[[UIDocumentPickerViewController alloc]
initWithDocumentTypes:@[@"com.kitware.vtu",@"com.kitware.vts",@"com.kitware.vtr",@"com.kitware.vti"]
inMode:UIDocumentPickerModeImport];
documentPicker.delegate = self;
documentPicker.modalPresentationStyle = UIModalPresentationFormSheet;
[self presentViewController:documentPicker animated:YES completion:nil];
[self presentViewController:documentPicker animated:NO completion:nil];
// UIDocumentMenuViewController *documentPicker =
// [[UIDocumentMenuViewController alloc]
// initWithDocumentTypes:@[@"com.kitware.vtu",@"com.kitware.vts",@"com.kitware.vtr",@"com.kitware.vti"]
// inMode:UIDocumentPickerModeImport];
// documentPicker.delegate = self;
// documentPicker.modalPresentationStyle = UIModalPresentationFullScreen;
// [self presentViewController:documentPicker animated:NO completion:nil];
}
}
- (void)documentMenu:(UIDocumentMenuViewController *)documentMenu
didPickDocumentPicker:(UIDocumentPickerViewController *)documentPicker
{
documentPicker.delegate = self;
documentPicker.modalPresentationStyle = UIModalPresentationFormSheet;
[self presentViewController:documentPicker animated:YES completion:nil];
// documentPicker.delegate = self;
// documentPicker.modalPresentationStyle = UIModalPresentationFormSheet;
// [self presentViewController:documentPicker animated:YES completion:nil];
}
- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url
......
......@@ -348,7 +348,6 @@ public:
int index = interactor->GetPointerIndexForContact((size_t)(__bridge void *)touch);
interactor->SetPointerIndex(index);
interactor->LeftButtonPressEvent();
NSLog(@"Starting left mouse %i",index);
}
// Display the buffer
......@@ -434,7 +433,6 @@ public:
interactor->SetPointerIndex(index);
interactor->LeftButtonReleaseEvent();
interactor->ClearContact((size_t)(__bridge void *)touch);
NSLog(@"lifting left mouse");
}
// Display the buffer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment