Commits

filipkunc committed 5dd30f3

Sync cameras checkbox on Mac version for zoom and position in views.

Comments (0)

Files changed (9)

Classes/MyDocument.cpp

     }
 }
 
+- (void)updateCameraZoomAndCenter:(Camera *)camera fromView:(OpenGLSceneView *)view
+{
+    if (!self.syncCameraZoomAndPosition)
+        return;
+    
+    for (OpenGLSceneView *otherView in views)
+    {
+        if (otherView != view)
+        {
+            Camera *otherCamera = [otherView camera];
+            otherCamera->SetZoom(camera->GetZoom());
+            otherCamera->SetCenter(camera->GetCenter());
+            [otherView setNeedsDisplay:YES];
+        }
+    }
+}
+
 - (NSString *)windowNibName
 {
     // Override returning the nib file name of the document
 
 - (void)swapCamerasBetweenFirst:(OpenGLSceneView *)first second:(OpenGLSceneView *)second
 {
-	Camera firstCamera = [first camera];
-	Camera secondCamera = [second camera];
+	Camera firstCamera = *[first camera];
+	Camera secondCamera = *[second camera];
 	CameraMode firstMode = [first cameraMode];
 	CameraMode secondMode = [second cameraMode];
 	[second setCameraMode:firstMode];
 	[first setCameraMode:secondMode];
-	[second setCamera:firstCamera];
-	[first setCamera:secondCamera];
+    *[second camera] = firstCamera;
+    *[first camera] = secondCamera;
 }
 
 - (void)toggleOneViewFourView:(id)sender

Classes/MyDocument.h

 
 @property (readwrite, assign) IOpenGLManipulating *manipulated;
 @property (readonly) NSPopUpButton *scriptPullDown;
+@property (readwrite, assign) BOOL syncCameraZoomAndPosition;
 
 - (void)setNeedsDisplayExceptView:(OpenGLSceneView *)view;
 - (void)setNeedsDisplayOnAllViews;

Classes/OpenGLSceneView.cpp

     virtual void vertexAddOrConnect(Vector3D position, Camera *camera) { [_sceneView.delegate vertexAddOrConnect:position fromCamera:camera]; }
     virtual void vertexAddOrConnectHint(Vector3D position, Camera *camera, vector<Vector3D> &vertices) { [_sceneView.delegate vertexAddOrConnectHint:position fromCamera:camera vertices:&vertices]; }
     virtual void makeCurrentContext() { [[_sceneView openGLContext] makeCurrentContext]; }
+    virtual void updateCameraZoomAndCenter(Camera *camera) { [_sceneView.delegate updateCameraZoomAndCenter:camera fromView:_sceneView]; }
 };
 
 @implementation OpenGLSceneView
     _coreView->setCameraMode(cameraMode);
 }
 
-- (Camera)camera
+- (Camera *)camera
 {
-    return *_coreView->camera();
-}
-
-- (void)setCamera:(Camera)camera
-{
-    *_coreView->camera() = camera;
+    return _coreView->camera();
 }
 
 + (NSOpenGLPixelFormat *)sharedPixelFormat

Classes/OpenGLSceneView.h

 
 - (void)vertexAddOrConnect:(Vector3D)position fromCamera:(Camera *)camera;
 - (void)vertexAddOrConnectHint:(Vector3D)position fromCamera:(Camera *)camera vertices:(vector<Vector3D> *)vertices;
+- (void)updateCameraZoomAndCenter:(Camera *)camera fromView:(OpenGLSceneView *)view;
 
 @end
 
 @property (readwrite, weak) id<OpenGLSceneViewDelegate> delegate;
 @property (readwrite, assign) enum ManipulatorType currentManipulator;
 @property (readwrite, assign) enum CameraMode cameraMode;
-@property (readwrite, assign) Camera camera;
+@property (readonly, assign) Camera *camera;
 
 @end
 

Classes/OpenGLSceneViewCore.cpp

 		
 		_lastPoint = _currentPoint;
         _delegate->setNeedsDisplay();
+        _delegate->updateCameraZoomAndCenter(_camera);
 	}
 	else if (alt)
 	{
 		
 		_lastPoint = _currentPoint;
         _delegate->setNeedsDisplay();
+        _delegate->updateCameraZoomAndCenter(_camera);
 	}
 }
 
 		
 		_lastPoint = _currentPoint;
         _delegate->setNeedsDisplay();
+        _delegate->updateCameraZoomAndCenter(_camera);
 	}
 }
 
 		_camera->LeftRight(-deltaX * _camera->GetZoom() * sensitivity);
 		_camera->UpDown(-deltaY * _camera->GetZoom() * sensitivity);
         _delegate->setNeedsDisplay();
+        _delegate->updateCameraZoomAndCenter(_camera);
 	}
 	else if (alt)
 	{
 		float sensitivity = _camera->GetZoom() * 0.02f;
 		_camera->Zoom(deltaY * sensitivity);
         _delegate->setNeedsDisplay();
+        _delegate->updateCameraZoomAndCenter(_camera);
 	}
 }

Classes/OpenGLSceneViewCore.h

     virtual void vertexAddOrConnect(Vector3D position, Camera *camera) = 0;
     virtual void vertexAddOrConnectHint(Vector3D position, Camera *camera, vector<Vector3D> &vertices) = 0;
     virtual void makeCurrentContext() = 0;
+    virtual void updateCameraZoomAndCenter(Camera *camera) = 0;
 };
 
 class OpenGLSceneViewCore

Classes/VertexWindowController.xib

 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">13A524d</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4488.1</string>
+		<string key="IBDocument.AppKitVersion">1244.12</string>
+		<string key="IBDocument.HIToolboxVersion">686.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4488.1</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
 			<integer value="1" key="NS.object.0"/>
 		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="55103376">
+			<object class="NSCustomObject" id="59396640">
 				<string key="NSClassName">VertexWindowController</string>
 			</object>
-			<object class="NSCustomObject" id="1003">
+			<object class="NSCustomObject" id="812297983">
 				<string key="NSClassName">FirstResponder</string>
 			</object>
-			<object class="NSCustomObject" id="1004">
+			<object class="NSCustomObject" id="127306500">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSWindowTemplate" id="1005">
+			<object class="NSWindowTemplate" id="1036619649">
 				<int key="NSWindowStyleMask">19</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{196, 240}, {170, 98}}</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="1006">
+				<object class="NSView" key="NSWindowView" id="434429657">
 					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
+					<int key="NSvFlags">1280</int>
 					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSMatrix" id="930369865">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{20, 20}, {130, 58}}</string>
-							<reference key="NSSuperview" ref="1006"/>
+						<object class="NSMatrix" id="946148188">
+							<reference key="NSNextResponder" ref="434429657"/>
+							<int key="NSvFlags">1292</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
+							<string key="NSFrame">{{20, 20}, {129, 58}}</string>
+							<reference key="NSSuperview" ref="434429657"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							<int key="NSNumRows">3</int>
 							<int key="NSNumCols">1</int>
 							<array class="NSMutableArray" key="NSCells">
-								<object class="NSButtonCell" id="761936036">
+								<object class="NSButtonCell" id="74858444">
 									<int key="NSCellFlags">-2080374784</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">Add Vertex</string>
-									<object class="NSFont" key="NSSupport" id="53045941">
-										<string key="NSName">LucidaGrande</string>
+									<object class="NSFont" key="NSSupport" id="119853676">
+										<string key="NSName">.LucidaGrandeUI</string>
 										<double key="NSSize">13</double>
 										<int key="NSfFlags">1044</int>
 									</object>
-									<reference key="NSControlView" ref="930369865"/>
+									<reference key="NSControlView" ref="946148188"/>
 									<int key="NSButtonFlags">1211912448</int>
 									<int key="NSButtonFlags2">0</int>
-									<object class="NSButtonImageSource" key="NSAlternateImage" id="772251471">
+									<object class="NSCustomResource" key="NSNormalImage" id="607782910">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSRadioButton</string>
+									</object>
+									<object class="NSButtonImageSource" key="NSAlternateImage" id="297833671">
 										<string key="NSImageName">NSRadioButton</string>
 									</object>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
-									<int key="NSPeriodicDelay">200</int>
-									<int key="NSPeriodicInterval">25</int>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
 								</object>
-								<object class="NSButtonCell" id="959563247">
+								<object class="NSButtonCell" id="619744301">
 									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">Triangle Connect</string>
-									<reference key="NSSupport" ref="53045941"/>
-									<reference key="NSControlView" ref="930369865"/>
+									<reference key="NSSupport" ref="119853676"/>
+									<reference key="NSControlView" ref="946148188"/>
 									<int key="NSTag">1</int>
 									<int key="NSButtonFlags">1211912448</int>
 									<int key="NSButtonFlags2">0</int>
-									<object class="NSImage" key="NSNormalImage">
-										<int key="NSImageFlags">549453824</int>
-										<string key="NSSize">{18, 18}</string>
-										<array class="NSMutableArray" key="NSReps">
-											<array>
-												<integer value="0"/>
-												<object class="NSBitmapImageRep">
-													<object class="NSData" key="NSTIFFRepresentation">
-														<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
-IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
-29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
-dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
-AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
-AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
-0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
-7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
-5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
-3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
-AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
-AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
-6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
-/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
-///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
-YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
-AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
-AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
-AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
-													</object>
-												</object>
-											</array>
-										</array>
-										<object class="NSColor" key="NSColor" id="379586536">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MCAwAA</bytes>
-										</object>
-									</object>
-									<reference key="NSAlternateImage" ref="772251471"/>
+									<reference key="NSNormalImage" ref="607782910"/>
+									<reference key="NSAlternateImage" ref="297833671"/>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
 									<int key="NSPeriodicInterval">75</int>
 								</object>
-								<object class="NSButtonCell" id="107966779">
+								<object class="NSButtonCell" id="696143109">
 									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">Quad Connect</string>
-									<reference key="NSSupport" ref="53045941"/>
-									<reference key="NSControlView" ref="930369865"/>
+									<reference key="NSSupport" ref="119853676"/>
+									<reference key="NSControlView" ref="946148188"/>
 									<int key="NSTag">2</int>
 									<int key="NSButtonFlags">1211912448</int>
 									<int key="NSButtonFlags2">0</int>
-									<reference key="NSAlternateImage" ref="772251471"/>
+									<reference key="NSNormalImage" ref="607782910"/>
+									<reference key="NSAlternateImage" ref="297833671"/>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
 									<int key="NSPeriodicInterval">75</int>
 								</object>
 							</array>
-							<string key="NSCellSize">{130, 18}</string>
+							<string key="NSCellSize">{129, 18}</string>
 							<string key="NSIntercellSpacing">{4, 2}</string>
-							<int key="NSMatrixFlags">1151868928</int>
+							<int key="NSMatrixFlags">1149239296</int>
 							<string key="NSCellClass">NSActionCell</string>
-							<object class="NSButtonCell" key="NSProtoCell" id="1005968726">
+							<object class="NSButtonCell" key="NSProtoCell" id="597705248">
 								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Radio</string>
-								<reference key="NSSupport" ref="53045941"/>
+								<reference key="NSSupport" ref="119853676"/>
 								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">0</int>
-								<object class="NSImage" key="NSNormalImage">
-									<int key="NSImageFlags">549453824</int>
-									<string key="NSSize">{18, 18}</string>
-									<array class="NSMutableArray" key="NSReps">
-										<array>
-											<integer value="0"/>
-											<object class="NSBitmapImageRep">
-												<object class="NSData" key="NSTIFFRepresentation">
-													<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
-IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
-29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
-dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
-AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
-AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
-0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
-7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
-5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
-3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
-AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
-AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
-6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
-/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
-///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
-YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
-AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
-AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
-AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
-												</object>
-											</object>
-										</array>
-									</array>
-									<reference key="NSColor" ref="379586536"/>
-								</object>
-								<reference key="NSAlternateImage" ref="772251471"/>
+								<reference key="NSNormalImage" ref="607782910"/>
+								<reference key="NSAlternateImage" ref="297833671"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
 								<int key="NSPeriodicDelay">400</int>
 								<int key="NSPeriodicInterval">75</int>
 							</object>
-							<reference key="NSSelectedCell" ref="761936036"/>
-							<object class="NSColor" key="NSBackgroundColor">
+							<reference key="NSSelectedCell" ref="74858444"/>
+							<object class="NSColor" key="NSBackgroundColor" id="366963691">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlColor</string>
 									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSCellBackgroundColor">
-								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MQA</bytes>
-							</object>
-							<reference key="NSFont" ref="53045941"/>
+							<reference key="NSCellBackgroundColor" ref="366963691"/>
 							<bool key="NSAutorecalculatesCellSize">YES</bool>
 						</object>
 					</array>
+					<object class="NSPSMatrix" key="NSFrameMatrix"/>
 					<string key="NSFrameSize">{170, 98}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="930369865"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<bool key="usesAutoincrementingIDs">NO</bool>
 			<array class="NSMutableArray" key="connectionRecords">
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
+						<string key="label">radioButtons</string>
+						<reference key="source" ref="59396640"/>
+						<reference key="destination" ref="946148188"/>
 					</object>
-					<int key="connectionID">3</int>
+					<string key="id">16</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">radioButtons</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="930369865"/>
+						<string key="label">window</string>
+						<reference key="source" ref="59396640"/>
+						<reference key="destination" ref="1036619649"/>
 					</object>
-					<int key="connectionID">16</int>
+					<string key="id">3</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="1001"/>
+						<reference key="source" ref="1036619649"/>
+						<reference key="destination" ref="59396640"/>
 					</object>
-					<int key="connectionID">4</int>
+					<string key="id">4</string>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
 					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
+						<string key="id">0</string>
 						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
+						<reference key="children" ref="55103376"/>
 						<nil key="parent"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
+						<string key="id">-2</string>
+						<reference key="object" ref="59396640"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">File's Owner</string>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
+						<string key="id">-1</string>
+						<reference key="object" ref="812297983"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">First Responder</string>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
+						<string key="id">-3</string>
+						<reference key="object" ref="127306500"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
+						<string key="id">1</string>
+						<reference key="object" ref="1036619649"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
+							<reference ref="434429657"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
+						<string key="id">2</string>
+						<reference key="object" ref="434429657"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="101225680">
-								<reference key="firstItem" ref="930369865"/>
-								<int key="firstAttribute">3</int>
+							<reference ref="946148188"/>
+							<object class="IBNSLayoutConstraint" id="951723881">
+								<reference key="firstItem" ref="946148188"/>
+								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">3</int>
+								<reference key="secondItem" ref="434429657"/>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
+								<reference key="containingView" ref="434429657"/>
 								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<float key="scoringTypeFloat">23</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="784199954">
-								<reference key="firstItem" ref="930369865"/>
-								<int key="firstAttribute">5</int>
+							<object class="IBNSLayoutConstraint" id="911891045">
+								<reference key="firstItem" ref="946148188"/>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">5</int>
+								<reference key="secondItem" ref="434429657"/>
+								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
+								<reference key="containingView" ref="434429657"/>
 								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<float key="scoringTypeFloat">23</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
-							<reference ref="930369865"/>
 						</array>
-						<reference key="parent" ref="1005"/>
+						<reference key="parent" ref="1036619649"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="930369865"/>
+						<string key="id">5</string>
+						<reference key="object" ref="946148188"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1005968726"/>
-							<reference ref="761936036"/>
-							<reference ref="959563247"/>
-							<reference ref="107966779"/>
+							<reference ref="597705248"/>
+							<reference ref="74858444"/>
+							<reference ref="619744301"/>
+							<reference ref="696143109"/>
 						</array>
-						<reference key="parent" ref="1006"/>
+						<reference key="parent" ref="434429657"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="1005968726"/>
-						<reference key="parent" ref="930369865"/>
+						<string key="id">6</string>
+						<reference key="object" ref="597705248"/>
+						<reference key="parent" ref="946148188"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="761936036"/>
-						<reference key="parent" ref="930369865"/>
+						<string key="id">7</string>
+						<reference key="object" ref="74858444"/>
+						<reference key="parent" ref="946148188"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="959563247"/>
-						<reference key="parent" ref="930369865"/>
+						<string key="id">8</string>
+						<reference key="object" ref="619744301"/>
+						<reference key="parent" ref="946148188"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="784199954"/>
-						<reference key="parent" ref="1006"/>
+						<string key="id">17</string>
+						<reference key="object" ref="696143109"/>
+						<reference key="parent" ref="946148188"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="107966779"/>
-						<reference key="parent" ref="930369865"/>
+						<string key="id">13</string>
+						<reference key="object" ref="951723881"/>
+						<reference key="parent" ref="434429657"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="101225680"/>
-						<reference key="parent" ref="1006"/>
+						<string key="id">19</string>
+						<reference key="object" ref="911891045"/>
+						<reference key="parent" ref="434429657"/>
 					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="-1.showNotes"/>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="-2.showNotes"/>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="-3.showNotes"/>
+				<boolean value="NO" key="1.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="NO" key="1.IBNSWindowAutoPositionCentersVertical"/>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<boolean value="YES" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<boolean value="NO" key="1.showNotes"/>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="13.showNotes"/>
 				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="17.showNotes"/>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
-					<reference ref="784199954"/>
-					<reference ref="101225680"/>
+				<boolean value="NO" key="19.showNotes"/>
+				<array key="2.IBNSViewMetadataConstraints">
+					<reference ref="951723881"/>
+					<reference ref="911891045"/>
 				</array>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<reference key="2.IBUserGuides" ref="0"/>
+				<boolean value="NO" key="2.showNotes"/>
 				<boolean value="NO" key="5.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<reference key="5.IBUserGuides" ref="0"/>
+				<boolean value="NO" key="5.showNotes"/>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="6.showNotes"/>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="7.showNotes"/>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="8.showNotes"/>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">19</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">VertexWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">radioButtons</string>
-						<string key="NS.object.0">NSMatrix</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">radioButtons</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">radioButtons</string>
-							<string key="candidateClassName">NSMatrix</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/VertexWindowController.h</string>
-					</object>
-				</object>
-			</array>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSRadioButton</string>
+			<string key="NS.object.0">{16, 15}</string>
+		</object>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>

English.lproj/MyDocument.xib

 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<string key="IBDocument.SystemVersion">13A524d</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4488.1</string>
+		<string key="IBDocument.AppKitVersion">1244.12</string>
+		<string key="IBDocument.HIToolboxVersion">686.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4488.1</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
 			<string>NSColorWell</string>
 			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
 			<integer value="1" key="NS.object.0"/>
 		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="580458321">
-			<object class="NSCustomObject" id="512844837">
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1028748591">
+			<object class="NSCustomObject" id="550281004">
 				<string key="NSClassName">MyDocument</string>
 			</object>
-			<object class="NSCustomObject" id="613418571">
+			<object class="NSCustomObject" id="832924603">
 				<string key="NSClassName">FirstResponder</string>
 			</object>
-			<object class="NSWindowTemplate" id="275939982">
+			<object class="NSWindowTemplate" id="270048655">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{127, 259}, {994, 575}}</string>
 				<int key="NSWTFlags">1618477056</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSToolbar" key="NSViewClass" id="24235194">
-					<object class="NSMutableString" key="NSToolbarIdentifier">
-						<characters key="NS.bytes">2DE9B4F1-E71B-4E5F-B6F1-8204E686DA5C</characters>
-					</object>
+				<object class="NSToolbar" key="NSViewClass" id="835306792">
+					<string key="NSToolbarIdentifier">2DE9B4F1-E71B-4E5F-B6F1-8204E686DA5C</string>
 					<nil key="NSToolbarDelegate"/>
 					<bool key="NSToolbarPrefersToBeShown">YES</bool>
 					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
 					<int key="NSToolbarDisplayMode">1</int>
 					<int key="NSToolbarSizeMode">1</int>
 					<dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
-						<object class="NSToolbarItem" key="26BD9092-97FF-49E1-92D7-9DBE4651D63E" id="800827235">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">26BD9092-97FF-49E1-92D7-9DBE4651D63E</characters>
-							</object>
+						<object class="NSToolbarItem" key="26BD9092-97FF-49E1-92D7-9DBE4651D63E" id="925504282">
+							<string key="NSToolbarItemIdentifier">26BD9092-97FF-49E1-92D7-9DBE4651D63E</string>
 							<string key="NSToolbarItemLabel">Rotate</string>
 							<string key="NSToolbarItemPaletteLabel">Rotate</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="2BA004B9-95A8-4B21-A55F-3747D15912C9" id="169982275">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">2BA004B9-95A8-4B21-A55F-3747D15912C9</characters>
-							</object>
+						<object class="NSToolbarItem" key="2BA004B9-95A8-4B21-A55F-3747D15912C9" id="356419621">
+							<string key="NSToolbarItemIdentifier">2BA004B9-95A8-4B21-A55F-3747D15912C9</string>
 							<string key="NSToolbarItemLabel">Add Cylinder</string>
 							<string key="NSToolbarItemPaletteLabel">Add Cylinder</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="3275AA6B-7159-4596-9DF0-F25B101E4ED9" id="345729276">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">3275AA6B-7159-4596-9DF0-F25B101E4ED9</characters>
-							</object>
+						<object class="NSToolbarItem" key="3275AA6B-7159-4596-9DF0-F25B101E4ED9" id="217324549">
+							<string key="NSToolbarItemIdentifier">3275AA6B-7159-4596-9DF0-F25B101E4ED9</string>
 							<string key="NSToolbarItemLabel">Split</string>
 							<string key="NSToolbarItemPaletteLabel">Split</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="52A9EC91-FCB7-464E-A935-1D0B15906B12" id="474581757">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">52A9EC91-FCB7-464E-A935-1D0B15906B12</characters>
-							</object>
+						<object class="NSToolbarItem" key="52A9EC91-FCB7-464E-A935-1D0B15906B12" id="30698397">
+							<string key="NSToolbarItemIdentifier">52A9EC91-FCB7-464E-A935-1D0B15906B12</string>
 							<string key="NSToolbarItemLabel">Add Cube</string>
 							<string key="NSToolbarItemPaletteLabel">Add Cube</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="5CCC5BC9-2B96-4FAC-8604-5FBE6EC33E9A" id="512122280">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">5CCC5BC9-2B96-4FAC-8604-5FBE6EC33E9A</characters>
-							</object>
+						<object class="NSToolbarItem" key="5CCC5BC9-2B96-4FAC-8604-5FBE6EC33E9A" id="648285056">
+							<string key="NSToolbarItemIdentifier">5CCC5BC9-2B96-4FAC-8604-5FBE6EC33E9A</string>
 							<string key="NSToolbarItemLabel">Run Script</string>
 							<string key="NSToolbarItemPaletteLabel">Run Script</string>
 							<nil key="NSToolbarItemToolTip"/>
-							<object class="NSPopUpButton" key="NSToolbarItemView" id="768362601">
+							<object class="NSPopUpButton" key="NSToolbarItemView" id="64093273">
 								<nil key="NSNextResponder"/>
-								<int key="NSvFlags">268</int>
+								<int key="NSvFlags">1804</int>
+								<object class="NSPSMatrix" key="NSFrameMatrix"/>
 								<string key="NSFrame">{{9, 14}, {45, 25}}</string>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSPopUpButtonCell" key="NSCell" id="926969746">
-									<int key="NSCellFlags">-2080374720</int>
+								<object class="NSPopUpButtonCell" key="NSCell" id="479550115">
+									<int key="NSCellFlags">67108928</int>
 									<int key="NSCellFlags2">134219776</int>
-									<object class="NSFont" key="NSSupport" id="889920428">
-										<string key="NSName">LucidaGrande</string>
+									<object class="NSFont" key="NSSupport" id="309518642">
+										<string key="NSName">.LucidaGrandeUI</string>
 										<double key="NSSize">13</double>
-										<int key="NSfFlags">1044</int>
+										<int key="NSfFlags">1301</int>
 									</object>
-									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="768362601"/>
-									<int key="NSButtonFlags">-2038415360</int>
+									<reference key="NSControlView" ref="64093273"/>
+									<int key="NSButtonFlags">-2038284288</int>
 									<int key="NSButtonFlags2">163</int>
+									<object class="NSFont" key="NSAlternateImage" id="356524081">
+										<string key="NSName">.LucidaGrandeUI</string>
+										<double key="NSSize">13</double>
+										<int key="NSfFlags">16</int>
+									</object>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
 									<int key="NSPeriodicInterval">75</int>
-									<object class="NSMenuItem" key="NSMenuItem" id="912296229">
-										<reference key="NSMenu" ref="320808127"/>
+									<object class="NSMenuItem" key="NSMenuItem" id="210605060">
+										<reference key="NSMenu" ref="1056480181"/>
 										<bool key="NSIsHidden">YES</bool>
 										<string key="NSTitle"/>
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<object class="NSCustomResource" key="NSImage" id="931054690">
+										<object class="NSCustomResource" key="NSImage" id="636122611">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">NSActionTemplate</string>
 										</object>
-										<object class="NSCustomResource" key="NSOnImage" id="390275894">
+										<object class="NSCustomResource" key="NSOnImage" id="199413247">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">NSMenuCheckmark</string>
 										</object>
-										<object class="NSCustomResource" key="NSMixedImage" id="950700548">
+										<object class="NSCustomResource" key="NSMixedImage" id="933699027">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">NSMenuMixedState</string>
 										</object>
 										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="926969746"/>
+										<reference key="NSTarget" ref="479550115"/>
 									</object>
 									<bool key="NSMenuItemRespectAlignment">YES</bool>
-									<object class="NSMenu" key="NSMenu" id="320808127">
+									<object class="NSMenu" key="NSMenu" id="1056480181">
 										<string key="NSTitle">OtherViews</string>
 										<array class="NSMutableArray" key="NSMenuItems">
-											<reference ref="912296229"/>
+											<reference ref="210605060"/>
 										</array>
 										<bool key="NSMenuExcludeMarkColumn">YES</bool>
-										<reference key="NSMenuFont" ref="889920428"/>
 									</object>
 									<bool key="NSPullDown">YES</bool>
 									<int key="NSPreferredEdge">1</int>
 								</object>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
-							<reference key="NSToolbarItemImage" ref="931054690"/>
+							<reference key="NSToolbarItemImage" ref="636122611"/>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{45, 25}</string>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="61A15B32-375C-4624-A8FE-31AD58DF877D" id="560091128">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">61A15B32-375C-4624-A8FE-31AD58DF877D</characters>
-							</object>
+						<object class="NSToolbarItem" key="61A15B32-375C-4624-A8FE-31AD58DF877D" id="127996644">
+							<string key="NSToolbarItemIdentifier">61A15B32-375C-4624-A8FE-31AD58DF877D</string>
 							<string key="NSToolbarItemLabel">Add Plane</string>
 							<string key="NSToolbarItemPaletteLabel">Add Plane</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="6848C2DF-1F0E-401A-837E-65A5C6B79888" id="257090882">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">6848C2DF-1F0E-401A-837E-65A5C6B79888</characters>
-							</object>
+						<object class="NSToolbarItem" key="6848C2DF-1F0E-401A-837E-65A5C6B79888" id="500985589">
+							<string key="NSToolbarItemIdentifier">6848C2DF-1F0E-401A-837E-65A5C6B79888</string>
 							<string key="NSToolbarItemLabel">Add Sphere</string>
 							<string key="NSToolbarItemPaletteLabel">Add Sphere</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="879C988C-EFE1-4225-B97D-29DFE29FB67C" id="534841699">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">879C988C-EFE1-4225-B97D-29DFE29FB67C</characters>
-							</object>
+						<object class="NSToolbarItem" key="879C988C-EFE1-4225-B97D-29DFE29FB67C" id="210689251">
+							<string key="NSToolbarItemIdentifier">879C988C-EFE1-4225-B97D-29DFE29FB67C</string>
 							<string key="NSToolbarItemLabel">Scale</string>
 							<string key="NSToolbarItemPaletteLabel">Scale</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="911C5773-BD07-4259-8A19-97DFA4ED76C8" id="441889733">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">911C5773-BD07-4259-8A19-97DFA4ED76C8</characters>
-							</object>
+						<object class="NSToolbarItem" key="911C5773-BD07-4259-8A19-97DFA4ED76C8" id="481310080">
+							<string key="NSToolbarItemIdentifier">911C5773-BD07-4259-8A19-97DFA4ED76C8</string>
 							<string key="NSToolbarItemLabel">Merge</string>
 							<string key="NSToolbarItemPaletteLabel">Merge</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="9123454B-2ABD-4337-9CB7-3A3648AC990C" id="224258111">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">9123454B-2ABD-4337-9CB7-3A3648AC990C</characters>
-							</object>
+						<object class="NSToolbarItem" key="9123454B-2ABD-4337-9CB7-3A3648AC990C" id="343400675">
+							<string key="NSToolbarItemIdentifier">9123454B-2ABD-4337-9CB7-3A3648AC990C</string>
 							<string key="NSToolbarItemLabel">Translate</string>
 							<string key="NSToolbarItemPaletteLabel">Translate</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="B40427DD-2380-4751-B197-4E0CFAF8D40E" id="765707748">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">B40427DD-2380-4751-B197-4E0CFAF8D40E</characters>
-							</object>
+						<object class="NSToolbarItem" key="B40427DD-2380-4751-B197-4E0CFAF8D40E" id="581461886">
+							<string key="NSToolbarItemIdentifier">B40427DD-2380-4751-B197-4E0CFAF8D40E</string>
 							<string key="NSToolbarItemLabel">Select</string>
 							<string key="NSToolbarItemPaletteLabel">Select</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="D2F0F3F7-D811-4F4F-B320-8CDEF63AD699" id="772056680">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">D2F0F3F7-D811-4F4F-B320-8CDEF63AD699</characters>
-							</object>
+						<object class="NSToolbarItem" key="D2F0F3F7-D811-4F4F-B320-8CDEF63AD699" id="513841732">
+							<string key="NSToolbarItemIdentifier">D2F0F3F7-D811-4F4F-B320-8CDEF63AD699</string>
 							<string key="NSToolbarItemLabel">Subdivision</string>
 							<string key="NSToolbarItemPaletteLabel">Subdivision</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="DADF0523-DB5F-4594-B404-DADF63557B2A" id="311364792">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">DADF0523-DB5F-4594-B404-DADF63557B2A</characters>
-							</object>
+						<object class="NSToolbarItem" key="DADF0523-DB5F-4594-B404-DADF63557B2A" id="333119607">
+							<string key="NSToolbarItemIdentifier">DADF0523-DB5F-4594-B404-DADF63557B2A</string>
 							<string key="NSToolbarItemLabel">Add Icosahedron</string>
 							<string key="NSToolbarItemPaletteLabel">Add Icosahedron</string>
 							<string key="NSToolbarItemToolTip"/>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="F4A11C94-A8B0-479D-9BAE-9F509696847E" id="384829746">
-							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">F4A11C94-A8B0-479D-9BAE-9F509696847E</characters>
-							</object>
+						<object class="NSToolbarItem" key="F4A11C94-A8B0-479D-9BAE-9F509696847E" id="896757043">
+							<string key="NSToolbarItemIdentifier">F4A11C94-A8B0-479D-9BAE-9F509696847E</string>
 							<string key="NSToolbarItemLabel">Edit Mode</string>
 							<string key="NSToolbarItemPaletteLabel">Edit Mode</string>
 							<nil key="NSToolbarItemToolTip"/>
-							<object class="NSPopUpButton" key="NSToolbarItemView" id="631661131">
+							<object class="NSPopUpButton" key="NSToolbarItemView" id="802941379">
 								<nil key="NSNextResponder"/>
-								<int key="NSvFlags">268</int>
+								<int key="NSvFlags">1804</int>
+								<object class="NSPSMatrix" key="NSFrameMatrix"/>
 								<string key="NSFrame">{{0, 14}, {100, 25}}</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSPopUpButtonCell" key="NSCell" id="857395174">
+								<object class="NSPopUpButtonCell" key="NSCell" id="737174690">
 									<int key="NSCellFlags">-2076180416</int>
 									<int key="NSCellFlags2">2048</int>
-									<reference key="NSSupport" ref="889920428"/>
-									<reference key="NSControlView" ref="631661131"/>
+									<reference key="NSSupport" ref="309518642"/>
+									<reference key="NSControlView" ref="802941379"/>
 									<int key="NSButtonFlags">-2038284288</int>
 									<int key="NSButtonFlags2">163</int>
+									<reference key="NSAlternateImage" ref="356524081"/>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
 									<int key="NSPeriodicInterval">75</int>
-									<object class="NSMenuItem" key="NSMenuItem" id="313745957">
-										<reference key="NSMenu" ref="860704842"/>
-										<string key="NSTitle">Items</string>
-										<string key="NSKeyEquiv">i</string>
+									<object class="NSMenuItem" key="NSMenuItem" id="439826779">
+										<reference key="NSMenu" ref="658061098"/>
+										<string key="NSTitle">Edges</string>
+										<string key="NSKeyEquiv">e</string>
 										<int key="NSMnemonicLoc">2147483647</int>
 										<int key="NSState">1</int>
-										<reference key="NSOnImage" ref="390275894"/>
-										<reference key="NSMixedImage" ref="950700548"/>
+										<reference key="NSOnImage" ref="199413247"/>
+										<reference key="NSMixedImage" ref="933699027"/>
 										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="857395174"/>
+										<int key="NSTag">3</int>
+										<reference key="NSTarget" ref="737174690"/>
 									</object>
 									<bool key="NSMenuItemRespectAlignment">YES</bool>
-									<object class="NSMenu" key="NSMenu" id="860704842">
+									<object class="NSMenu" key="NSMenu" id="658061098">
 										<string key="NSTitle">OtherViews</string>
 										<array class="NSMutableArray" key="NSMenuItems">
-											<reference ref="313745957"/>
-											<object class="NSMenuItem" id="136780822">
-												<reference key="NSMenu" ref="860704842"/>
+											<object class="NSMenuItem" id="85092667">
+												<reference key="NSMenu" ref="658061098"/>
+												<string key="NSTitle">Items</string>
+												<string key="NSKeyEquiv">i</string>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="199413247"/>
+												<reference key="NSMixedImage" ref="933699027"/>
+												<string key="NSAction">_popUpItemAction:</string>
+												<reference key="NSTarget" ref="737174690"/>
+											</object>
+											<object class="NSMenuItem" id="314802512">
+												<reference key="NSMenu" ref="658061098"/>
 												<string key="NSTitle">Vertices</string>
 												<string key="NSKeyEquiv">v</string>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="390275894"/>
-												<reference key="NSMixedImage" ref="950700548"/>
+												<reference key="NSOnImage" ref="199413247"/>
+												<reference key="NSMixedImage" ref="933699027"/>
 												<string key="NSAction">_popUpItemAction:</string>
 												<int key="NSTag">1</int>
-												<reference key="NSTarget" ref="857395174"/>
+												<reference key="NSTarget" ref="737174690"/>
 											</object>
-											<object class="NSMenuItem" id="639890568">
-												<reference key="NSMenu" ref="860704842"/>
+											<object class="NSMenuItem" id="360526287">
+												<reference key="NSMenu" ref="658061098"/>
 												<string key="NSTitle">Triangles</string>
 												<string key="NSKeyEquiv">t</string>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="390275894"/>
-												<reference key="NSMixedImage" ref="950700548"/>
+												<reference key="NSOnImage" ref="199413247"/>
+												<reference key="NSMixedImage" ref="933699027"/>
 												<string key="NSAction">_popUpItemAction:</string>
 												<int key="NSTag">2</int>
-												<reference key="NSTarget" ref="857395174"/>
-											</object>
-											<object class="NSMenuItem" id="540689705">
-												<reference key="NSMenu" ref="860704842"/>
-												<string key="NSTitle">Edges</string>
-												<string key="NSKeyEquiv">e</string>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<int key="NSState">1</int>
-												<reference key="NSOnImage" ref="390275894"/>
-												<reference key="NSMixedImage" ref="950700548"/>
-												<string key="NSAction">_popUpItemAction:</string>
-												<int key="NSTag">3</int>
-												<reference key="NSTarget" ref="857395174"/>
+												<reference key="NSTarget" ref="737174690"/>
 											</object>
+											<reference ref="439826779"/>
 										</array>
 									</object>
 									<int key="NSSelectedIndex">3</int>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarFlexibleSpaceItem" key="NSToolbarFlexibleSpaceItem" id="767646089">
+						<object class="NSToolbarFlexibleSpaceItem" key="NSToolbarFlexibleSpaceItem" id="237325220">
 							<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
 							<string key="NSToolbarItemLabel"/>
 							<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
 								<string key="NSKeyEquiv"/>
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
-								<reference key="NSOnImage" ref="390275894"/>
-								<reference key="NSMixedImage" ref="950700548"/>
+								<reference key="NSOnImage" ref="199413247"/>
+								<reference key="NSMixedImage" ref="933699027"/>
 							</object>
 						</object>
-						<object class="NSToolbarSeparatorItem" key="NSToolbarSeparatorItem" id="786968178">
+						<object class="NSToolbarSeparatorItem" key="NSToolbarSeparatorItem" id="359570811">
 							<string key="NSToolbarItemIdentifier">NSToolbarSeparatorItem</string>
 							<string key="NSToolbarItemLabel"/>
 							<string key="NSToolbarItemPaletteLabel">Separator</string>
 								<string key="NSKeyEquiv"/>
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
-								<reference key="NSOnImage" ref="390275894"/>
-								<reference key="NSMixedImage" ref="950700548"/>
+								<reference key="NSOnImage" ref="199413247"/>
+								<reference key="NSMixedImage" ref="933699027"/>
 							</object>
 						</object>
-						<object class="NSToolbarSpaceItem" key="NSToolbarSpaceItem" id="804788330">
+						<object class="NSToolbarSpaceItem" key="NSToolbarSpaceItem" id="328854917">
 							<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
 							<string key="NSToolbarItemLabel"/>
 							<string key="NSToolbarItemPaletteLabel">Space</string>
 								<string key="NSKeyEquiv"/>
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
-								<reference key="NSOnImage" ref="390275894"/>
-								<reference key="NSMixedImage" ref="950700548"/>
+								<reference key="NSOnImage" ref="199413247"/>
+								<reference key="NSMixedImage" ref="933699027"/>
 							</object>
 						</object>
 					</dictionary>
-					<array key="NSToolbarIBAllowedItems">
-						<reference ref="765707748"/>
-						<reference ref="224258111"/>
-						<reference ref="800827235"/>
-						<reference ref="534841699"/>
-						<reference ref="560091128"/>
-						<reference ref="474581757"/>
-						<reference ref="169982275"/>
-						<reference ref="257090882"/>
-						<reference ref="311364792"/>
-						<reference ref="384829746"/>
-						<reference ref="441889733"/>
-						<reference ref="345729276"/>
-						<reference ref="804788330"/>
-						<reference ref="767646089"/>
-						<reference ref="772056680"/>
-						<reference ref="786968178"/>
-						<reference ref="512122280"/>
+					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+						<reference ref="581461886"/>
+						<reference ref="343400675"/>
+						<reference ref="925504282"/>
+						<reference ref="210689251"/>
+						<reference ref="127996644"/>
+						<reference ref="30698397"/>
+						<reference ref="356419621"/>
+						<reference ref="500985589"/>
+						<reference ref="333119607"/>
+						<reference ref="896757043"/>
+						<reference ref="481310080"/>
+						<reference ref="217324549"/>
+						<reference ref="328854917"/>
+						<reference ref="237325220"/>
+						<reference ref="513841732"/>
+						<reference ref="359570811"/>
+						<reference ref="648285056"/>
 					</array>
-					<array key="NSToolbarIBDefaultItems">
-						<reference ref="765707748"/>
-						<reference ref="224258111"/>
-						<reference ref="800827235"/>
-						<reference ref="534841699"/>
-						<reference ref="560091128"/>
-						<reference ref="474581757"/>
-						<reference ref="169982275"/>
-						<reference ref="257090882"/>
-						<reference ref="311364792"/>
-						<reference ref="384829746"/>
-						<reference ref="345729276"/>
-						<reference ref="441889733"/>
-						<reference ref="772056680"/>
-						<reference ref="512122280"/>
-						<reference ref="767646089"/>
+					<array class="NSMutableArray" key="NSToolbarIBDefaultItems">
+						<reference ref="581461886"/>
+						<reference ref="343400675"/>
+						<reference ref="925504282"/>
+						<reference ref="210689251"/>
+						<reference ref="127996644"/>
+						<reference ref="30698397"/>
+						<reference ref="356419621"/>
+						<reference ref="500985589"/>
+						<reference ref="333119607"/>
+						<reference ref="896757043"/>
+						<reference ref="217324549"/>
+						<reference ref="481310080"/>
+						<reference ref="513841732"/>
+						<reference ref="648285056"/>
+						<reference ref="237325220"/>
 					</array>
-					<array key="NSToolbarIBSelectableItems" id="0"/>
 				</object>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{94, 86}</string>
-				<object class="NSView" key="NSWindowView" id="568628114">
+				<object class="NSView" key="NSWindowView" id="423663085">
 					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
+					<int key="NSvFlags">1792</int>
 					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSSplitView" id="113445383">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">274</int>
+						<object class="NSSplitView" id="631023412">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1810</int>
 							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSSplitView" id="298304967">
-									<reference key="NSNextResponder" ref="113445383"/>
-									<int key="NSvFlags">274</int>
+								<object class="NSSplitView" id="375748829">
+									<reference key="NSNextResponder" ref="631023412"/>
+									<int key="NSvFlags">1810</int>
 									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSSplitView" id="576154545">
-											<reference key="NSNextResponder" ref="298304967"/>
-											<int key="NSvFlags">274</int>
+										<object class="NSSplitView" id="634267145">
+											<reference key="NSNextResponder" ref="375748829"/>
+											<int key="NSvFlags">1810</int>
 											<array class="NSMutableArray" key="NSSubviews">
-												<object class="NSCustomView" id="895228">
-													<reference key="NSNextResponder" ref="576154545"/>
-													<int key="NSvFlags">268</int>
+												<object class="NSCustomView" id="980325779">
+													<reference key="NSNextResponder" ref="634267145"/>
+													<int key="NSvFlags">1804</int>
+													<object class="NSPSMatrix" key="NSFrameMatrix"/>
 													<string key="NSFrameSize">{505, 268}</string>
-													<reference key="NSSuperview" ref="576154545"/>
+													<reference key="NSSuperview" ref="634267145"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="695177800"/>
-													<string key="NSReuseIdentifierKey">_NS:9</string>
+													<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 													<string key="NSClassName">OpenGLSceneView</string>
 												</object>
-												<object class="NSCustomView" id="695177800">
-													<reference key="NSNextResponder" ref="576154545"/>
-													<int key="NSvFlags">268</int>
+												<object class="NSCustomView" id="759167842">
+													<reference key="NSNextResponder" ref="634267145"/>
+													<int key="NSvFlags">1804</int>
+													<object class="NSPSMatrix" key="NSFrameMatrix"/>
 													<string key="NSFrame">{{506, 0}, {488, 268}}</string>
-													<reference key="NSSuperview" ref="576154545"/>
+													<reference key="NSSuperview" ref="634267145"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="752972658"/>
-													<string key="NSReuseIdentifierKey">_NS:9</string>
+													<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 													<string key="NSClassName">OpenGLSceneView</string>
 												</object>
 											</array>
+											<object class="NSPSMatrix" key="NSFrameMatrix"/>
 											<string key="NSFrameSize">{994, 268}</string>
-											<reference key="NSSuperview" ref="298304967"/>
+											<reference key="NSSuperview" ref="375748829"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="895228"/>
+											<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 											<bool key="NSIsVertical">YES</bool>
 											<int key="NSDividerStyle">2</int>
 										</object>
-										<object class="NSSplitView" id="752972658">
-											<reference key="NSNextResponder" ref="298304967"/>
-											<int key="NSvFlags">274</int>
+										<object class="NSSplitView" id="685264473">
+											<reference key="NSNextResponder" ref="375748829"/>
+											<int key="NSvFlags">1810</int>
 											<array class="NSMutableArray" key="NSSubviews">
-												<object class="NSCustomView" id="108403157">
-													<reference key="NSNextResponder" ref="752972658"/>
-													<int key="NSvFlags">268</int>
+												<object class="NSCustomView" id="73904369">
+													<reference key="NSNextResponder" ref="685264473"/>
+													<int key="NSvFlags">1804</int>
+													<object class="NSPSMatrix" key="NSFrameMatrix"/>
 													<string key="NSFrameSize">{505, 274}</string>
-													<reference key="NSSuperview" ref="752972658"/>
+													<reference key="NSSuperview" ref="685264473"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="830931893"/>
-													<string key="NSReuseIdentifierKey">_NS:9</string>
+													<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 													<string key="NSClassName">OpenGLSceneView</string>
 												</object>
-												<object class="NSCustomView" id="830931893">
-													<reference key="NSNextResponder" ref="752972658"/>
-													<int key="NSvFlags">268</int>
+												<object class="NSCustomView" id="949245849">
+													<reference key="NSNextResponder" ref="685264473"/>
+													<int key="NSvFlags">1804</int>
+													<object class="NSPSMatrix" key="NSFrameMatrix"/>
 													<string key="NSFrame">{{506, 0}, {488, 274}}</string>
-													<reference key="NSSuperview" ref="752972658"/>
+													<reference key="NSSuperview" ref="685264473"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="748403359"/>
-													<string key="NSReuseIdentifierKey">_NS:9</string>
+													<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 													<string key="NSClassName">OpenGLSceneView</string>
 												</object>
 											</array>
+											<object class="NSPSMatrix" key="NSFrameMatrix"/>
 											<string key="NSFrame">{{0, 269}, {994, 274}}</string>
-											<reference key="NSSuperview" ref="298304967"/>
+											<reference key="NSSuperview" ref="375748829"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="108403157"/>
+											<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 											<bool key="NSIsVertical">YES</bool>
 											<int key="NSDividerStyle">2</int>
 										</object>
 									</array>
+									<object class="NSPSMatrix" key="NSFrameMatrix"/>
 									<string key="NSFrameSize">{994, 543}</string>
-									<reference key="NSSuperview" ref="113445383"/>
+									<reference key="NSSuperview" ref="631023412"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="576154545"/>
+									<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 									<int key="NSDividerStyle">2</int>
 								</object>
 							</array>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{0, 32}, {994, 543}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="298304967"/>
 							<bool key="NSIsVertical">YES</bool>
 							<int key="NSDividerStyle">3</int>
 						</object>
-						<object class="NSTextField" id="402915775">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="363464701">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{589, 7}, {38, 17}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="302821449"/>
-							<string key="NSReuseIdentifierKey">_NS:1505</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="63043105">
+							<object class="NSTextFieldCell" key="NSCell" id="961762205">
 								<int key="NSCellFlags">68157504</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">X:</string>
-								<reference key="NSSupport" ref="889920428"/>
-								<string key="NSCellIdentifier">_NS:1505</string>
-								<reference key="NSControlView" ref="402915775"/>
-								<object class="NSColor" key="NSBackgroundColor" id="923848753">
+								<object class="NSFont" key="NSSupport" id="549925281">
+									<string key="NSName">.LucidaGrandeUI</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="363464701"/>
+								<object class="NSColor" key="NSBackgroundColor" id="562876948">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">controlColor</string>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSTextField" id="862077451">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="269583746">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{722, 7}, {38, 17}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="727107464"/>
-							<string key="NSReuseIdentifierKey">_NS:1505</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="628431921">
+							<object class="NSTextFieldCell" key="NSCell" id="761883508">
 								<int key="NSCellFlags">68157504</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">Y:</string>
-								<reference key="NSSupport" ref="889920428"/>
-								<string key="NSCellIdentifier">_NS:1505</string>
-								<reference key="NSControlView" ref="862077451"/>
-								<reference key="NSBackgroundColor" ref="923848753"/>
+								<reference key="NSSupport" ref="549925281"/>
+								<reference key="NSControlView" ref="269583746"/>
+								<reference key="NSBackgroundColor" ref="562876948"/>
 								<object class="NSColor" key="NSTextColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MCAwLjUwMTk2MDgxNCAwLjI1MDk4MDQwNwA</bytes>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSTextField" id="1062463690">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="409880485">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{858, 7}, {38, 17}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="30980160"/>
-							<string key="NSReuseIdentifierKey">_NS:1505</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="428109963">
+							<object class="NSTextFieldCell" key="NSCell" id="752904341">
 								<int key="NSCellFlags">68157504</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">Z:</string>
-								<reference key="NSSupport" ref="889920428"/>
-								<string key="NSCellIdentifier">_NS:1505</string>
-								<reference key="NSControlView" ref="1062463690"/>
-								<reference key="NSBackgroundColor" ref="923848753"/>
+								<reference key="NSSupport" ref="549925281"/>
+								<reference key="NSControlView" ref="409880485"/>
+								<reference key="NSBackgroundColor" ref="562876948"/>
 								<object class="NSColor" key="NSTextColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MCAwLjI1MDk4MDQwNyAwLjUwMTk2MDgxNAA</bytes>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSTextField" id="302821449">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="1002702727">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{610, 4}, {96, 22}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="862077451"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="584353351">
+							<object class="NSTextFieldCell" key="NSCell" id="164430673">
 								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">272630784</int>
-								<reference key="NSSupport" ref="889920428"/>
-								<object class="NSNumberFormatter" key="NSFormatter" id="67777086">
+								<reference key="NSSupport" ref="549925281"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="542602872">
 									<dictionary class="NSMutableDictionary" key="NS.attributes">
 										<boolean value="YES" key="allowsFloats"/>
+										<boolean value="NO" key="alwaysShowsDecimalSeparator"/>
+										<string key="currencyDecimalSeparator">,</string>
+										<string key="decimalSeparator">,</string>
+										<string key="exponentSymbol">E</string>
+										<integer value="0" key="formatWidth"/>
 										<integer value="1040" key="formatterBehavior"/>
+										<boolean value="NO" key="generatesDecimalNumbers"/>
+										<string type="base64-UTF8" key="groupingSeparator">wqA</string>
 										<integer value="0" key="groupingSize"/>
 										<boolean value="NO" key="lenient"/>
+										<integer value="2" key="maximumFractionDigits"/>
+										<integer value="309" key="maximumIntegerDigits"/>
+										<integer value="2" key="minimumFractionDigits"/>
+										<integer value="1" key="minimumIntegerDigits"/>
+										<string key="minusSign">-</string>
 										<string key="negativeFormat">#0.00</string>
 										<string key="negativeInfinitySymbol">-∞</string>
+										<string key="negativePrefix">-</string>
+										<string key="negativeSuffix"/>
 										<string key="nilSymbol"/>
+										<string key="notANumberSymbol">NaN</string>
 										<integer value="2" key="numberStyle"/>
+										<string key="paddingCharacter">*</string>
+										<integer value="0" key="paddingPosition"/>
+										<string key="perMillSymbol">‰</string>
+										<string key="percentSymbol">%</string>
+										<string key="plusSign">+</string>
 										<string key="positiveFormat">#0.00</string>
 										<string key="positiveInfinitySymbol">+∞</string>
+										<string key="positivePrefix"/>
+										<string key="positiveSuffix"/>
+										<real value="0.0" key="roundingIncrement"/>
+										<integer value="4" key="roundingMode"/>
+										<integer value="0" key="secondaryGroupingSize"/>
 										<boolean value="NO" key="usesGroupingSeparator"/>
 									</dictionary>
 									<string key="NS.positiveformat">#0.00</string>
 									</object>
 									<object class="NSAttributedString" key="NS.nan">
 										<string key="NSString">NaN</string>
-										<dictionary key="NSAttributes" id="270440689"/>
+										<dictionary key="NSAttributes" id="991341371"/>
 									</object>
-									<object class="NSDecimalNumberPlaceholder" key="NS.min" id="454209341">
+									<object class="NSDecimalNumberPlaceholder" key="NS.min" id="1006755439">
 										<int key="NS.exponent">0</int>
 										<int key="NS.length">0</int>
 										<bool key="NS.negative">YES</bool>
 										<int key="NS.mantissa.bo">1</int>
 										<bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
 									</object>
-									<reference key="NS.max" ref="454209341"/>
+									<reference key="NS.max" ref="1006755439"/>
 									<object class="NSDecimalNumberHandler" key="NS.rounding">
 										<int key="NS.roundingmode">3</int>
 										<bool key="NS.raise.overflow">YES</bool>
 										<bool key="NS.raise.underflow">YES</bool>
 										<bool key="NS.raise.dividebyzero">YES</bool>
 									</object>
-									<string key="NS.decimal">.</string>
-									<string key="NS.thousand">,</string>
+									<string key="NS.decimal">,</string>
+									<string type="base64-UTF8" key="NS.thousand">wqA</string>
 									<bool key="NS.hasthousands">NO</bool>
 									<bool key="NS.localized">YES</bool>
 									<bool key="NS.allowsfloats">YES</bool>
 								</object>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="302821449"/>
+								<reference key="NSControlView" ref="1002702727"/>
 								<bool key="NSDrawsBackground">YES</bool>
-								<object class="NSColor" key="NSBackgroundColor" id="594640124">
+								<object class="NSColor" key="NSBackgroundColor" id="854463187">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">textBackgroundColor</string>
 										<bytes key="NSWhite">MQA</bytes>
 									</object>
 								</object>
-								<object class="NSColor" key="NSTextColor" id="914237195">
+								<object class="NSColor" key="NSTextColor" id="128286800">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">textColor</string>
-									<object class="NSColor" key="NSColor" id="42855238">
+									<object class="NSColor" key="NSColor" id="484703423">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MAA</bytes>
 									</object>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSTextField" id="727107464">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="276412291">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{744, 4}, {96, 22}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1062463690"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="456150611">
+							<object class="NSTextFieldCell" key="NSCell" id="881188143">
 								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">272630784</int>
-								<reference key="NSSupport" ref="889920428"/>
-								<object class="NSNumberFormatter" key="NSFormatter" id="398188717">
+								<reference key="NSSupport" ref="549925281"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="568837609">
 									<dictionary class="NSMutableDictionary" key="NS.attributes">
 										<boolean value="YES" key="allowsFloats"/>
+										<boolean value="NO" key="alwaysShowsDecimalSeparator"/>
+										<string key="currencyDecimalSeparator">.</string>
+										<string key="decimalSeparator">.</string>
+										<string key="exponentSymbol">E</string>
+										<integer value="0" key="formatWidth"/>
 										<integer value="1040" key="formatterBehavior"/>
-										<object class="NSLocale" key="locale" id="890877227">
-											<string key="NS.identifier"/>
-										</object>
+										<boolean value="NO" key="generatesDecimalNumbers"/>
+										<string key="groupingSeparator">,</string>
+										<integer value="0" key="groupingSize"/>
+										<boolean value="NO" key="lenient"/>
+										<integer value="2" key="maximumFractionDigits"/>
+										<integer value="309" key="maximumIntegerDigits"/>
+										<integer value="2" key="minimumFractionDigits"/>
+										<integer value="1" key="minimumIntegerDigits"/>
+										<string key="minusSign">-</string>
 										<string key="negativeFormat">#0.00</string>
 										<string key="negativeInfinitySymbol">-∞</string>
+										<string key="negativePrefix">-</string>
+										<string key="negativeSuffix"/>
 										<string key="nilSymbol"/>
+										<string key="notANumberSymbol">NaN</string>
 										<integer value="4" key="numberStyle"/>
+										<string key="paddingCharacter">*</string>
+										<integer value="0" key="paddingPosition"/>
+										<string key="perMillSymbol">‰</string>
+										<string key="percentSymbol">%</string>
+										<string key="plusSign">+</string>
 										<string key="positiveFormat">#0.00</string>
 										<string key="positiveInfinitySymbol">+∞</string>
+										<string key="positivePrefix"/>
+										<string key="positiveSuffix"/>
+										<real value="0.0" key="roundingIncrement"/>
+										<integer value="4" key="roundingMode"/>
+										<integer value="0" key="secondaryGroupingSize"/>
+										<boolean value="NO" key="usesGroupingSeparator"/>
 									</dictionary>
 									<string key="NS.positiveformat">#0.00</string>
 									<string key="NS.negativeformat">#0.00</string>
 									</object>
 									<object class="NSAttributedString" key="NS.nan">
 										<string key="NSString">NaN</string>
-										<reference key="NSAttributes" ref="270440689"/>
+										<reference key="NSAttributes" ref="991341371"/>
 									</object>
-									<reference key="NS.min" ref="454209341"/>
-									<reference key="NS.max" ref="454209341"/>
+									<reference key="NS.min" ref="1006755439"/>
+									<reference key="NS.max" ref="1006755439"/>
 									<object class="NSDecimalNumberHandler" key="NS.rounding">
 										<int key="NS.roundingmode">3</int>
 										<bool key="NS.raise.overflow">YES</bool>
 									<string key="NS.decimal">.</string>
 									<string key="NS.thousand">,</string>
 									<bool key="NS.hasthousands">NO</bool>
-									<bool key="NS.localized">NO</bool>
+									<bool key="NS.localized">YES</bool>
 									<bool key="NS.allowsfloats">YES</bool>
 								</object>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="727107464"/>
+								<reference key="NSControlView" ref="276412291"/>
 								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="594640124"/>
-								<reference key="NSTextColor" ref="914237195"/>
+								<reference key="NSBackgroundColor" ref="854463187"/>
+								<reference key="NSTextColor" ref="128286800"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSTextField" id="30980160">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="404407935">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{878, 4}, {96, 22}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="801101494">
+							<object class="NSTextFieldCell" key="NSCell" id="354019633">
 								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">272630784</int>
-								<reference key="NSSupport" ref="889920428"/>
-								<object class="NSNumberFormatter" key="NSFormatter" id="524640964">
+								<reference key="NSSupport" ref="549925281"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="292149741">
 									<dictionary class="NSMutableDictionary" key="NS.attributes">
 										<boolean value="YES" key="allowsFloats"/>
+										<boolean value="NO" key="alwaysShowsDecimalSeparator"/>
+										<string key="currencyDecimalSeparator">.</string>
+										<string key="decimalSeparator">.</string>
+										<string key="exponentSymbol">E</string>
+										<integer value="0" key="formatWidth"/>
 										<integer value="1040" key="formatterBehavior"/>
-										<reference key="locale" ref="890877227"/>
+										<boolean value="NO" key="generatesDecimalNumbers"/>
+										<string key="groupingSeparator">,</string>
+										<integer value="0" key="groupingSize"/>
+										<boolean value="NO" key="lenient"/>
+										<integer value="2" key="maximumFractionDigits"/>
+										<integer value="309" key="maximumIntegerDigits"/>
+										<integer value="2" key="minimumFractionDigits"/>
+										<integer value="1" key="minimumIntegerDigits"/>
+										<string key="minusSign">-</string>
 										<string key="negativeFormat">#0.00</string>
 										<string key="negativeInfinitySymbol">-∞</string>
+										<string key="negativePrefix">-</string>
+										<string key="negativeSuffix"/>
 										<string key="nilSymbol"/>
+										<string key="notANumberSymbol">NaN</string>
 										<integer value="4" key="numberStyle"/>
+										<string key="paddingCharacter">*</string>
+										<integer value="0" key="paddingPosition"/>
+										<string key="perMillSymbol">‰</string>
+										<string key="percentSymbol">%</string>
+										<string key="plusSign">+</string>
 										<string key="positiveFormat">#0.00</string>
 										<string key="positiveInfinitySymbol">+∞</string>
+										<string key="positivePrefix"/>
+										<string key="positiveSuffix"/>
+										<real value="0.0" key="roundingIncrement"/>
+										<integer value="4" key="roundingMode"/>
+										<integer value="0" key="secondaryGroupingSize"/>
+										<boolean value="NO" key="usesGroupingSeparator"/>
 									</dictionary>
 									<string key="NS.positiveformat">#0.00</string>
 									<string key="NS.negativeformat">#0.00</string>
 									</object>
 									<object class="NSAttributedString" key="NS.nan">
 										<string key="NSString">NaN</string>
-										<reference key="NSAttributes" ref="270440689"/>
+										<reference key="NSAttributes" ref="991341371"/>
 									</object>
-									<reference key="NS.min" ref="454209341"/>
-									<reference key="NS.max" ref="454209341"/>
+									<reference key="NS.min" ref="1006755439"/>
+									<reference key="NS.max" ref="1006755439"/>
 									<object class="NSDecimalNumberHandler" key="NS.rounding">
 										<int key="NS.roundingmode">3</int>
 										<bool key="NS.raise.overflow">YES</bool>
 									<string key="NS.decimal">.</string>
 									<string key="NS.thousand">,</string>
 									<bool key="NS.hasthousands">NO</bool>
-									<bool key="NS.localized">NO</bool>
+									<bool key="NS.localized">YES</bool>
 									<bool key="NS.allowsfloats">YES</bool>
 								</object>
-								<string key="NSCellIdentifier">_NS:9</string>
-								<reference key="NSControlView" ref="30980160"/>
+								<reference key="NSControlView" ref="404407935"/>
 								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="594640124"/>
-								<reference key="NSTextColor" ref="914237195"/>
+								<reference key="NSBackgroundColor" ref="854463187"/>
+								<reference key="NSTextColor" ref="128286800"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSColorWell" id="245351471">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSColorWell" id="425427307">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<set class="NSMutableSet" key="NSDragTypes">
 								<string>NSColor pasteboard type</string>
 							</set>
 							<string key="NSFrame">{{526, 5}, {50, 21}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="402915775"/>
-							<string key="NSReuseIdentifierKey">_NS:1100</string>
 							<bool key="NSEnabled">YES</bool>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							<bool key="NSIsBordered">YES</bool>
 								<bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes>
 							</object>
 						</object>
-						<object class="NSTextField" id="718086768">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSTextField" id="885160584">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{478, 7}, {43, 17}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="245351471"/>
-							<string key="NSReuseIdentifierKey">_NS:1505</string>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="936243610">
+							<object class="NSTextFieldCell" key="NSCell" id="400484313">
 								<int key="NSCellFlags">68157504</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents">Color:</string>
-								<reference key="NSSupport" ref="889920428"/>
-								<string key="NSCellIdentifier">_NS:1505</string>
-								<reference key="NSControlView" ref="718086768"/>
-								<reference key="NSBackgroundColor" ref="923848753"/>
-								<object class="NSColor" key="NSTextColor" id="827364751">
+								<reference key="NSSupport" ref="549925281"/>
+								<reference key="NSControlView" ref="885160584"/>
+								<reference key="NSBackgroundColor" ref="562876948"/>
+								<object class="NSColor" key="NSTextColor" id="361859918">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">controlTextColor</string>
-									<reference key="NSColor" ref="42855238"/>
+									<reference key="NSColor" ref="484703423"/>
 								</object>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
-						<object class="NSPopUpButton" id="571237385">
-							<reference key="NSNextResponder" ref="568628114"/>
-							<int key="NSvFlags">289</int>
+						<object class="NSPopUpButton" id="905390527">
+							<reference key="NSNextResponder" ref="423663085"/>
+							<int key="NSvFlags">1825</int>
+							<object class="NSPSMatrix" key="NSFrameMatrix"/>
 							<string key="NSFrame">{{337, 2}, {139, 26}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSSuperview" ref="423663085"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="718086768"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>