[Hdrflow-svn] SF.net SVN: hdrflow: [229] trunk/app/HDRFlow

[<gl...@us...>]

Revision: 229
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=229&view=rev
Author:   glslang
Date:     2007-08-05 08:23:45 -0700 (Sun, 05 Aug 2007)

Log Message:
-----------
+ Viewer settings bindings

Modified Paths:
--------------
    trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
    trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
    trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
    trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
    trunk/app/HDRFlow/HDRFlowController.h
    trunk/app/HDRFlow/HDRFlowController.mm

Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib	2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib	2007-08-05 15:23:45 UTC (rev 229)
@@ -15,9 +15,9 @@
 	<string>446.1</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
 		<integer>266</integer>
 		<integer>21</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8R2218</string>

Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib	2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib	2007-08-05 15:23:45 UTC (rev 229)
@@ -9,7 +9,7 @@
 		<key>10</key>
 		<string>514 465 412 270 0 0 1440 878 </string>
 		<key>12</key>
-		<string>435 427 594 345 0 0 1440 878 </string>
+		<string>423 427 594 345 0 0 1440 878 </string>
 		<key>33</key>
 		<string>519 453 401 293 0 0 1440 878 </string>
 	</dict>
@@ -18,8 +18,8 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>33</integer>
+		<integer>10</integer>
 		<integer>12</integer>
-		<integer>10</integer>
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>

Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h	2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/HDRFlowController.h	2007-08-05 15:23:45 UTC (rev 229)
@@ -17,6 +17,9 @@
 
 @interface HDRFlowController : NSObject
 {
+	NSMutableArray* channels;
+	NSMutableArray* alpha;
+	
 	ScriptEditorController* scriptEditor;
 	PreferencesController* preferences;
 	
@@ -27,6 +30,7 @@
 
 - ( id ) init;
 - ( void ) initScriptEngine;
+- ( void ) initChannelsAndAlpha;
 
 - ( BOOL ) acceptsFirstResponder;
 - ( BOOL ) becomesFirstResponder;

Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm	2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/HDRFlowController.mm	2007-08-05 15:23:45 UTC (rev 229)
@@ -16,6 +16,8 @@
 - ( id ) init
 {
 	[ super init ];
+	
+	[ self initChannelsAndAlpha ];
 	[ self initScriptEngine ];
 	
 	return self;
@@ -34,10 +36,30 @@
 	engine->eval( [ bootstrap UTF8String ] );
 }
 
+- ( void ) initChannelsAndAlpha
+{
+	channels = [ [ NSMutableArray alloc ] init ];
+	[ channels addObject: [ [ NSString alloc ] initWithString: @"RGBA" ] ];
+	[ channels addObject: [ [ NSString alloc ] initWithString: @"Red" ] ];
+	[ channels addObject: [ [ NSString alloc ] initWithString: @"Green" ] ];
+	[ channels addObject: [ [ NSString alloc ] initWithString: @"Blue" ] ];
+	[ channels addObject: [ [ NSString alloc ] initWithString: @"Alpha" ] ];
+	
+	alpha = [ [ NSMutableArray alloc ] init ];
+	[ alpha addObject: [ [ NSString alloc ] initWithString: @"Alpha" ] ];
+	[ alpha addObject: [ [ NSString alloc ] initWithString: @"Red" ] ];
+	[ alpha addObject: [ [ NSString alloc ] initWithString: @"Green" ] ];
+	[ alpha addObject: [ [ NSString alloc ] initWithString: @"Blue" ] ];
+}
+
 - ( void ) dealloc
 {
 	delete engine;
+	
+	[ channels release ];
+	[ alpha release ];
 	[ scriptEditor dealloc ];
+	
 	[ super dealloc ];
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.