diff --git a/DicomDatabase+Scan.mm b/DicomDatabase+Scan.mm index 2fdb603a67..a880ae4843 100644 --- a/DicomDatabase+Scan.mm +++ b/DicomDatabase+Scan.mm @@ -459,7 +459,7 @@ -(NSArray*)scanDicomdirAt:(NSString*)path withPaths:(NSArray*)allpaths pathsToSc NSArray* objectIDs = nil; if (items.count) { thread.status = [NSString stringWithFormat:NSLocalizedString(@"Importing %@...", nil), N2LocalizedSingularPluralCount(items.count, NSLocalizedString(@"file", nil), NSLocalizedString(@"files", nil))]; - objectIDs = [self addFilesDescribedInDictionaries:items postNotifications:NO rereadExistingItems:NO generatedByOsiriX:NO]; + objectIDs = [self addFilesDescribedInDictionaries:items postNotifications:NO rereadExistingItems:NO generatedByOsiriX:NO importedFiles:YES returnArray: YES]; } return [self objectsWithIDs:objectIDs]; @@ -627,7 +627,7 @@ -(BOOL)scanAtPath:(NSString*)path isVolume:(BOOL)isVolume } } - dicomImages = [dicomImages arrayByAddingObjectsFromArray: [self objectsWithIDs:[self addFilesAtPaths:dicomFilePaths postNotifications:NO dicomOnly:NO rereadExistingItems:NO generatedByOsiriX:NO]]]; + dicomImages = [dicomImages arrayByAddingObjectsFromArray: [self objectsWithIDs:[self addFilesAtPaths:dicomFilePaths postNotifications:NO dicomOnly:NO rereadExistingItems:NO generatedByOsiriX:NO importedFiles:YES returnArray:YES]]]; } if (!dicomImages.count) diff --git a/DicomDatabase.h b/DicomDatabase.h index aff7f29bc2..6129bd68d1 100644 --- a/DicomDatabase.h +++ b/DicomDatabase.h @@ -129,9 +129,11 @@ extern NSString* const DicomDatabaseLogEntryEntityName; -(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotifications dicomOnly:(BOOL)dicomOnly rereadExistingItems:(BOOL)rereadExistingItems; -(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotifications dicomOnly:(BOOL)dicomOnly rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX; -(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotifications dicomOnly:(BOOL)dicomOnly rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX returnArray: (BOOL) returnArray; +-(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotifications dicomOnly:(BOOL)dicomOnly rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX importedFiles: (BOOL) importedFiles returnArray: (BOOL) returnArray; -(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotifications:(BOOL)postNotifications rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX; // returns NSArray -(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotifications:(BOOL)postNotifications rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX returnArray: (BOOL) returnArray; +-(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotifications:(BOOL)postNotifications rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX importedFiles: (BOOL) importedFiles returnArray: (BOOL) returnArray; #pragma mark Incoming -(BOOL)isFileSystemFreeSizeLimitReached; diff --git a/DicomDatabase.mm b/DicomDatabase.mm index af28e183dd..456dcca051 100644 --- a/DicomDatabase.mm +++ b/DicomDatabase.mm @@ -1453,6 +1453,11 @@ -(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotificat } -(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotifications dicomOnly:(BOOL)dicomOnly rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX returnArray: (BOOL) returnArray +{ + return [self addFilesAtPaths: paths postNotifications: postNotifications dicomOnly: dicomOnly rereadExistingItems: rereadExistingItems generatedByOsiriX: generatedByOsiriX importedFiles: NO returnArray: returnArray]; +} + +-(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotifications dicomOnly:(BOOL)dicomOnly rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX importedFiles: (BOOL) importedFiles returnArray: (BOOL) returnArray { NSThread* thread = [NSThread currentThread]; @@ -1601,7 +1606,7 @@ -(NSArray*)addFilesAtPaths:(NSArray*)paths postNotifications:(BOOL)postNotificat // NSLog(@"before: %X", self.managedObjectContext); // NSArray* addedImagesArray = [self addFilesInDictionaries:dicomFilesArray postNotifications:postNotifications rereadExistingItems:rereadExistingItems generatedByOsiriX:generatedByOsiriX]; - NSArray* objectIDs = [self addFilesDescribedInDictionaries:dicomFilesArray postNotifications:postNotifications rereadExistingItems:rereadExistingItems generatedByOsiriX:generatedByOsiriX returnArray: returnArray]; + NSArray* objectIDs = [self addFilesDescribedInDictionaries:dicomFilesArray postNotifications:postNotifications rereadExistingItems:rereadExistingItems generatedByOsiriX:generatedByOsiriX importedFiles: importedFiles returnArray: returnArray]; [thread exitOperation]; @@ -1699,6 +1704,11 @@ -(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotific static BOOL protectionAgainstReentry = NO; -(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotifications:(BOOL)postNotifications rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX returnArray: (BOOL) returnArray +{ + return [self addFilesDescribedInDictionaries: dicomFilesArray postNotifications: postNotifications rereadExistingItems: rereadExistingItems generatedByOsiriX: generatedByOsiriX importedFiles: NO returnArray: returnArray]; +} + +-(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotifications:(BOOL)postNotifications rereadExistingItems:(BOOL)rereadExistingItems generatedByOsiriX:(BOOL)generatedByOsiriX importedFiles: (BOOL) importedFiles returnArray: (BOOL) returnArray { #ifndef NDEBUG [self checkForCorrectContextThread]; @@ -2165,6 +2175,11 @@ -(NSArray*)addFilesDescribedInDictionaries:(NSArray*)dicomFilesArray postNotific [image setThumbnail:[curDict objectForKey:@"NSImageThumbnail"]]; + if (importedFiles) + image.importedFile = @YES; + else + image.importedFile = nil; + if (generatedByOsiriX) [image setValue: [NSNumber numberWithBool: generatedByOsiriX] forKey: @"generatedByOsiriX"]; else @@ -2649,7 +2664,7 @@ -(void)copyFilesThread:(NSDictionary*)dict DicomDatabase *idatabase = self.isMainDatabase? self.independentDatabase : [self.mainDatabase independentDatabase]; - objects = [idatabase addFilesAtPaths:copiedFiles postNotifications:YES dicomOnly:onlyDICOM rereadExistingItems:YES]; + objects = [idatabase addFilesAtPaths:copiedFiles postNotifications:YES dicomOnly:onlyDICOM rereadExistingItems:YES generatedByOsiriX:NO importedFiles:YES returnArray:YES]; DicomDatabase* mdatabase = self.isMainDatabase? self : self.mainDatabase; if( [[BrowserController currentBrowser] database] == mdatabase && [[dict objectForKey:@"addToAlbum"] boolValue]) diff --git a/DicomImage.h b/DicomImage.h index 55d7df7b11..460f7f13ce 100644 --- a/DicomImage.h +++ b/DicomImage.h @@ -55,6 +55,7 @@ void* sopInstanceUIDEncode( NSString *sopuid); @property(nonatomic, retain) NSDate* date; @property(nonatomic, retain) NSNumber* frameID; @property(nonatomic, retain) NSNumber* instanceNumber; +@property(nonatomic, retain) NSNumber* importedFile; @property(nonatomic, retain) NSNumber* pathNumber; @property(nonatomic, retain) NSString* pathString; @property(nonatomic, retain) NSNumber* rotationAngle; diff --git a/DicomImage.m b/DicomImage.m index f7f80ac57e..fc41de0b57 100644 --- a/DicomImage.m +++ b/DicomImage.m @@ -168,6 +168,7 @@ @implementation DicomImage @dynamic date; @dynamic frameID; @dynamic instanceNumber; +@dynamic importedFile; @dynamic pathNumber; @dynamic pathString; @dynamic rotationAngle; diff --git a/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/elements b/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/elements index 1d9830b8bb..dbac64617c 100644 Binary files a/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/elements and b/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/elements differ diff --git a/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/layout b/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/layout index 169bc04f9a..c7b9ae5003 100644 Binary files a/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/layout and b/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/layout differ diff --git a/Preference Panes/OSIAutoroutingPreferencePane/English.lproj/OSIAutoroutingPreferencePanePref.xib b/Preference Panes/OSIAutoroutingPreferencePane/English.lproj/OSIAutoroutingPreferencePanePref.xib index dc40bcbc8e..c234d5a26c 100644 --- a/Preference Panes/OSIAutoroutingPreferencePane/English.lproj/OSIAutoroutingPreferencePanePref.xib +++ b/Preference Panes/OSIAutoroutingPreferencePane/English.lproj/OSIAutoroutingPreferencePanePref.xib @@ -1,2747 +1,520 @@ - - - - 1070 - 12D78 - 3084 - 1187.37 - 626.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 3084 - - - NSButton - NSButtonCell - NSCustomObject - NSMatrix - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSScrollView - NSScroller - NSTableColumn - NSTableHeaderView - NSTableView - NSTextField - NSTextFieldCell - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - OSIAutoroutingPreferencePanePref - - - FirstResponder - - - NSApplication - - - 7 - 2 - {{0, 0}, {696, 364}} - 1081606144 - << do not localize >> - NSWindow - - View - - - - - 256 - - - - 256 - {{18, 328}, {470, 18}} - - - - YES - - 67108864 - 0 - Activate AutoRouting - - LucidaGrande - 13 - 1044 - - - 1211912448 - 2 - - NSSwitch - - - - 200 - 25 - - NO - - - - 256 - - - - 2304 - - - - 256 - {655, 207} - - - - YES - NO - YES - - - 256 - {655, 17} - - - - - - - - -2147483392 - {{-26, 0}, {16, 17}} - - - - - - - activated - 65 - 65 - 65 - - 75497536 - 134219776 - Activated - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 67108864 - 134217728 - - - LucidaGrande - 12 - 16 - - - 1215582464 - 2 - - - - 400 - 75 - - 3 - YES - YES - - - - name - 110 - 110 - 500 - - 75497536 - 2048 - Routes - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 1411383360 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - - - - server - 358 - 110 - 1000 - - 75497536 - 2048 - Destination - - - 6 - System - headerColor - - 3 - MQA - - - - - - 1411383360 - 2048 - Text Cell - - - - - - 3 - YES - - - - description - 110 - 110 - 1000 - - 75497536 - 2048 - Comments - - - - - - 1411383360 - 2048 - Text Cell - - - - - - 3 - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -943718400 - - - RoutingTableView - 3 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {655, 207}} - - - - - - 4 - - - - -2147483392 - {{-30, 17}, {15, 207}} - - - - NO - - _doScroller: - 0.98421061038970947 - - - - -2147483392 - {{-100, -100}, {655, 15}} - - - - NO - 1 - - _doScroller: - 0.87801611423492432 - - - - 2304 - - - - {{1, 0}, {655, 17}} - - - - - - 4 - - - - {{20, 52}, {657, 225}} - - - - 133650 - - - - - - AAAAAAAAAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 256 - {{462, 12}, {220, 32}} - - - - YES - - 67108864 - 134217728 - Add new route - - - -2038284288 - 1 - - - - - - 200 - 25 - - NO - - - - 256 - {{21, 13}, {484, 35}} - - - - YES - - 67108864 - 272891904 - RG91YmxlLUNsaWNrIG9uIGEgcm91dGUgdG8gZWRpdCBmaWx0ZXIgcGFyYW1ldGVycwpQcmVzcyBEZWxl -dGUga2V5IHRvIGRlbGV0ZSBhIHJvdXRlA - - LucidaGrande - 9 - 3614 - - - - 6 - System - controlColor - - - - - NO - - - - 256 - {{21, 277}, {663, 17}} - - - - YES - - 67108864 - 272629760 - OsiriX will automatically send data added in the database according to the following routes: - - - - - - NO - - - - 256 - {{19, 308}, {634, 18}} - - - - YES - - 67108864 - 0 - Display an error if an autorouting rule failed - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - {696, 364} - - - - - {{0, 0}, {1600, 978}} - {10000000000000, 10000000000000} - YES - - - 1 - 2 - {{0, 0}, {607, 445}} - 1886912512 - Window - - NSWindow - - - View - - - - - 256 - - - - 268 - {{32, 271}, {566, 46}} - - - YES - NO - 2 - 1 - - - -2080374784 - 8192 - Data Generated (Status, Comments, Reports, Key Images, Secondary Captures, ...) - - - 1 - 1211912448 - 0 - - NSRadioButton - - - - 200 - 25 - - - 67108864 - 8192 - Database Filter: - - - 1211912448 - 0 - - 549453824 - {18, 18} - - - - - - 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 -AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA -AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1 -cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD -AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH -SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF -hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8 -vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt -7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq -Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo -aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e -n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX -2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW -FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O -Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6 -ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt -rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA -AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA -AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl -A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq -DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU -HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8 -MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v -UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/ -eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj -rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn -5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh -AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK -CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY -GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95 -MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S -UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2 -d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV -pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK -0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf// -AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw -BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA -FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H -LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh -Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ -h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp -svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb -1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX -8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE -AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg -QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA - - - - - - 3 - MCAwAA - - - - 400 - 75 - - - {566, 22} - {4, 2} - 1151868928 - NSActionCell - - 67108864 - 0 - Radio - - 1211912448 - 0 - - 549453824 - {18, 18} - - - - - - TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw -IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ -29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 -dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA -AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG -AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ -0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ -7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ -5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ -3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD -AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns -AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ -6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ -/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ -///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl -YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA -AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD -AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu -AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB -AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - - - - - - - 400 - 75 - - - - - - - - - 256 - {{17, 408}, {132, 17}} - - - YES - - 67108864 - 71303168 - Name: - - - - - - NO - - - - 256 - {{-3, 379}, {152, 17}} - - - YES - - 67108864 - 71303168 - Destination Server: - - - - - - NO - - - - 256 - {{17, 325}, {132, 17}} - - - YES - - 67108864 - 71303168 - Comments: - - - - - - NO - - - - 256 - {{17, 165}, {132, 17}} - - - YES - - 67108864 - 71303168 - Previous Studies: - - - - - - NO - - - - 256 - {{5, 89}, {144, 17}} - - - YES - - 67108864 - 71303168 - Failure: - - - - - - NO - - - - 256 - {{-2, 40}, {151, 34}} - - - YES - - 67108864 - 71303168 - Check
if it exists: - - - - - - NO - - - - 256 - {{158, 374}, {432, 26}} - - - YES - - -2076180416 - 2048 - - - 109199360 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Item3 - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - - OtherViews - - - - - - 3 - YES - YES - 1 - - NO - - - - 256 - {{161, 406}, {426, 22}} - - - YES - - -1804599231 - 272630784 - - - - YES - - 6 - System - textBackgroundColor - - - - 6 - System - textColor - - - - NO - - - - 256 - {{161, 323}, {426, 22}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - - 256 - {{161, 223}, {426, 67}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - - 256 - {{496, 12}, {97, 32}} - - 1 - YES - - 67108864 - 134217728 - OK - - - 1 - -2038284288 - 1 - - - DQ - 200 - 25 - - NO - - - - 256 - {{391, 12}, {97, 32}} - - - YES - - 67108864 - 134217728 - Cancel - - - -2038284288 - 1 - - - Gw - 200 - 25 - - NO - - - - 256 - {{160, 201}, {89, 16}} - - - YES - - 67108864 - 134479872 - OsiriX Tables - - - -2038284288 - 1 - - LucidaGrande - 9 - 16 - - - - 200 - 25 - - NO - - - - 256 - {{255, 201}, {89, 16}} - - - 1 - YES - - 67108864 - 134479872 - SQL Syntax - - - 1 - -2038284288 - 1 - - - - 200 - 25 - - NO - - - - 256 - {{165, 353}, {425, 17}} - - - YES - - 67108864 - 272629760 - System Font Text - - - - - - NO - - - - 256 - {{-3, 253}, {146, 11}} - - - YES - - 67108864 - 71303168 - (Image Table Level) - - - - - - NO - - - - 256 - {{-15, 203}, {158, 42}} - - - YES - - 67108864 - 71303168 - RW1wdHkgZmlsdGVyIHdpbGwgcm91dGUD4oCoQUxMIGltYWdlcwo - - - - - - NO - - - - 268 - {{178, 139}, {387, 18}} - - - YES - - -2080374784 - 0 - of same modality - - - 1211912448 - 2 - - NSImage - NSSwitch - - - - - 200 - 25 - - NO - - - - 256 - {{22, 121}, {127, 42}} - - - YES - - 67108864 - 71565312 - For each study, also send, if available in the Database : - - - - - - NO - - - - 268 - {{178, 119}, {387, 18}} - - - YES - - -2080374784 - 0 - with same Study Description - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{158, 159}, {432, 26}} - - - YES - - -2076180416 - 2048 - - - 109199360 - 129 - - - 400 - 75 - - - Don't send previous study - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - OtherViews - - - - - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - The previous study - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - - - - - The last 2 previous studies - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - - - - - The last 3 previous studies - - 1048576 - 2147483647 - - - _popUpItemAction: - 3 - - - - - 1 - YES - YES - 2 - - NO - - - - 268 - {{158, 83}, {432, 26}} - - - YES - - -2076180416 - 2048 - - - 109199360 - 129 - - - 400 - 75 - - - Try 5 times each 30 secs - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - 5 - - - YES - - OtherViews - - - - Don't try to re-send - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - - Try 20 times each 30 secs - - 1048576 - 2147483647 - - - _popUpItemAction: - 20 - - - - - Try 100 times each 30 secs - - 1048576 - 2147483647 - - - _popUpItemAction: - 100 - - - - - Try 1400 times each 30 secs - - 1048576 - 2147483647 - - - _popUpItemAction: - 1400 - - - - - 2 - 1 - YES - YES - 2 - - NO - - - - 268 - {{159, 51}, {441, 18}} - - - YES - - -2080374784 - 0 - Send C-FIND to check if the study exists on the destination - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - {607, 445} - - - {{0, 0}, {1600, 978}} - {10000000000000, 10000000000000} - YES - - - YES - - - - - - - _window - - - - 26 - - - - routesTable - - - - 268 - - - - newRoute - - - - 269 - - - - newName - - - - 270 - - - - serverPopup - - - - 271 - - - - newFilter - - - - 272 - - - - newDescription - - - - 273 - - - - endNewRoute: - - - - 274 - - - - endNewRoute: - - - - 275 - - - - syntaxHelpButtons: - - - - 277 - - - - syntaxHelpButtons: - - - - 278 - - - - newRoute: - - - - 279 - - - - selectServer: - - - - 282 - - - - addressAndPort - - - - 283 - - - - previousPopup - - - - 336 - - - - previousModality - - - - 337 - - - - previousDescription - - - - 338 - - - - failurePopup - - - - 350 - - - - selectPrevious: - - - - 351 - - - - cfindTest - - - - 356 - - - - mainWindow - - - - 378 - - - - value: values.AUTOROUTINGACTIVATED - - - - - - value: values.AUTOROUTINGACTIVATED - value - values.AUTOROUTINGACTIVATED - 2 - - - 379 - - - - delegate - - - - 280 - - - - dataSource - - - - 284 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 363 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 365 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 367 - - - - value: values.ShowErrorMessagesForAutorouting - - - - - - value: values.ShowErrorMessagesForAutorouting - value - values.ShowErrorMessagesForAutorouting - 2 - - - 319 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 371 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 373 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 369 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 375 - - - - enabled: filterType - - - - - - enabled: filterType - enabled - filterType - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 377 - - - - selectedTag: filterType - - - - - - selectedTag: filterType - selectedTag - filterType - 2 - - - 361 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 12 - - - - - - PrefPane - - - 6 - - - - - - - - - - - - - 238 - - - - - - newRoute - - - 239 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 240 - - - - - - - - 241 - - - - - - - - 242 - - - - - - - - 243 - - - - - - - - 248 - - - - - - - - 249 - - - - - - - - 251 - - - - - - - - 252 - - - - - - - - 253 - - - - - - - - 254 - - - - - - - - 255 - - - - - - - - 256 - - - - - - - - 286 - - - - - - - - 287 - - - - - - - - 295 - - - - - 296 - - - - - 297 - - - - - 298 - - - - - - - - 299 - - - - - 300 - - - - - 302 - - - - - 303 - - - - - 304 - - - - - 305 - - - - - 306 - - - - - 307 - - - - - 308 - - - - - 309 - - - - - 244 - - - - - - - - 247 - - - - - -3 - - - Application - - - 318 - - - - - 320 - - - - - - - - 321 - - - - - 322 - - - - - - - - 323 - - - - - - - - 324 - - - - - - - - 325 - - - - - - - - 326 - - - - - - - - 327 - - - - - - - - - - - - 328 - - - - - 329 - - - - - 330 - - - - - 331 - - - - - 332 - - - - - 333 - - - - - 334 - - - - - 335 - - - - - 339 - - - - - - - - 340 - - - - - 341 - - - - - - - - 342 - - - - - - - - 343 - - - - - - - - - - - - - 344 - - - - - 345 - - - - - 346 - - - - - 347 - - - - - 348 - - - - - 349 - - - - - 352 - - - - - - - - 353 - - - - - 354 - - - - - - - - 355 - - - - - 119 - - - - - - - - 291 - - - - - 123 - - - - - - - - - - - 124 - - - - - - - - - - - 313 - - - - - 314 - - - - - 315 - - - - - 125 - - - - - - - - 231 - - - - - - - - 232 - - - - - - - - 288 - - - - - - - - 289 - - - - - 312 - - - - - 311 - - - - - 310 - - - - - 133 - - - - - - - - 292 - - - - - 233 - - - - - - - - 293 - - - - - 235 - - - - - - - - 294 - - - - - 316 - - - - - - - - 317 - - - - - 357 - - - - - - - - - - 358 - - - - - 359 - - - - - 360 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{51, 288}, {696, 364}} - com.apple.InterfaceBuilder.CocoaPlugin - RoutesTableView - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{772, 505}, {607, 445}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 379 - - - - - NSPreferencePane - NSObject - - NSView - NSView - NSView - NSWindow - - - - _firstKeyView - NSView - - - _initialKeyView - NSView - - - _lastKeyView - NSView - - - _window - NSWindow - - - - IBProjectSource - ./Classes/NSPreferencePane.h - - - - OSIAutoroutingPreferencePanePref - NSPreferencePane - - id - id - id - id - id - id - - - - endNewRoute: - id - - - newRoute: - id - - - selectPrevious: - id - - - selectServer: - id - - - setActivated: - id - - - syntaxHelpButtons: - id - - - - NSTextField - NSButton - NSButton - NSPopUpButton - NSWindow - NSTextField - NSTextField - NSTextField - NSWindow - NSButton - NSButton - NSPopUpButton - NSTableView - NSPopUpButton - - - - addressAndPort - NSTextField - - - autoroutingActivated - NSButton - - - cfindTest - NSButton - - - failurePopup - NSPopUpButton - - - mainWindow - NSWindow - - - newDescription - NSTextField - - - newFilter - NSTextField - - - newName - NSTextField - - - newRoute - NSWindow - - - previousDescription - NSButton - - - previousModality - NSButton - - - previousPopup - NSPopUpButton - - - routesTable - NSTableView - - - serverPopup - NSPopUpButton - - - - IBProjectSource - ./Classes/OSIAutoroutingPreferencePanePref.h - - - - RoutesTableView - NSTableView - - IBProjectSource - ./Classes/RoutesTableView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {11, 11} - {10, 3} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Double-Click on a route to edit filter parameters +Press Delete key to delete a route + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +RW1wdHkgZmlsdGVyIHdpbGwgcm91dGUD4oCoQUxMIGltYWdlcwo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + \ No newline at end of file diff --git a/WebPortalConnection.mm b/WebPortalConnection.mm index 82e290be47..cd6bb4ecca 100644 --- a/WebPortalConnection.mm +++ b/WebPortalConnection.mm @@ -744,7 +744,7 @@ - (void) closeFileHandleAndClean if ([studyInstanceUID isEqualToString: previousStudyInstanceUID] == NO || [patientUID compare: previousPatientUID options: NSCaseInsensitiveSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch] != NSOrderedSame) { - [idatabase addFilesAtPaths: filesAccumulator postNotifications:YES dicomOnly:YES rereadExistingItems:YES generatedByOsiriX:YES]; + [idatabase addFilesAtPaths: filesAccumulator postNotifications:YES dicomOnly:YES rereadExistingItems:YES generatedByOsiriX:YES importedFiles:YES returnArray:NO]; [filesAccumulator removeAllObjects]; @@ -838,7 +838,7 @@ - (void) closeFileHandleAndClean } } - [idatabase addFilesAtPaths: filesAccumulator postNotifications:YES dicomOnly:YES rereadExistingItems:YES generatedByOsiriX:YES]; + [idatabase addFilesAtPaths: filesAccumulator postNotifications:YES dicomOnly:YES rereadExistingItems:YES generatedByOsiriX:YES importedFiles:YES returnArray:NO]; [[NSFileManager defaultManager] removeItemAtPath: @"/tmp/osirixUnzippedFolder" error: nil]; diff --git a/XMLController.m b/XMLController.m index e735a306f1..cce80fb7c1 100644 --- a/XMLController.m +++ b/XMLController.m @@ -214,7 +214,7 @@ - (NSArray*) updateDB:(NSArray*) files objects: (NSArray*) objects dontClose = YES; - NSArray *addedObjects = [BrowserController.currentBrowser.database addFilesAtPaths:files postNotifications:YES dicomOnly:YES rereadExistingItems:YES]; + NSArray *addedObjects = [BrowserController.currentBrowser.database addFilesAtPaths:files postNotifications:YES dicomOnly:YES rereadExistingItems:YES generatedByOsiriX:NO importedFiles:NO returnArray:YES]; addedObjects = [BrowserController.currentBrowser.database objectsWithIDs: addedObjects];