misc

pixmeo · Jul 2, 2013 · e277fac · e277fac
1 parent a8ecd53
commit e277fac
Show file tree

Hide file tree

Showing 16 changed files with 284 additions and 15 deletions.
diff --git a/ExportROIs/ExportROIs.xcodeproj/project.pbxproj b/ExportROIs/ExportROIs.xcodeproj/project.pbxproj
@@ -7,10 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		71BD46A7157DF6CE009802C2 /* OsiriXAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71BD46A6157DF6CE009802C2 /* OsiriXAPI.framework */; };
 		8202B233092EC3930013789F /* FileTypeSelector.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8202B232092EC3930013789F /* FileTypeSelector.nib */; };
 		82128236092EBCE20093B432 /* FileTypeSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 82128235092EBCE20093B432 /* FileTypeSelector.h */; };
 		82128238092EBD0A0093B432 /* FileTypeSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = 82128237092EBD0A0093B432 /* FileTypeSelector.m */; };
+		84DC787F176A23EC00997A56 /* OsiriXAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DC787E176A23EC00997A56 /* OsiriXAPI.framework */; };
 		8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
 		8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
 		DB38E3AA08CDCFCB00E80768 /* ExportROIsPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = DB38E3A808CDCFCB00E80768 /* ExportROIsPlugin.h */; };
@@ -23,11 +23,11 @@
 		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		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>"; };
-		71BD46A6157DF6CE009802C2 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = "../../osirix-trunk/build/Development/OsiriXAPI.framework"; sourceTree = "<group>"; };
 		8202B232092EC3930013789F /* FileTypeSelector.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = FileTypeSelector.nib; sourceTree = "<group>"; };
 		82128235092EBCE20093B432 /* FileTypeSelector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FileTypeSelector.h; sourceTree = "<group>"; };
 		82128237092EBD0A0093B432 /* FileTypeSelector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FileTypeSelector.m; sourceTree = "<group>"; };
 		82CD775408DDAB9100BDF92A /* ExportROIs.osirixplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExportROIs.osirixplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		84DC787E176A23EC00997A56 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/build/Development/OsiriXAPI.framework; sourceTree = "<group>"; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DB38E3A808CDCFCB00E80768 /* ExportROIsPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExportROIsPlugin.h; sourceTree = "<group>"; };
 		DB38E3A908CDCFCB00E80768 /* ExportROIsPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ExportROIsPlugin.m; sourceTree = "<group>"; };
@@ -40,7 +40,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
-				71BD46A7157DF6CE009802C2 /* OsiriXAPI.framework in Frameworks */,
+				84DC787F176A23EC00997A56 /* OsiriXAPI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -63,7 +63,7 @@
 		089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				71BD46A6157DF6CE009802C2 /* OsiriXAPI.framework */,
+				84DC787E176A23EC00997A56 /* OsiriXAPI.framework */,
 				1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */,
 				1058C7AEFEA557BF11CA2CBB /* Other Frameworks */,
 			);
@@ -253,8 +253,10 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../osirix-trunk/build/Development\"";
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../osirix/build/Development\"";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_ENABLE_TRIGRAPHS = NO;
@@ -293,7 +295,6 @@
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				SDKROOT = macosx10.6;
 			};
 			name = Development;
 		};

diff --git a/ExportROIs/ExportROIs.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ExportROIs/ExportROIs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...tROIs/ExportROIs.xcodeproj/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/...tROIs/ExportROIs.xcodeproj/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "1.0">
+</Bucket>
diff --git a/ExportROIs/ExportROIs.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/ExportROIs.xcscheme b/ExportROIs/ExportROIs.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/ExportROIs.xcscheme
@@ -0,0 +1,62 @@
+<?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 = "ExportROIs.osirixplugin"
+               BlueprintName = "ExportROIs"
+               ReferencedContainer = "container:ExportROIs.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">
+      <PathRunnable
+         FilePath = "/Users/admin/osirix/build/Development/OsiriX.app">
+      </PathRunnable>
+      <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>
diff --git a/...ROIs/ExportROIs.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/...ROIs/ExportROIs.xcodeproj/xcuserdata/admin.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>ExportROIs.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>
diff --git a/ExportROIs/ExportROIsPlugin.m b/ExportROIs/ExportROIsPlugin.m
@@ -72,7 +72,7 @@ - (void) endSavePanel: (NSSavePanel *) sheet returnCode: (int) retCode contextIn
 	for ( i = 0; i < [ roiSeriesList count ]; i++ ) {
 
 		// current DICOM pix
-		DCMPix *pix = [ pixList objectAtIndex: i ];
+		DCMPix *pix = [pixList objectAtIndex: i];
 
 		// array of ROI in current pix
 		NSArray *roiImageList = [ roiSeriesList objectAtIndex: i ];
@@ -82,10 +82,12 @@ - (void) endSavePanel: (NSSavePanel *) sheet returnCode: (int) retCode contextIn
 
 		// walk through each ROI in current pix
 		numROIs = [ roiImageList count ];
-		for ( j = 0; j < numROIs; j++ ) {
-			
-			ROI *roi = [ roiImageList objectAtIndex: j ];
+		for ( j = 0; j < numROIs; j++ )
+        {
+			ROI *roi = [roiImageList objectAtIndex: j ];
 
+            [roi setPix: pix];
+
 			NSString *roiName = [ roi name ];
 
 			float mean = 0, min = 0, max = 0, total = 0, dev = 0;
@@ -132,7 +134,7 @@ - (void) endSavePanel: (NSSavePanel *) sheet returnCode: (int) retCode contextIn
 				[ pix convertPixX: pt.x pixY: pt.y toDICOMCoords: locs ];
 
 				[ mmXYZ addObject: [ NSString stringWithFormat: @"(%f, %f, %f)", locs[0], locs[1], locs[2] ] ];
-				NSLog( @"ROI %d - %d (%@): %f, %f, %f", (int)i, (int)j, roiName, locs[0], locs[1], locs[2] );
+//				NSLog( @"ROI %d - %d (%@): %f, %f, %f", (int)i, (int)j, roiName, locs[0], locs[1], locs[2] );
 
 				//NSArray *pxXY = [ NSArray arrayWithObjects: [ NSNumber numberWithFloat: pt.x ], [ NSNumber numberWithFloat: pt.y ] ];
 				//[ xyzInRoi addObject: xyz ];
@@ -148,7 +150,7 @@ - (void) endSavePanel: (NSSavePanel *) sheet returnCode: (int) retCode contextIn
 
 			if ( fileType == FT_CSV ) {
 				[ csvText appendFormat: @"%d,%d,%f,%f,%f,%f,%f,%c%@%c,%f,%f,%f,%f,%f,%d,%d,%@%c",
-                 i, j, mean, min, max, total, dev, DQUOTE, roiName, DQUOTE, clocs[0], clocs[1], clocs[2], length, area, [ roi type ], numCsvPoints, csvRoiPoints, LF ];
+                 (int)i, (int)j, mean, min, max, total, dev, DQUOTE, roiName, DQUOTE, clocs[0], clocs[1], clocs[2], length, area, (int)[roi type], (int)numCsvPoints, csvRoiPoints, LF ];
 			}
 
 			// roiInfo stands for a ROI
@@ -220,12 +222,11 @@ - (void) endSavePanel: (NSSavePanel *) sheet returnCode: (int) retCode contextIn
 
 - (void) initPlugin
 {
-	NSLog( @"Init ExportROIsPlugin");
 }
 
 - (long) filterImage:(NSString*) menuName
 {
-	long		ret;
+	long ret = 0;
 
 	if ( [ menuName isEqualToString: @"Export ROIs" ] ) {
 

diff --git a/ExportROIs/Info.plist b/ExportROIs/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>MenuTitles</key>
 	<array>
 		<string>Export ROIs</string>

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...C-Plugin/xmlrpc.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/...C-Plugin/xmlrpc.xcodeproj/xcuserdata/admin.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>xmlrpc.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>
diff --git a/XML-RPC-Plugin/xmlrpc.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xmlrpc.xcscheme b/XML-RPC-Plugin/xmlrpc.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xmlrpc.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 = "xmlrpc.osirixplugin"
+               BlueprintName = "xmlrpc"
+               ReferencedContainer = "container:xmlrpc.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>
diff --git a/XML-RPC-Plugin/xmlrpcFilter.m b/XML-RPC-Plugin/xmlrpcFilter.m
@@ -35,6 +35,8 @@ - (void) OsiriXXMLRPCMessage: (NSNotification*) note
 	{
 		NSMutableDictionary	*httpServerMessage = [note object];
 
+        NSLog( @"%@", httpServerMessage);
+
         // You will also receive this notification when XMLRPC methods are called through an osirix:// URL
         // In this case, the notification dictionary won't contain an NSXMLDocument and request parameters will be available directly in the dictionary.
         // The following code shows you how to obtain the parameters, no matter if XMLRPC or osirix://

diff --git a/...ualDictionary/ContextualDictionary.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...ualDictionary/ContextualDictionary.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...Dictionary.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/ContextualDictionary.xcscheme b/...Dictionary.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/ContextualDictionary.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 = "ContextualDictionary.osirixplugin"
+               BlueprintName = "ContextualDictionary"
+               ReferencedContainer = "container:ContextualDictionary.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 = "Deployment"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Development">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Deployment"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>