From 59e5a290b62d7b188dea0ada844591405b0ea08b Mon Sep 17 00:00:00 2001 From: Alessandro Volz Date: Tue, 21 Aug 2012 17:18:37 +0000 Subject: [PATCH] misc git-svn-id: https://svn.code.sf.net/p/osirixplugins/code@288 bdd3870d-6ba2-4b59-8605-1de7af000970 --- AutoClean/Sources/AutoCleanPluginFilter.mm | 21 +- ExportROIs/English.lproj/InfoPlist.strings | Bin 658 -> 586 bytes ExportROIs/Info.plist | 2 + ExportROIs/html/ExportROIs.osirixplugin.zip | Bin 17780 -> 17774 bytes HelloWorld/HelloWorldPreferences.xib | 621 ++---------------- .../Resources/Plugin-Info.plist | 4 +- .../Sources/KeyObjectSelectionFilter.mm | 3 +- ROI Enhancement II/Resources/Interface.xib | 557 ++++++++-------- .../xmlrpc.xcodeproj/project.pbxproj | 10 +- Zombies/Sources/ZombiesFilter.m | 11 +- 10 files changed, 367 insertions(+), 862 deletions(-) diff --git a/AutoClean/Sources/AutoCleanPluginFilter.mm b/AutoClean/Sources/AutoCleanPluginFilter.mm index e615067..ec49122 100644 --- a/AutoClean/Sources/AutoCleanPluginFilter.mm +++ b/AutoClean/Sources/AutoCleanPluginFilter.mm @@ -12,6 +12,7 @@ #import #import #import +#import @implementation AutoCleanPluginFilter @@ -21,6 +22,7 @@ -(void)initPlugin { -(void)dealloc { [self unscheduleAutoClean]; + [super dealloc]; } -(void)scheduleAutoCleanAt:(NSDate*)date { @@ -53,22 +55,9 @@ -(void)_autoCleanThread:(NSDate*)date { thread.name = NSLocalizedString(@"AutoClean Plugin", nil); [ThreadsManager.defaultManager addThreadAndStart:thread]; - Class DD = NSClassFromString(@"DicomDatabase"); - if (DD) - { - id dd = [DD valueForKey:@"defaultDatabase"]; - [dd performSelector:@selector(cleanForFreeSpaceMB:) withObject:[NSNumber numberWithInteger:124000]]; // TODO: 124000 -> -AutoCleanPluginThreshold/100*disksize - } - else // old OsiriX has @selector(autoCleanDatabaseFreeSpaceThread:)... but this will return without doing anything if autoclean is already running! and we cannot know - { - [NSUserDefaults.standardUserDefaults setBool:YES forKey:@"AUTOCLEANINGSPACE"]; - NSInteger threshold = [[NSUserDefaults.standardUserDefaults objectForKey:AutoCleanPluginThresholdDefaultsKey] integerValue]; - [NSUserDefaults.standardUserDefaults setInteger:threshold forKey:@"AUTOCLEANINGSPACE"]; - - [[BrowserController currentBrowser] performSelector:@selector(autoCleanDatabaseFreeSpaceThread:) withObject:self]; - - [NSUserDefaults.standardUserDefaults setObject:date forKey:AutoCleanPluginLastExecutionDefaultsKey]; - } + id dd = [DicomDatabase defaultDatabase]; + [dd performSelector:@selector(cleanForFreeSpaceMB:) withObject:[NSNumber numberWithInteger:124000]]; // TODO: 124000 -> -AutoCleanPluginThreshold/100*disksize + } @catch (NSException* e) { N2LogExceptionWithStackTrace(e); } @finally { diff --git a/ExportROIs/English.lproj/InfoPlist.strings b/ExportROIs/English.lproj/InfoPlist.strings index 9b4aabc04cea94a9c38bca364a4b12bc77f47524..70e32e4391ad82fa3d25beda8d2ddd8fe7716aad 100644 GIT binary patch delta 10 ScmbQldWvPj@{R8oGXek^(gfiE delta 60 zcmX@bGKqDHPT42FD$B8C!%FoskhUCfXP^z2a1_cINAXZ{9WYA+U J-Z)_wBLKY;4QK!W diff --git a/ExportROIs/Info.plist b/ExportROIs/Info.plist index 957e0f6..e699286 100644 --- a/ExportROIs/Info.plist +++ b/ExportROIs/Info.plist @@ -16,6 +16,8 @@ ???? CFBundleVersion 1.3.1 + CFBundleShortVersionString + 1.3.1 MenuTitles Export ROIs diff --git a/ExportROIs/html/ExportROIs.osirixplugin.zip b/ExportROIs/html/ExportROIs.osirixplugin.zip index 7e214f7ce8d5f1975e5b49c945aee565f7534a70..5003ba1f60b81bc5e118db0f4342567038a505d5 100644 GIT binary patch delta 13279 zcmZvD1yml*k~Xdh65NA31b24{65QP#0=($p?(Q0byX%XD;2zxF-TlvZclYj|-G92L z&vbW9RZVqGoijc4+(ba0ML>R3l7ogpg81iXHynun$Ow<-GpPvWGZ`-;jrY%`8+c6d z4pIr?A3973gumr4U7{;1Dl+T^6KE}37@LMCpjm0Afz zPE40jdQ_kfL0hO)aSC3lB0U)hGUVY4Z};)F%L?ecNf^^z6J71b5)Irou?2p0GH z2k^w*6OcdXA6{P9%4#^K?@N2O#6?@1^H5)%2}eJzZ(mX*Hrs0u!8Yp; zwz)L2J0?JoZ>wzP0H+@tgsFQ}yeiwefaSGWdf4AW=JDiv=$y7Uj;iY&Q>O7}P{L<79g6;DN1_%2T*u`fGOTZK$O31ca2o~#!E!3b*oyUBv*!i)O z^#)4@YTZLW0iZ5-h?L~u5gL#YYT6(nATnVf{c;-W6|2WJ4 z$3sw{CI8En5_O@apb?C1<(eJB-jpGC+O7?ATa(ZYN=k-SKpqoEc<3MtFdHE zKwo-EjvFL;lxwZ}hV9c7O)?u<#6ecs5a6+&mEL}D;*N0wK2=-?s9W97(s>MA_C{A) z>+i=q9v<1AVMW4N5PB`cOkjIplpk5RDUo{Eal~y#K-%o$fEc^@|Eb>ny(7T;%>G53 zgI}mOsfeNC`>P2|&%kwYuQGDF`f=ITu$mFBX=td^)@R}v7XC%++l5R4q>P+g55h?J zVmimH42P@@wLtaq<(Y;aqWIjyZ`cMU0Uzm}V8$JiLUJ4D^!MwyLN-&!9sx%69+ti% zja^$uFV&h91GfFtya1En!5(W@`<9|%ZHN0moC`;%q%R#=>pwIZ8A5Rx!=73NqGLj$ z(Qn$lP$GpQrh4Na<9*d!IhzTv{#-xb>0%pH1WIj$?%vwE2B+LBD*(wTF{9O`Mv;a2 zOGlO^P9e1CfXkB_FZZ_^ZQ!(VE<>^c3FY{OGO^zW4wksecj~l<+Fwz*rwmFhWTi`f z(@0PRCo8R9o8YM8tn!v1%T+zKn1xIz5lQ_x_>@#%WjtCT7H;l}&B>RRPIJPcA*5@Z zGt2id%b*QO{aQ@lM73t={D{y#Hpd{ns>5uN^w#hjbXIQRTGLca6;QC>oO3Ow)Z=M@ z+{e6tcknpt?CWKW`N01K+1yz*rN51$LZac=`2ne74~L|y+NQm}T~_50?9rMfy7^=Ef#?Mmu(^f(pm)Xjfp+<&x}DlDwa zv$X=f_1JFZmTw7hn)A)H53Q!D?JxMj(~ItHjUH7(Ac}N4b9i?!t8AaNxED19h6mP&Wj}l|&0C!J3)Z&r5ZUi}KuLjCcaOi@nbBARe1m4#fC+4@ zzWE#49_txOvti-^Q|%396Ls4TB|(>Wkb_Hhh*1U;61&%5WGW**nh7Isl|8wi�k(Lxe7?BkFMPh8H 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 delta 13379 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 diff --git a/HelloWorld/HelloWorldPreferences.xib b/HelloWorld/HelloWorldPreferences.xib index f2f827d..0042897 100644 --- a/HelloWorld/HelloWorldPreferences.xib +++ b/HelloWorld/HelloWorldPreferences.xib @@ -2,30 +2,30 @@ 1050 - 10F569 - 762 - 1038.29 - 461.00 + 11E53 + 2182 + 1138.47 + 569.00 com.apple.InterfaceBuilder.CocoaPlugin - 762 + 2182 - + YES - + NSTextField + NSTextFieldCell + NSWindowTemplate + NSView + NSCustomObject + NSUserDefaultsController YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -46,7 +46,7 @@ Window NSWindow - {1.79769e+308, 1.79769e+308} + 274 @@ -57,6 +57,7 @@ 268 {{17, 22}, {63, 17}} + YES 68288064 @@ -93,6 +94,7 @@ 268 {{85, 20}, {390, 22}} + YES -1804468671 @@ -121,21 +123,27 @@ {495, 62} + - {{0, 0}, {1680, 1028}} - {1.79769e+308, 1.79769e+308} + {{0, 0}, {1920, 1178}} + {10000000000000, 10000000000000} + YES - - YES - HelloWorld_Message - YES YES + + + _window + + + + 954 + value: values.HelloWorld_Message @@ -156,21 +164,15 @@ 952 - - - _window - - - - 954 - YES 0 - + + YES + @@ -251,7 +253,10 @@ YES YES - 776.IBEditorWindowLastContentRect + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 401.IBPluginDependency 776.IBPluginDependency 776.IBWindowTemplateEditedContentRect 776.NSWindowTemplate.visibleAtLaunch @@ -261,9 +266,12 @@ 947.IBPluginDependency 948.IBPluginDependency - + YES - {{11, 904}, {495, 62}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{11, 904}, {495, 62}} @@ -277,558 +285,18 @@ YES - - YES - + YES - - YES - + 954 - - - YES - - HelloWorldPreferencesController - NSPreferencePane - - IBProjectSource - HelloWorldPreferencesController.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenu - - IBFrameworkSource - OsiriX Headers.framework/Headers/MenuDictionary.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - OsiriX Headers.framework/Headers/KFSplitView.h - - - - NSObject - - IBFrameworkSource - OsiriX Headers.framework/Headers/N2Steps.h - - - - NSObject - - IBFrameworkSource - OsiriX Headers.framework/Headers/NSAppleEventDescriptor+N2.h - - - - NSObject - - IBFrameworkSource - OsiriX Headers.framework/Headers/NSUserDefaultsController+N2.h - - - - NSObject - - IBFrameworkSource - OsiriX Headers.framework/Headers/ViewerController.h - - - - NSPreferencePane - - IBFrameworkSource - OsiriX Headers.framework/Headers/NSPreferencePane+OsiriX.h - - - - NSPreferencePane - NSObject - - YES - - YES - _firstKeyView - _initialKeyView - _lastKeyView - _window - - - YES - NSView - NSView - NSView - NSWindow - - - - IBFrameworkSource - PreferencePanes.framework/Headers/NSPreferencePane.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSUserDefaultsController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSUserDefaultsController.h - - - - NSUserDefaultsController - - - - NSUserDefaultsController - - IBFrameworkSource - OsiriX Headers.framework/Headers/NSUserDefaultsController+OsiriX.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSView - - IBFrameworkSource - OsiriX Headers.framework/Headers/NSView+N2.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindow - - IBFrameworkSource - OsiriX Headers.framework/Headers/NSWindow+N2.h - - - - + 0 IBCocoaFramework @@ -840,7 +308,6 @@ YES - HelloWorld.xcodeproj 3 diff --git a/KeyObjectSelection/Resources/Plugin-Info.plist b/KeyObjectSelection/Resources/Plugin-Info.plist index beb5aaf..82b1e5b 100644 --- a/KeyObjectSelection/Resources/Plugin-Info.plist +++ b/KeyObjectSelection/Resources/Plugin-Info.plist @@ -15,9 +15,9 @@ CFBundleSignature ???? CFBundleVersion - 1.0 + 1.0.1 CFBundleShortVersionString - 1.0 + 1.0.1 NSPrincipalClass KeyObjectSelectionFilter diff --git a/KeyObjectSelection/Sources/KeyObjectSelectionFilter.mm b/KeyObjectSelection/Sources/KeyObjectSelectionFilter.mm index cf1167d..45c17ce 100644 --- a/KeyObjectSelection/Sources/KeyObjectSelectionFilter.mm +++ b/KeyObjectSelection/Sources/KeyObjectSelectionFilter.mm @@ -612,8 +612,9 @@ - (void)_ViewerController_finalizeSeriesViewing { static NSString* const KOSReconstructionsSeriesName = NSLocalizedString(@"OsiriX Screen Captures", nil); -(void)_ViewerController_setKeyImage:(id)sender { + DicomImage* image = [(ViewerController*)self currentImage]; //if ([(ViewerController*)self blendingController]) - if (![[[(ViewerController*)self currentImage] isKeyImage] boolValue]) + if (![image.modality isEqualToString:@"SC"] && ![[image isKeyImage] boolValue]) { [KeyObjectSelectionFilterInstance playGrabSound]; diff --git a/ROI Enhancement II/Resources/Interface.xib b/ROI Enhancement II/Resources/Interface.xib index 42b99e9..0eb4de7 100644 --- a/ROI Enhancement II/Resources/Interface.xib +++ b/ROI Enhancement II/Resources/Interface.xib @@ -2,13 +2,13 @@ 1050 - 11A511 - 1617 - 1138 - 566.00 + 11E53 + 2182 + 1138.47 + 569.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 2182 YES @@ -39,11 +39,8 @@ com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES @@ -82,7 +79,7 @@ DE2E5275-E12C-4FFC-B397-E9F86885F34C NSToolbarFlexibleSpaceItem - + YES @@ -92,9 +89,11 @@ - + 268 {{0, 14}, {100, 25}} + + YES -2076049856 @@ -195,6 +194,7 @@ 1044 + -1 YES 1 YES @@ -221,9 +221,11 @@ - + 268 {{0, 14}, {117, 25}} + + YES -2076049856 @@ -363,7 +365,9 @@ - + + YES + {2000, 2000} @@ -1780,7 +1784,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA numberStyle usesGroupingSeparator - + YES @@ -1841,7 +1845,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA numberStyle usesGroupingSeparator - + YES @@ -2082,6 +2086,134 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 86 + + + saveAsPDF: + + + + 151 + + + + saveAsDICOM: + + + + 152 + + + + _chart + + + + 163 + + + + _roiList + + + + 217 + + + + _options + + + + 218 + + + + saveAsTIFF: + + + + 474 + + + + _decimalFormatter + + + + 481 + + + + saveAsCSV: + + + + 482 + + + + _dicomSaveOptions + + + + 502 + + + + saveDICOM: + + + + 528 + + + + _csvSaveOptionsIncludeHeaders + + + + 538 + + + + _dicomSaveOptionsBackgroundColor + + + + 539 + + + + _floatFormatter + + + + 546 + + + + _dicomSaveDialog + + + + 552 + + + + delegate + + + + 159 + + + + _interface + + + + 168 + _all @@ -2138,53 +2270,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 132 - - - saveAsPDF: - - - - 151 - - - - saveAsDICOM: - - - - 152 - - delegate - + _interface + - 159 - - - - _chart - - - - 163 + 167 - _interface + _menu - + - 167 + 635 - _interface - - + _button + + - 168 + 636 @@ -2202,22 +2310,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 212 - - - _roiList - - - - 217 - - - - _options - - - - 218 - _background @@ -2474,38 +2566,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 417 - - - formatter - - - - 419 - - - - formatter - - - - 420 - - - - formatter - - - - 422 - - - - formatter - - - - 423 - _xRangeMax @@ -2674,69 +2734,117 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 472 + + + _legend + + + + 578 + - saveAsTIFF: - - + legendChanged: + + - 474 + 579 - _decimalFormatter - - + _leftRight + + - 481 + 602 + + + + _topBottom + + + + 603 - saveAsCSV: - - + legendChanged: + + - 482 + 604 + + + + legendChanged: + + + + 605 - _dicomSaveOptions - - + _bottom + + - 502 + 606 - - saveDICOM: - - + + _left + + - 528 + 607 - _csvSaveOptionsIncludeHeaders - - + _right + + - 538 + 608 - _dicomSaveOptionsBackgroundColor - - + _top + + - 539 + 609 - _floatFormatter - + formatter + + + + 422 + + + + formatter + + + + 423 + + + + formatter + - 546 + 419 + + + + formatter + + + + 420 @@ -2762,14 +2870,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 550 - - - _dicomSaveDialog - - - - 552 - buttonClicked: @@ -2796,83 +2896,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - _legend - - - - 578 - - - - legendChanged: - - - - 579 - - - - _leftRight - - - - 602 - - - - _topBottom - - - - 603 - - - - legendChanged: - - - - 604 - - - - legendChanged: - - - - 605 - - - - _bottom - - - - 606 - - - - _left - - - - 607 - - - - _right - - - - 608 - - - - _top - - + _seriesName + + - 609 + 637 @@ -2890,30 +2918,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 620 - - - _menu - - - - 635 - - - - _button - - - - 636 - - - - _seriesName - - - - 637 - @@ -4147,7 +4151,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 7.IBPluginDependency 97.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4329,7 +4333,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA dataSource delegate - + YES id id @@ -4342,7 +4346,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA dataSource delegate - + YES dataSource @@ -4402,7 +4406,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _saveButton _seriesName - + YES NSButton NSColorWell @@ -4421,7 +4425,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _saveButton _seriesName - + YES _cancelButton @@ -4463,7 +4467,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA saveAsTIFF: saveDICOM: - + YES id id @@ -4482,7 +4486,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA saveAsTIFF: saveDICOM: - + YES saveAsCSV: @@ -4520,7 +4524,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _options _roiList - + YES RoiEnhancementChart NSButton @@ -4547,7 +4551,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _options _roiList - + YES _chart @@ -4605,7 +4609,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA xRangeChanged: yRangeChanged: - + YES id id @@ -4624,7 +4628,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA xRangeChanged: yRangeChanged: - + YES curvesChanged: @@ -4688,7 +4692,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _yRangeMin _yTicks - + YES NSButton NSColorWell @@ -4767,7 +4771,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _yRangeMin _yTicks - + YES _background @@ -4919,6 +4923,45 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA RoiEnhancementROIList NSObject + + YES + + YES + displayAllROIs: + displayCheckedROIs: + displaySelectedROIs: + + + YES + id + id + id + + + + YES + + YES + displayAllROIs: + displayCheckedROIs: + displaySelectedROIs: + + + YES + + displayAllROIs: + id + + + displayCheckedROIs: + id + + + displaySelectedROIs: + id + + + YES @@ -4931,7 +4974,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _selected _separator - + YES NSMenuItem NSButton @@ -4954,7 +4997,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _selected _separator - + YES _all @@ -5009,7 +5052,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 @@ -5025,10 +5068,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSMenuMixedState NSSwitch - + YES - {9, 8} - {7, 2} + {11, 11} + {10, 3} {15, 15} diff --git a/XML-RPC-Plugin/xmlrpc.xcodeproj/project.pbxproj b/XML-RPC-Plugin/xmlrpc.xcodeproj/project.pbxproj index 571849e..d4912f9 100644 --- a/XML-RPC-Plugin/xmlrpc.xcodeproj/project.pbxproj +++ b/XML-RPC-Plugin/xmlrpc.xcodeproj/project.pbxproj @@ -299,14 +299,10 @@ CE6A9A9508AC841300D0C1EE /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ppc64, - x86_64, - ); + 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.5; - SDKROOT = macosx10.6; + SDKROOT = macosx10.7; }; name = Development; }; diff --git a/Zombies/Sources/ZombiesFilter.m b/Zombies/Sources/ZombiesFilter.m index 870a1bf..419821e 100644 --- a/Zombies/Sources/ZombiesFilter.m +++ b/Zombies/Sources/ZombiesFilter.m @@ -14,6 +14,7 @@ #import #import #import +#import #import @implementation ZombiesFilter @@ -33,7 +34,8 @@ - (long) filterImage:(NSString*) menuName thread.name = NSLocalizedString(@"Scanning for zombies...", nil); thread.status = NSLocalizedString(@"Preparing...", nil); thread.supportsCancel = YES; - [ThreadsManager.defaultManager addThreadAndStart:thread]; + + [thread startModalForWindow:nil]; thread.threadPriority = 0.0; @@ -81,6 +83,9 @@ - (long) filterImage:(NSString*) menuName } thread.progress = -1; + [ThreadsManager.defaultManager addThreadAndStart:thread]; + thread.supportsBackgrounding = YES; + [[thread.threadDictionary objectForKey:NSThreadModalForWindowControllerKey] invalidate]; // NSString* base = [idatabase dataDirPath]; NSFileManager* fm = [NSFileManager defaultManager]; @@ -91,7 +96,7 @@ - (long) filterImage:(NSString*) menuName [NSThread sleepForTimeInterval:0.001]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - thread.status = [NSString stringWithFormat:NSLocalizedString(@"Zombies found: %d of %@", nil), zombiesCount, N2LocalizedSingularPluralCount(filesCount, @"file", @"files")]; + thread.status = [NSString stringWithFormat:NSLocalizedString(@"Zombies found: %@ of %@", nil), N2LocalizedDecimal(zombiesCount), N2LocalizedSingularPluralCount(filesCount, @"file", @"files")]; @try { NSString* path = [base stringByAppendingPathComponent:sub]; BOOL isDir; @@ -151,6 +156,8 @@ - (long) filterImage:(NSString*) menuName [pool release]; } } + + NSLog(@"Zombies done. Count of revived Zombies is: %d", (int)zombiesCount); } @catch (NSException* e) { N2LogExceptionWithStackTrace(e); } @finally {