merged

DicomUnEnhancer/DicomUnEnhancer.xcodeproj/project.pbxproj

@@ -157,7 +157,8 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
+/* Begin PBXhead
+ersBuildPhase section */
 		8D5B49AD048680CD000E48DA /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;

DicomUnEnhancer/Sources/DicomUnEnhancerDCMTK.mm

@@ -9,9 +9,9 @@
 #import "DicomUnEnhancerDCMTK.h"
 #import <OsiriXAPI/NSFileManager+N2.h>
 #import <OsiriXAPI/NSThread+N2.h>
-#import <OsiriXAPI/dcfilefo.h>
-#import <OsiriXAPI/dcuid.h>
-#import <OsiriXAPI/dcmimage.h>
+#import "dcmimage.h"
+#import "dcfilefo.h"
+#import "dcuid.h"
 
 /*void describe(DcmSequenceOfItems* items) {
     for (unsigned int i = 0; i < items->card(); ++i) {

DiscPublishing/Classes/DiscPublishingFilesManager.mm

@@ -267,7 +267,7 @@ -(void)observeDatabaseAddition:(NSNotification*)notification {
                 if ([image managedObjectContext] == [[DicomDatabase defaultDatabase] managedObjectContext]) {
                     DiscPublishingPatientStack* dpps = [self stackForImage:image serviceId:sid];
                     if (![dpps.images containsObject:image])
-                        if (image.modality && ![image.modality isEqual:@"SR"]) // TODO: why?
+                        if (image.modality /*&& ![image.modality isEqual:@"SR"]*/) // TODO: why?
                             [dpps addImage:image];
                 }
             } @catch (NSException* e) {

DiscPublishing/Resources/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.osirix.discpublishing</string>
 	<key>CFBundleSignature</key>
@@ -23,7 +23,7 @@
 		<string>Publish</string>
 	</array>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2010-2012 OsiriX Team</string>
+	<string>© 2010-2013 OsiriX Team</string>
 	<key>NSPrincipalClass</key>
 	<string>DiscPublishing</string>
 	<key>ToolbarIcon</key>

Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj → Ejection Fraction/Ejection Fraction.xcodeproj/project.pbxproj

@@ -93,7 +93,11 @@
 		59FB4F7610A2D68800283D52 /* TeichholzEjectionFractionAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeichholzEjectionFractionAlgorithm.h; path = Sources/Algorithms/TeichholzEjectionFractionAlgorithm.h; sourceTree = "<group>"; };
 		59FB4F7710A2D68800283D52 /* TeichholzEjectionFractionAlgorithm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TeichholzEjectionFractionAlgorithm.mm; path = Sources/Algorithms/TeichholzEjectionFractionAlgorithm.mm; sourceTree = "<group>"; };
 		AB5D36050680E57E00F4007A /* Ejection Fraction.osirixplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Ejection Fraction.osirixplugin"; sourceTree = BUILT_PRODUCTS_DIR; };
+<<<<<<< HEAD:Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj
 		CEB6E5BB172D126500826F3F /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/build/Development/OsiriXAPI.framework; sourceTree = "<group>"; };
+=======
+		CE7FC25E16CB7D00003E9474 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/build/Development/OsiriXAPI.framework; sourceTree = "<group>"; };
+>>>>>>> master:Ejection Fraction/Ejection Fraction.xcodeproj/project.pbxproj
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -228,9 +232,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		8D5B49AC048680CD000E48DA /* Ejection Fraction II */ = {
+		8D5B49AC048680CD000E48DA /* Ejection Fraction */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = CE6A9A9008AC841300D0C1EE /* Build configuration list for PBXNativeTarget "Ejection Fraction II" */;
+			buildConfigurationList = CE6A9A9008AC841300D0C1EE /* Build configuration list for PBXNativeTarget "Ejection Fraction" */;
 			buildPhases = (
 				8D5B49AD048680CD000E48DA /* Headers */,
 				8D5B49AF048680CD000E48DA /* Resources */,
@@ -242,7 +246,7 @@
 			);
 			dependencies = (
 			);
-			name = "Ejection Fraction II";
+			name = "Ejection Fraction";
 			productInstallPath = "$(HOME)/Library/Bundles";
 			productName = Invert;
 			productReference = AB5D36050680E57E00F4007A /* Ejection Fraction.osirixplugin */;
@@ -253,7 +257,7 @@
 /* Begin PBXProject section */
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = CE6A9A9408AC841300D0C1EE /* Build configuration list for PBXProject "Ejection Fraction II" */;
+			buildConfigurationList = CE6A9A9408AC841300D0C1EE /* Build configuration list for PBXProject "Ejection Fraction" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -267,7 +271,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D5B49AC048680CD000E48DA /* Ejection Fraction II */,
+				8D5B49AC048680CD000E48DA /* Ejection Fraction */,
 			);
 		};
 /* End PBXProject section */
@@ -332,12 +336,16 @@
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
+<<<<<<< HEAD:Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../osirix-trunk/build/Development/\"",
 					"\"$(SRCROOT)/../../osirix/osirix/build/Development\"",
 					"\"$(SRCROOT)/../../osirix/build/Development\"",
 				);
+=======
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+>>>>>>> master:Ejection Fraction/Ejection Fraction.xcodeproj/project.pbxproj
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -381,6 +389,7 @@
 					ppc64,
 					x86_64,
 				);
+				FRAMEWORK_SEARCH_PATHS = ../../osirix/build/Development/;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				SDKROOT = macosx10.7;
 			};
@@ -389,15 +398,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		CE6A9A9008AC841300D0C1EE /* Build configuration list for PBXNativeTarget "Ejection Fraction II" */ = {
+		CE6A9A9008AC841300D0C1EE /* Build configuration list for PBXNativeTarget "Ejection Fraction" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				CE6A9A9108AC841300D0C1EE /* Development */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Development;
 		};
-		CE6A9A9408AC841300D0C1EE /* Build configuration list for PBXProject "Ejection Fraction II" */ = {
+		CE6A9A9408AC841300D0C1EE /* Build configuration list for PBXProject "Ejection Fraction" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				CE6A9A9508AC841300D0C1EE /* Development */,

Ejection Fraction/Resources/Info.plist

@@ -25,9 +25,9 @@
 	<key>pluginType</key>
 	<string>roiTool</string>
 	<key>CFBundleName</key>
-	<string>Ejection Fraction II</string>
+	<string>Ejection Fraction</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.2</string>
+	<string>2.5.3</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2009-2013 OsiriX Team</string>
 	<key>CFBundleIdentifier</key>

HipArthroplastyTemplating/HipArthroplastyTemplating.xcodeproj/project.pbxproj

@@ -106,7 +106,7 @@
 		59F6A17010564067008585F5 /* ArthroplastyTemplatingWindowController+OsiriX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "ArthroplastyTemplatingWindowController+OsiriX.mm"; sourceTree = "<group>"; };
 		59F6A17410564159008585F5 /* ArthroplastyTemplatingWindowController+Templates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ArthroplastyTemplatingWindowController+Templates.h"; sourceTree = "<group>"; };
 		59F6A17510564159008585F5 /* ArthroplastyTemplatingWindowController+Templates.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "ArthroplastyTemplatingWindowController+Templates.mm"; sourceTree = "<group>"; };
-		712BC55D15871807005460E6 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = "../../osirix-trunk/build/Development/OsiriXAPI.framework"; sourceTree = "<group>"; };
+		712BC55D15871807005460E6 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/build/Development/OsiriXAPI.framework; sourceTree = "<group>"; };
 		713D45E115AD861000B392E0 /* Versions.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Versions.txt; sourceTree = "<group>"; };
 		718D0AE8159C8E9A00F27CE9 /* HipAT2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HipAT2D.h; sourceTree = "<group>"; };
 		718D0AE9159C8E9A00F27CE9 /* HipAT2D.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HipAT2D.mm; sourceTree = "<group>"; };
@@ -419,7 +419,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"\"$(SRCROOT)/../../osirix-trunk/build/Development\"",
+					"\"$(SRCROOT)/../../osirix/build/Development\"",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/Accelerate.framework/Versions/A/Frameworks\"";
 				GCC_C_LANGUAGE_STANDARD = gnu99;

HipArthroplastyTemplating/Versions.txt

@@ -6,7 +6,7 @@
 - fixed bug: if /Library/Application Support/OsiriX doesn't exist, don't try to create it
 
 2.4.1
-- 1-click calibration also possible with non-think reference objects thanks to better flood threshold computation
+- 1-click calibration also possible with non-thick reference objects thanks to better flood threshold computation
 
 2.4
 - Added Medacta miniMAX stems

KeyObjectSelection/KeyObjectSelection.xcodeproj/project.pbxproj

@@ -40,7 +40,7 @@
 		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		32DBCF630370AF2F00C91783 /* KeyObjectSelection_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyObjectSelection_Prefix.pch; path = Sources/KeyObjectSelection_Prefix.pch; sourceTree = "<group>"; };
-		7116D7391574A91300FA293A /* OsiriX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriX.framework; path = "../../osirix-trunk/build/Development/OsiriX.framework"; sourceTree = "<group>"; };
+		7116D7391574A91300FA293A /* OsiriX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriX.framework; path = ../../osirix/build/Development/OsiriX.framework; sourceTree = "<group>"; };
 		7116D74515751B9A00FA293A /* KeyObjectSelectionPrefs.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeyObjectSelectionPrefs.prefPane; sourceTree = BUILT_PRODUCTS_DIR; };
 		7116D74715751B9A00FA293A /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		7116D74915751B9A00FA293A /* PreferencePanes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PreferencePanes.framework; path = System/Library/Frameworks/PreferencePanes.framework; sourceTree = SDKROOT; };
@@ -53,7 +53,7 @@
 		7116D76615751C5800FA293A /* KeyObjectSelectionPrefs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = KeyObjectSelectionPrefs.xib; path = Resources/KeyObjectSelectionPrefs.xib; sourceTree = "<group>"; };
 		71E2C42E1576657800EB8B95 /* NSUserDefaults+KOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSUserDefaults+KOS.h"; path = "Sources/NSUserDefaults+KOS.h"; sourceTree = "<group>"; };
 		71E2C42F1576657800EB8B95 /* NSUserDefaults+KOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSUserDefaults+KOS.m"; path = "Sources/NSUserDefaults+KOS.m"; sourceTree = "<group>"; };
-		8420023112E829A200E1E9CE /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = "../../osirix-trunk/build/Development/OsiriXAPI.framework"; sourceTree = "<group>"; };
+		8420023112E829A200E1E9CE /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/build/Development/OsiriXAPI.framework; sourceTree = "<group>"; };
 		8D5B49B7048680CD000E48DA /* Plugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Plugin-Info.plist"; path = "Resources/Plugin-Info.plist"; sourceTree = "<group>"; };
 		AB5D36050680E57E00F4007A /* KeyObjectSelection.osirixplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeyObjectSelection.osirixplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		ABA48A640680BB600089EB4F /* KeyObjectSelectionFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KeyObjectSelectionFilter.h; path = Sources/KeyObjectSelectionFilter.h; sourceTree = "<group>"; };
@@ -412,7 +412,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
-					"\"../../osirix-trunk/build/Development\"",
+					"\"../../osirix/build/Development\"",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_TRIGRAPHS = NO;
@@ -434,7 +434,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = KeyObjectSelection;
 				SECTORDER_FLAGS = "";
-				USER_HEADER_SEARCH_PATHS = "\"../../osirix-trunk/build/Development/OsiriXAPI.framework/Versions/A/Headers\"";
+				USER_HEADER_SEARCH_PATHS = "\"../../osirix/build/Development/OsiriXAPI.framework/Versions/A/Headers\"";
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
@@ -452,7 +452,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
-					"\"../../osirix-trunk/build/Development\"",
+					"\"../../osirix/build/Development\"",
 				);
 				GCC_ENABLE_TRIGRAPHS = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -471,7 +471,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = KeyObjectSelection;
 				SECTORDER_FLAGS = "";
-				USER_HEADER_SEARCH_PATHS = "\"../../osirix-trunk/build/Development/OsiriXAPI.framework/Versions/A/Headers\"";
+				USER_HEADER_SEARCH_PATHS = "\"../../osirix/build/Development/OsiriXAPI.framework/Versions/A/Headers\"";
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",

KeyObjectSelection/Resources/Plugin-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>NSPrincipalClass</key>
 	<string>KeyObjectSelectionFilter</string>
 </dict>

KeyObjectSelection/Sources/KeyObjectSelectionFilter.mm

@@ -656,11 +656,11 @@ -(void)_ViewerController_setKeyImage:(id)sender {
 
         // import the file into our DB
         DicomDatabase* database = [DicomDatabase databaseForContext:study.managedObjectContext];
-        NSArray* images = [database addFilesAtPaths:[NSArray arrayWithObject:path]
-                                  postNotifications:YES
-                                          dicomOnly:YES 
-                                rereadExistingItems:YES
-                                  generatedByOsiriX:YES];
+        NSArray* imageIDs = [database addFilesAtPaths:[NSArray arrayWithObject:path]
+                                    postNotifications:YES
+                                            dicomOnly:YES
+                                  rereadExistingItems:YES
+                                    generatedByOsiriX:YES];
 
         // upload the new file to the DICOM node
         if ([NSUserDefaults.standardUserDefaults boolForKey:KOSSynchronizeKey]) // plugin is active
@@ -687,8 +687,8 @@ -(void)_ViewerController_setKeyImage:(id)sender {
             }];
 
         // set the new images as key images
-        for (DicomImage* image in images)
-            [image setIsKeyImage:[NSNumber numberWithBool:YES]];
+        for (DicomImage* imageID in imageIDs)
+            [[database objectWithID:imageID] setIsKeyImage:[NSNumber numberWithBool:YES]];
 
     } else
         [self _ViewerController_setKeyImage:sender];