Merge branch 'develop' of https://github.com/pixmeo/osirixplugins int…

…o develop
pixmeo · Feb 2, 2014 · 05b9ea2 · 05b9ea2
2 parents 6a98f11 + 7ea192d
commit 05b9ea2
Show file tree

Hide file tree

Showing 10 changed files with 930 additions and 231 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,7 @@ Reporter/Reporter.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanag
 HL7toDICOMPDF/HL7toDICOMPDF.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
 
 HL7toDICOMPDF/HL7toDICOMPDF.xcodeproj/xcuserdata/antoinerosset.xcuserdatad/xcschemes/xcschememanagement.plist
+
+Worklists/Worklists.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
+
+CalciumScore/CalciumScore.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/CalciumScore/CalciumScore.xcodeproj/project.pbxproj b/CalciumScore/CalciumScore.xcodeproj/project.pbxproj
@@ -189,9 +189,15 @@
 /* Begin PBXProject section */
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = CE6A9A8108AC840200D0C1EE /* Build configuration list for PBXProject "CalciumScore" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* Duplicate */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -288,14 +294,9 @@
 		CE6A9A8208AC840200D0C1EE /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					i386,
-					ppc,
-					ppc64,
-					x86_64,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+				SDKROOT = macosx10.8;
 			};
 			name = Development;
 		};

diff --git a/SandBox/SandBox.xcodeproj/project.xcworkspace/xcshareddata/SandBox.xccheckout b/SandBox/SandBox.xcodeproj/project.xcworkspace/xcshareddata/SandBox.xccheckout
@@ -0,0 +1,65 @@
+<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>61FAB902-C4AB-4836-AE7B-DF4294A4E259</string>
+	<key>IDESourceControlProjectName</key>
+	<string>SandBox</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>02DA3DC3-D382-458D-9DA0-FB7F6E0AB313</key>
+		<string>https://github.com/mattrajca/DAVKit.git</string>
+		<key>734600A1-1F3F-4AB0-AEE2-0BEAC9422D4A</key>
+		<string>https://github.com/pixmeo/osirixplugins.git</string>
+		<key>BA94C3EE-5535-4580-88CD-A64BA1E5E349</key>
+		<string>https://github.com/pixmeo/osirix.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>SandBox/SandBox.xcodeproj/project.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>02DA3DC3-D382-458D-9DA0-FB7F6E0AB313</key>
+		<string>../../../../DAVKit</string>
+		<key>734600A1-1F3F-4AB0-AEE2-0BEAC9422D4A</key>
+		<string>../../..</string>
+		<key>BA94C3EE-5535-4580-88CD-A64BA1E5E349</key>
+		<string>../../../../osirix-trunk</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/pixmeo/osirixplugins.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>734600A1-1F3F-4AB0-AEE2-0BEAC9422D4A</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>02DA3DC3-D382-458D-9DA0-FB7F6E0AB313</string>
+			<key>IDESourceControlWCCName</key>
+			<string>DAVKit</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>734600A1-1F3F-4AB0-AEE2-0BEAC9422D4A</string>
+			<key>IDESourceControlWCCName</key>
+			<string>osirix-plugins</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>BA94C3EE-5535-4580-88CD-A64BA1E5E349</string>
+			<key>IDESourceControlWCCName</key>
+			<string>osirix-trunk</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/...codeproj/project.xcworkspace/xcuserdata/Thomas.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/Thomas.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SandBox/SandBox.xcodeproj/xcuserdata/Thomas.xcuserdatad/xcschemes/SandBox.xcscheme b/SandBox/SandBox.xcodeproj/xcuserdata/Thomas.xcuserdatad/xcschemes/SandBox.xcscheme
@@ -40,7 +40,7 @@
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
       <PathRunnable
-         FilePath = "/Applications/OsiriX.app">
+         FilePath = "/Users/Thomas/osirix-trunk/build/Development/OsiriX.app">
       </PathRunnable>
       <MacroExpansion>
          <BuildableReference
@@ -53,7 +53,7 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "--LoadPlugin $(PROJECT_DIR)/$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)"
+            argument = "--LoadPlugin $(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

diff --git a/SandBox/SandBoxFilter.m b/SandBox/SandBoxFilter.m
@@ -21,7 +21,7 @@ @implementation SandBoxFilter
 
 - (void) initPlugin
 {
-
+	NSLog(@"SandBox : COUCOU");
 }
 
 - (long) filterImage:(NSString*) menuName

diff --git a/SandBox/SandboxWindowController.m b/SandBox/SandboxWindowController.m
@@ -107,40 +107,59 @@ - (void) prepareCDContent: (NSMutableArray*) dbObjects :(NSMutableArray*) origin
 		// C'est là que ça plante pour les gros fichiers
 		[XMLGenerator createDicomStructureAtPath:dicomFolder withFiles:files withCorrespondingImages:dicomImages];	// Sandbox
 
+		//////////////
 
 
 
-		while((file = [enumerator nextObject]) && cancelled == NO)
-		{
-			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-			NSString *newPath = [NSString stringWithFormat:@"%@/%05d", subFolder, i++];
-			DCMObject *dcmObject = [DCMObject objectWithContentsOfFile:file decodingPixelData:NO];
-			//Don't want Big Endian, May not be readable
-			if( [[dcmObject transferSyntax] isEqualToTransferSyntax:[DCMTransferSyntax ExplicitVRBigEndianTransferSyntax]])
-				[dcmObject writeToFile:newPath withTransferSyntax:[DCMTransferSyntax ImplicitVRLittleEndianTransferSyntax] quality: DCMLosslessQuality atomically:YES];
-			else
-				[manager copyPath:file toPath:newPath handler:nil];
-
-			if( dcmObject)	// <- it's a DICOM file
-			{
-				switch( [compressionMode selectedTag])
-				{
-					case 0:
-						break;
-
-					case 1:
-						[compressedArray addObject: newPath];
-						break;
-
-					case 2:
-						[compressedArray addObject: newPath];
-						break;
-				}
-			}
-
-			[newFiles addObject:newPath];
-			[pool release];
-		}
+
+
+
+
+
+
+
+
+		///////////////
+
+
+		NSLog(@"Fin =====");
+
+
+//		while((file = [enumerator nextObject]) && cancelled == NO)
+//		{
+//			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+//			NSString *newPath = [NSString stringWithFormat:@"%@/%05d", subFolder, i++];
+//			DCMObject *dcmObject = [DCMObject objectWithContentsOfFile:file decodingPixelData:NO];
+//			//Don't want Big Endian, May not be readable
+//			if( [[dcmObject transferSyntax] isEqualToTransferSyntax:[DCMTransferSyntax ExplicitVRBigEndianTransferSyntax]])
+//				[dcmObject writeToFile:newPath withTransferSyntax:[DCMTransferSyntax ImplicitVRLittleEndianTransferSyntax] quality: DCMLosslessQuality atomically:YES];
+//			else
+//				[manager copyPath:file toPath:newPath handler:nil];
+//			
+//			if( dcmObject)	// <- it's a DICOM file
+//			{
+//				switch( [compressionMode selectedTag])
+//				{
+//					case 0:
+//						break;
+//						
+//					case 1:
+//						[compressedArray addObject: newPath];
+//						break;
+//						
+//					case 2:
+//						[compressedArray addObject: newPath];
+//						break;
+//				}
+//			}
+//			
+//			[newFiles addObject:newPath];
+//			[pool release];
+//		}
+
+
+		///////////////
+
 
 //		if( [newFiles count] > 0 && cancelled == NO)
 //		{

diff --git a/SandBox/XMLGenerator.h b/SandBox/XMLGenerator.h
@@ -17,12 +17,14 @@
 
 @interface S_DicomNode : NSObject
 {
+	NSString* identifier;
 	DCMObject* dcmObject;
 	S_DicomNode* parent;
 	NSMutableArray* children;
 	id originalFile;
 }
 
+@property (retain) NSString* identifier;
 @property (retain) DCMObject* dcmObject;
 @property (retain) S_DicomNode* parent;
 @property (retain) NSMutableArray* children;
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @implementation SandBoxFilter @@
     - (void) initPlugin
     {
+    	NSLog(@"SandBox : COUCOU");
     }
     - (long) filterImage:(NSString*) menuName
@@ Expand Down @@