update of DateAnonymizer and PrivateTagAnonymizer because it genera…

EvilDICOM/EvilDICOM/Anonymization/Anonymizers/DateAnonymizer.cs

@@ -62,7 +62,7 @@ public void PreserveAndAnonymize(DICOMObject d)
         public void NullAndAnonymize(DICOMObject d)
         {
             var dob = d.FindFirst(TagHelper.Patient​Birth​Date) as Date;
-            dob.Data = null;
+            if (dob != null) dob.Data = null;
 
             var dates = d.FindAll(VR.Date);
             if (dates.Count > 0)

EvilDICOM/EvilDICOM/Anonymization/Anonymizers/PrivateTagAnonymizer.cs

@@ -18,8 +18,11 @@ public class PrivateTagAnonymizer : IAnonymizer
         public void Anonymize(DICOMObject d)
         {
             _logger.LogInformation("Removing private tags...", 0);
-            foreach (var priv in d.AllElements.Where(e => e.Tag.IsPrivate()))
-                d.Remove(priv.Tag);
+
+            d.RemoveRange(d.AllElements.Where(e => e.Tag.IsPrivate()).Select(x=>x.Tag));
+
+            //foreach (var priv in d.AllElements.Where(e => e.Tag.IsPrivate()))
+            //    d.Remove(priv.Tag);
         }
     }
 }

EvilDICOM/EvilDICOM/EvilDICOM.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <RootNamespace>EvilDICOM</RootNamespace>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <Authors>Rex Cardan, PhD</Authors>
     <Company>Red Ion LLC</Company>
     <Description>The wickedest .NET DICOM library in the world.</Description>
@@ -31,10 +31,6 @@
 
   <ItemGroup>
     <None Remove="packages.config" />
-    <None Include="F:\OneDrive\Cardan.Design\Artwork\Logos\Evil Dicom\evilEye.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
   </ItemGroup>
 
   <ItemGroup>
@@ -46,4 +42,11 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="evilEye.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
 </Project>

docs/api/index.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/api/index.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/api/index.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
 
               <p><center><img src="../images/evilDicomLogo.png" alt="Logo" title="Evil DICOM Logo"></center></p>
 <h2 id="the-structure-of-evil-dicom-core">The Structure of Evil DICOM Core</h2>

docs/articles/anonymization.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="anonymization.md">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/anonymization.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/anonymization.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h2 id="anonymization-operations">Anonymization Operations</h2>
 
 <p>Evil DICOM can quickly anonymize a DICOM file set with just a few lines of code. </p>

docs/articles/dvhCalculation.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/dvhCalculation.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/dvhCalculation.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h1 id="examples">Examples</h1>
 
 <h2 id="drawing-composite-images">Drawing Composite Images</h2>

docs/articles/helpers.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="helpers.md">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/helpers.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/helpers.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h2 id="helper-classes">Helper Classes</h2>
 
 <p>There are a lot of details about DICOM that the libary doesn&#39;t expect you to have memorized. There are several helper classes to help with common problems. I suggest you explore the helper classes in the helper folder of the library. Of all helpers, you will probably use the TagHelper the most.</p>

docs/articles/networking.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="networking.md">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/networking.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/networking.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h2 id="entities">Entities</h2>
 
 <p>In DICOM networking, the networking objects that communicate are called Entities, or Application Entities. An entity has a label called an AETitle, a port, and an IP address where it can be reached. To contruct this information in Evil DICOM, use:</p>

docs/articles/operations.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/operations.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/operations.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h2 id="basic-operations">Basic Operations</h2>
 
 <h3 id="reading-and-writing">Reading and Writing</h3>

docs/articles/selection.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="selection.md">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/selection.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/selection.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h2 id="easy-dicom-selection">Easy DICOM Selection</h2>
 
 <p>The DICOMSelector used to be a premium feature of the library and now it is included for free. It is all about convenience. Selecting and manipulating DICOM elements is easy with Evil DICOM, but it is even EASIER when you are using the selector. The selector gives you <em>strongly</em> typed access to all elements allowing you to do complex hierarchical descension by dot notation. You never have to manually cast the element with this module.</p>

docs/articles/structure.html

@@ -64,7 +64,7 @@
         <div class="article row grid-right">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="structure.md">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/structure.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/articles/structure.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
               <h2 id="the-structure-of-evil-dicom-core">The Structure of Evil DICOM Core</h2>
 
 <p>DICOM and especially DICOM programming can seem overwhelming at first and so let&#39;s just get a big picture view of the Evil DICOM library. The cornerstones of the core library are really three classes:</p>

docs/articles/toc.html

@@ -47,10 +47,10 @@
                         <a href="helpers.html" name="" title="Helper Classes">Helper Classes</a>
                       </li>
                       <li>
-                        <a href="selection.html" name="" title="Easy DICOM Selection">Easy DICOM Selection</a>
+                        <a href="selection.html" name="" title="Easy Selection">Easy Selection</a>
                       </li>
                       <li>
-                        <a href="networking.html" name="" title="DICOM Networking">DICOM Networking</a>
+                        <a href="networking.html" name="" title="Networking">Networking</a>
                       </li>
                       <li>
                         <a href="anonymization.html" name="" title="Anonymization">Anonymization</a>
@@ -78,10 +78,10 @@
                     <a href="helpers.html" name="" title="Helper Classes">Helper Classes</a>
                   </li>
                   <li>
-                    <a href="selection.html" name="" title="Easy DICOM Selection">Easy DICOM Selection</a>
+                    <a href="selection.html" name="" title="Easy Selection">Easy Selection</a>
                   </li>
                   <li>
-                    <a href="networking.html" name="" title="DICOM Networking">DICOM Networking</a>
+                    <a href="networking.html" name="" title="Networking">Networking</a>
                   </li>
                   <li>
                     <a href="anonymization.html" name="" title="Anonymization">Anonymization</a>

docs/index.html

@@ -57,7 +57,7 @@
         <div class="article row grid">
           <div class="col-md-10">
             <article class="content wrap" id="_content" data-uid="">
-              <a href="https://github.com/rexcardan/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/index.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
+              <a href="https://github.com/ochicaud/Evil-DICOM/blob/master/EvilDICOM/EvilDICOM.DocFx/index.md/#L1" class="btn btn-primary pull-right mobile-hide">Improve this Doc</a>
 
               <center><img src="images/evilDicomLogo.png" alt="Logo" title="Evil DICOM Logo"></center>
 

docs/manifest.json

@@ -1,6 +1,6 @@
 {
   "homepages": [],
-  "source_base_path": "C:/Git/Evil-DICOM/EvilDICOM/EvilDICOM.DocFx",
+  "source_base_path": "D:/dev/Github/Evil-DICOM/EvilDICOM/EvilDICOM.DocFx",
   "xrefmap": "xrefmap.yml",
   "files": [
     {
@@ -2050,9 +2050,6 @@
       "version": ""
     },
     {
-      "log_codes": [
-        "DuplicateUids"
-      ],
       "type": "ManagedReference",
       "source_relative_path": "api/EvilDICOM.Core.Helpers.Tryer.yml",
       "output": {
@@ -3796,6 +3793,9 @@
       "version": ""
     },
     {
+      "log_codes": [
+        "DuplicateUids"
+      ],
       "type": "ManagedReference",
       "source_relative_path": "api/EvilDICOM.Network.Messaging.SendStatus.yml",
       "output": {
@@ -4603,6 +4603,9 @@
       "version": ""
     },
     {
+      "log_codes": [
+        "DuplicateUids"
+      ],
       "type": "ManagedReference",
       "source_relative_path": "api/Evil_DICOM.Core.Helpers.Tryer.yml",
       "output": {
@@ -4627,9 +4630,6 @@
       "version": ""
     },
     {
-      "log_codes": [
-        "DuplicateUids"
-      ],
       "type": "ManagedReference",
       "source_relative_path": "api/Evil_DICOM.Network.Messaging.SendStatus.yml",
       "output": {
@@ -4659,7 +4659,7 @@
       "output": {
         ".html": {
           "relative_path": "api/index.html",
-          "hash": "jwaCRXdgUlb/LTMZL7lY5Q=="
+          "hash": "6XtTfpsi7le9OSlslhYmgQ=="
         }
       },
       "is_incremental": false,
@@ -4683,7 +4683,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/anonymization.html",
-          "hash": "fSpSIEfACkkZphe6qLmujQ=="
+          "hash": "p9xdcOIJPJJ/FlPWciXRMg=="
         }
       },
       "is_incremental": false,
@@ -4695,7 +4695,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/dvhCalculation.html",
-          "hash": "YOhOuHeRgxs/r7f6AjyHyg=="
+          "hash": "DqaU9feRFh6/uz68YL61Hw=="
         }
       },
       "is_incremental": false,
@@ -4707,7 +4707,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/helpers.html",
-          "hash": "gR3T+qOJzq7XS9x4cSRejA=="
+          "hash": "PT0jvpycqW96cKnEn+ZBlQ=="
         }
       },
       "is_incremental": false,
@@ -4719,7 +4719,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/networking.html",
-          "hash": "TAO8NVJS6KPrKyNOJeVzOQ=="
+          "hash": "Ui3DP93VUl0v+r1XJnr4mQ=="
         }
       },
       "is_incremental": false,
@@ -4731,7 +4731,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/operations.html",
-          "hash": "PeZ9xZpqCP735QkTSql88w=="
+          "hash": "ceXuvjiJS4m587lEGH5CeA=="
         }
       },
       "is_incremental": false,
@@ -4743,7 +4743,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/selection.html",
-          "hash": "Z4eqlP4dVN6xBiTx/OFBmw=="
+          "hash": "rAhbSk560gMXhqfRyQc8zA=="
         }
       },
       "is_incremental": false,
@@ -4755,19 +4755,19 @@
       "output": {
         ".html": {
           "relative_path": "articles/structure.html",
-          "hash": "7y60KXqHxF1RhK0wN62iOQ=="
+          "hash": "pcNndi2lXW9hwXV7dJv2Dg=="
         }
       },
       "is_incremental": false,
       "version": ""
     },
     {
       "type": "Toc",
-      "source_relative_path": "articles/toc.md",
+      "source_relative_path": "articles/toc.yml",
       "output": {
         ".html": {
           "relative_path": "articles/toc.html",
-          "hash": "ebHxViKNdjCEmoZiyl9nrA=="
+          "hash": "GtO8sEwhttM/jlaImwG8lQ=="
         }
       },
       "is_incremental": false,
@@ -4812,7 +4812,7 @@
       "output": {
         ".html": {
           "relative_path": "index.html",
-          "hash": "KQSDq4qwAUEiEoNLEOSEZw=="
+          "hash": "r7YoLdkI1wXMejJCC2EopQ=="
         }
       },
       "is_incremental": false,