MD-721

pixmeo · Nov 6, 2013 · ed7b922 · ed7b922
1 parent daca01e
commit ed7b922
Show file tree

Hide file tree

Showing 10 changed files with 546 additions and 2,754 deletions.
diff --git 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
@@ -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<NSManagedObjectID>
 -(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
@@ -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
@@ -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
@@ -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
diff --git a/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/layout b/OsiriXDB_DataModel.xcdatamodeld/OsiriXDB_DataModel.xcdatamodel/layout