remove deprecated

commit new version

diff --git a/src2/data/localdatabase_Descriptor.dscp b/src2/data/localdatabase_Descriptor.dscp
index e3338aa7c50305e288382e721663fc1f688b6d75..bc6af9163f9bef697d097f6d95df9877fb74c012 100644 (file)
--- a/src2/data/localdatabase_Descriptor.dscp
+++ b/src2/data/localdatabase_Descriptor.dscp
@@ -3,53 +3,53 @@ Root
 O Name Name 4
 <level>
 Patient
-O NumberOfChildren #Series
-D 0x0010 0x0010 4
-D 0x0010 0x0040 3
-D 0x0010 0x0030 3
-D 0x0010 0x0020 2
+O NumberOfChildren             #Series
+D 0x0010 0x0010 4 # Patient's Name
+D 0x0010 0x0040 3 # Patient's Sex
+D 0x0010 0x0030 3 # Patient's Birth Date
+D 0x0010 0x0020 2 # Patient ID
 <level>
 Series
-O NumberOfChildren #Images
-D 0x0008 0x0060 4
-D 0x0008 0x1030 3
-D 0x0008 0x103E 3
-D 0x0008 0x0080 3
-D 0x0008 0x0081 3
-D 0x0008 0x1010 3
-D 0x0008 0x1048 3
-D 0x0008 0x1050 3
-D 0x0018 0x1030 3
-D 0x0020 0x0010 3
-D 0x0008 0x0020 3
-D 0x0008 0x0030 3
-D 0x0008 0x0050 3
-D 0x0008 0x0005 3
-D 0x0008 0x0021 3
-D 0x0008 0x0031 3
-D 0x0020 0x000D 3
-D 0x0020 0x000E 2
+O NumberOfChildren          #Images
+D 0x0008 0x0060 4 # Modality
+D 0x0008 0x1030 3 # Study Description
+D 0x0008 0x103E 3 # Series Description
+D 0x0008 0x0080 3 # Institution Name
+D 0x0008 0x0081 3 # Institution Address
+D 0x0008 0x1010 3 # Station Name
+D 0x0008 0x1048 3 # Physician(s) of Record
+D 0x0008 0x1050 3 # Performing Physician's Name
+D 0x0018 0x1030 3 # Protocol Name
+D 0x0020 0x0010 3 # Study ID
+D 0x0008 0x0020 3 # Study Date
+D 0x0008 0x0030 3 # Study Time
+D 0x0008 0x0050 3 # Accession Number
+D 0x0008 0x0005 3 # Specific Character Set    // Useless !
+D 0x0008 0x0021 3 # Series Date
+D 0x0008 0x0031 3 # Series Time
+D 0x0020 0x000D 3 # Study Instance UID
+D 0x0020 0x000E 2 # Series Instance UID
 <level>
 Image
-D 0x0020 0x0013 3
-D 0x0028 0x0010 3
-D 0x0028 0x0011 3
-D 0x0028 0x0008 3
-D 0x0028 0x0103 3
-D 0x0020 0x0032 3
-D 0x0020 0x0037 3
-D 0x0020 0x1041 3
-D 0x0028 0x0030 3
-D 0x0028 0x0100 3
-D 0x0028 0x0101 3
-D 0x0008 0x0008 3
-D 0x0008 0x0023 3
-D 0x0008 0x0033 3
-D 0x0020 0x4000 3
-D 0x0004 0x1500 4
-D 0x0028 0x1052 3
-D 0x0028 0x1053 3
-D 0x0050 0x0004 3
-D 0x0020 0x0052 3
-D 0x0008 0x0016 3
+D 0x0020 0x0013 3 # Instance Number
+D 0x0028 0x0010 3 # Rows
+D 0x0028 0x0011 3 # Columns
+D 0x0028 0x0008 3 # Number of Frames
+D 0x0028 0x0103 3 # Pixel Representation       // Useless !
+D 0x0020 0x0032 3 # Image Position (Patient)
+D 0x0020 0x0037 3 # Image Orientation (Patient)
+D 0x0020 0x1041 3 # Slice Location
+D 0x0028 0x0030 3 # Pixel Spacing
+D 0x0028 0x0100 3 # Bits Allocated             // Useless !
+D 0x0028 0x0101 3 # Bits Stored                // Useless !
+D 0x0008 0x0008 3 # Image Type
+D 0x0008 0x0023 3 # Content Date
+D 0x0008 0x0033 3 # Content Time
+D 0x0020 0x4000 3 # Image Comments
+D 0x0004 0x1500 4 # Window Center
+D 0x0028 0x1052 3 # Rescale Intercept
+D 0x0028 0x1053 3 # Rescale Slope
+D 0x0050 0x0004 3 # Calibration Image
+D 0x0020 0x0052 3 # Frame of Reference UID
+D 0x0008 0x0016 3 # SOP Class UID
 O FullFileName Full_file_name 2

diff --git a/src2/data/localdatabase_Descriptor.txt b/src2/data/localdatabase_Descriptor.txt
deleted file mode 100644 (file)
index bc6af91..0000000
--- a/src2/data/localdatabase_Descriptor.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-<level>
-Root
-O Name Name 4
-<level>
-Patient
-O NumberOfChildren             #Series
-D 0x0010 0x0010 4 # Patient's Name
-D 0x0010 0x0040 3 # Patient's Sex
-D 0x0010 0x0030 3 # Patient's Birth Date
-D 0x0010 0x0020 2 # Patient ID
-<level>
-Series
-O NumberOfChildren          #Images
-D 0x0008 0x0060 4 # Modality
-D 0x0008 0x1030 3 # Study Description
-D 0x0008 0x103E 3 # Series Description
-D 0x0008 0x0080 3 # Institution Name
-D 0x0008 0x0081 3 # Institution Address
-D 0x0008 0x1010 3 # Station Name
-D 0x0008 0x1048 3 # Physician(s) of Record
-D 0x0008 0x1050 3 # Performing Physician's Name
-D 0x0018 0x1030 3 # Protocol Name
-D 0x0020 0x0010 3 # Study ID
-D 0x0008 0x0020 3 # Study Date
-D 0x0008 0x0030 3 # Study Time
-D 0x0008 0x0050 3 # Accession Number
-D 0x0008 0x0005 3 # Specific Character Set    // Useless !
-D 0x0008 0x0021 3 # Series Date
-D 0x0008 0x0031 3 # Series Time
-D 0x0020 0x000D 3 # Study Instance UID
-D 0x0020 0x000E 2 # Series Instance UID
-<level>
-Image
-D 0x0020 0x0013 3 # Instance Number
-D 0x0028 0x0010 3 # Rows
-D 0x0028 0x0011 3 # Columns
-D 0x0028 0x0008 3 # Number of Frames
-D 0x0028 0x0103 3 # Pixel Representation       // Useless !
-D 0x0020 0x0032 3 # Image Position (Patient)
-D 0x0020 0x0037 3 # Image Orientation (Patient)
-D 0x0020 0x1041 3 # Slice Location
-D 0x0028 0x0030 3 # Pixel Spacing
-D 0x0028 0x0100 3 # Bits Allocated             // Useless !
-D 0x0028 0x0101 3 # Bits Stored                // Useless !
-D 0x0008 0x0008 3 # Image Type
-D 0x0008 0x0023 3 # Content Date
-D 0x0008 0x0033 3 # Content Time
-D 0x0020 0x4000 3 # Image Comments
-D 0x0004 0x1500 4 # Window Center
-D 0x0028 0x1052 3 # Rescale Intercept
-D 0x0028 0x1053 3 # Rescale Slope
-D 0x0050 0x0004 3 # Calibration Image
-D 0x0020 0x0052 3 # Frame of Reference UID
-D 0x0008 0x0016 3 # SOP Class UID
-O FullFileName Full_file_name 2