merged

32BitFloatDICOMExport/FloatDICOMExport.m

@@ -31,14 +31,11 @@ - (long) filterImage:(NSString*) menuName
 	NSString *f = [xport writeDCMFile: nil];
 
 	 if( f)
-		[BrowserController addFiles: [NSArray arrayWithObject: f]
-					 toContext: [[BrowserController currentBrowser] managedObjectContext]
-					toDatabase: [BrowserController currentBrowser]
-					 onlyDICOM: YES 
-			  notifyAddedFiles: YES
-		   parseExistingObject: YES
-					  dbFolder: [[BrowserController currentBrowser] documentsDirectory]
-			 generatedByOsiriX: YES];
+         [BrowserController.currentBrowser.database addFilesAtPaths: [NSArray arrayWithObject: f]
+                                                  postNotifications: YES
+                                                          dicomOnly: YES
+                                                rereadExistingItems: YES
+                                                  generatedByOsiriX: YES];
 
 	return 0;   // No Errors
 }

BullsEye/BullsEye.xcodeproj/xcuserdata/antoinerosset.xcuserdatad/xcschemes/BullsEye.xcscheme

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8D5B49AC048680CD000E48DA"
+               BuildableName = "BullsEye.osirixplugin"
+               BlueprintName = "BullsEye"
+               ReferencedContainer = "container:BullsEye.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Development">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Development"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Development"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Development">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Development"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

BullsEye/BullsEye.xcodeproj/xcuserdata/antoinerosset.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>BullsEye.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>8D5B49AC048680CD000E48DA</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

BullsEye/BullsEyeController.m

@@ -14,6 +14,7 @@
 #import "OsiriXAPI/ViewerController.h"
 #import "OsiriXAPI/DCMView.h"
 #import "OsiriXAPI/DCMPix.h"
+#import "OsiriXAPI/DicomDatabase.h"
 
 const NSString* FileTypePDF = @"pdf";
 const NSString* FileTypeTIFF = @"tiff";
@@ -240,14 +241,11 @@ -(void)dicomSave:(NSString*)seriesDescription backgroundColor:(NSColor*)backgrou
 		NSString *f = [dicomExport writeDCMFile: nil];
 
 		if( f)
-			[BrowserController addFiles: [NSArray arrayWithObject: f]
-						 toContext: [[BrowserController currentBrowser] managedObjectContext]
-						toDatabase: [BrowserController currentBrowser]
-						 onlyDICOM: YES 
-				  notifyAddedFiles: YES
-			   parseExistingObject: YES
-						  dbFolder: [[BrowserController currentBrowser] documentsDirectory]
-				 generatedByOsiriX: YES];
+            [BrowserController.currentBrowser.database addFilesAtPaths: [NSArray arrayWithObject: f]
+                                                                        postNotifications: YES
+                                                                                dicomOnly: YES
+                                                                      rereadExistingItems: YES
+                                                                        generatedByOsiriX: YES];
 
 		[dicomExport release];
 	}
@@ -258,6 +256,7 @@ -(void)saveAsPanelDidEnd:(NSSavePanel*)panel returnCode:(int)code contextInfo:(v
     NSError* error = 0;
 
 	if (code == NSOKButton)
+    {
 		if (format == FileTypePDF)
 		{
 			[[[BullsEyeView view] dataWithPDFInsideRect:[[BullsEyeView view] squareBounds]] writeToFile:[panel filename] options:NSAtomicWrite error:&error];
@@ -280,7 +279,7 @@ -(void)saveAsPanelDidEnd:(NSSavePanel*)panel returnCode:(int)code contextInfo:(v
 		{ // dicom
 			[self dicomSave: [[presetsList selection] valueForKey: @"name"] backgroundColor: [NSColor whiteColor] toFile:[panel filename]];
 		}
-
+	}
 	if (error)
 		[[NSAlert alertWithError:error] beginSheetModalForWindow:[self window] modalDelegate:NULL didEndSelector:NULL contextInfo:NULL];
 }