3.8 fc

git-svn-id: https://svn.code.sf.net/p/osirix/code/osirix@7623 4e9e6e3d-4551-47eb-9dbe-a6127f9400a1
pixmeo · Sep 20, 2010 · a478d07 · a478d07
1 parent 477c877
commit a478d07
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/AYDicomPrint/AYDicomPrintWindowController.mm b/AYDicomPrint/AYDicomPrintWindowController.mm
@@ -66,15 +66,15 @@ + (void) updateAllPreferencesFormat
 			NSMutableDictionary *mDict = [NSMutableDictionary dictionaryWithDictionary: dict];
 
 			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"filmOrientation"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"filmOrientationTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"filmDestination"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"filmDestinationTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"filmSize"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"filmSizeTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"magnificationType"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"magnificationTypeTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"trim"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"trimTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"imageDisplayFormat"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"imageDisplayFormatTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"borderDensity"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"borderDensityTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"emptyImageDensity"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"emptyImageDensityTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"priority"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"priorityTag"];
-			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"medium"] array: filmOrientationTag size: NUM_OF(filmOrientationTag)] forKey: @"mediumTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"filmDestination"] array: filmDestinationTag size: NUM_OF(filmDestinationTag)] forKey: @"filmDestinationTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"filmSize"] array: filmSizeTag size: NUM_OF(filmSizeTag)] forKey: @"filmSizeTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"magnificationType"] array: magnificationTypeTag size: NUM_OF(magnificationTypeTag)] forKey: @"magnificationTypeTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"trim"] array: trimTag size: NUM_OF(trimTag)] forKey: @"trimTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"imageDisplayFormat"] array: imageDisplayFormatTag size: NUM_OF(imageDisplayFormatTag)] forKey: @"imageDisplayFormatTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"borderDensity"] array: borderDensityTag size: NUM_OF(borderDensityTag)] forKey: @"borderDensityTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"emptyImageDensity"] array: emptyImageDensityTag size: NUM_OF(emptyImageDensityTag)] forKey: @"emptyImageDensityTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"priority"] array: priorityTag size: NUM_OF(priorityTag)] forKey: @"priorityTag"];
+			[mDict setObject: [AYDicomPrintWindowController tagForKey: [dict valueForKey: @"medium"] array: mediumTag size: NUM_OF(mediumTag)] forKey: @"mediumTag"];
 
 			[printers replaceObjectAtIndex: i withObject: mDict];
 

diff --git a/Preference Panes/AYDicomPrintPreferencePane/AYDicomPrint.xcodeproj/project.pbxproj b/Preference Panes/AYDicomPrintPreferencePane/AYDicomPrint.xcodeproj/project.pbxproj
@@ -235,8 +235,10 @@
 		1DBD214A08BA80EA00186707 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_MODEL_TUNING = "";
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = AYDicomPrint_Prefix.pch;
 				IBC_FLATTEN_NIBS = NO;

diff --git a/Preference Panes/AYDicomPrintPreferencePane/AYDicomPrintPref.m b/Preference Panes/AYDicomPrintPreferencePane/AYDicomPrintPref.m
@@ -4,16 +4,6 @@
 
 @implementation AYDicomPrintPref
 
-- (id) init
-{
-	if (self = [super init])
-	{
-		[AYDicomPrintWindowController updateAllPreferencesFormat];
-	}
-
-	return self;
-}
-
 - (void) dealloc
 {
 	[m_PrinterDefaults release];
@@ -28,6 +18,8 @@ - (void) willUnselect
 
 - (void) awakeFromNib
 {
+	[AYDicomPrintWindowController updateAllPreferencesFormat];
+
 	// select default printer
 	NSArray *printer = [m_PrinterController arrangedObjects];
 

diff --git a/...nce Panes/OSIViewerPreferencePane/OSIViewerPreferencePane.xcodeproj/rossetantoine.pbxuser b/...nce Panes/OSIViewerPreferencePane/OSIViewerPreferencePane.xcodeproj/rossetantoine.pbxuser
@@ -52,8 +52,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 306664125;
-			PBXWorkspaceStateSaveDate = 306664125;
+			PBXPerProjectTemplateStateSaveDate = 306664979;
+			PBXWorkspaceStateSaveDate = 306664979;
 		};
 		perUserProjectItems = {
 			AB631BC3124752FB003488D2 /* PBXTextBookmark */ = AB631BC3124752FB003488D2 /* PBXTextBookmark */;