Skip to content

Commit

Permalink
Merge pull request #187 from HicServices/develop
Browse files Browse the repository at this point in the history
Release v4.0.3
  • Loading branch information
jas88 authored Feb 7, 2023
2 parents 50b609b + 5d10f42 commit 8f51fdb
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 23 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [4.0.3] - 2023-02-07

### Changed

- Add ECG type template

### Dependencies

- Bump MongoDB.Driver from 2.18.0 to 2.19.0
- Bump NLog from 5.1.0 to 5.1.1
- Bump YamlDotNet from 12.3.1 to 13.0.0

## [4.0.2] - 2022-12-19

### Changed
Expand Down Expand Up @@ -240,7 +252,8 @@ Initial commit of code from old SMIPlugin repo
- Rake build scripts for CI


[Unreleased]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.2...develop
[Unreleased]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.3...develop
[4.0.3]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.2..4.0.3
[4.0.2]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.1..4.0.2
[4.0.1]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.0..4.0.1
[4.0.0]: https://github.com/HicServices/DicomTypeTranslation/compare/3.0.0..4.0.0
Expand Down
7 changes: 6 additions & 1 deletion DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\Templates\ECG.it" Link="Templates\ECG.it">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\Templates\XA.it" Link="Templates\XA.it">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand All @@ -89,7 +94,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NunitXml.TestLogger" Version="3.0.127" />
<PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DicomTypeTranslation\DicomTypeTranslation.csproj" />
Expand Down
3 changes: 3 additions & 0 deletions DicomTypeTranslation.Tests/TemplateTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public void Template_ExampleYaml()
[TestCase("SR",FAnsi.DatabaseType.MicrosoftSQLServer)]
[TestCase("SR",FAnsi.DatabaseType.MySql)]
[TestCase("SR",FAnsi.DatabaseType.Oracle)]
[TestCase("ECG",FAnsi.DatabaseType.MicrosoftSQLServer)]
[TestCase("ECG",FAnsi.DatabaseType.MySql)]
[TestCase("ECG",FAnsi.DatabaseType.Oracle)]
[TestCase("XA", FAnsi.DatabaseType.MicrosoftSQLServer)]
[TestCase("XA", FAnsi.DatabaseType.MySql)]
[TestCase("XA", FAnsi.DatabaseType.Oracle)]
Expand Down
1 change: 1 addition & 0 deletions DicomTypeTranslation.sln
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{
ProjectSection(SolutionItems) = preProject
Templates\CT.it = Templates\CT.it
Templates\DX.it = Templates\DX.it
Templates\ECG.it = Templates\ECG.it
Templates\MR.it = Templates\MR.it
Templates\NM.it = Templates\NM.it
Templates\OTHER.it = Templates\OTHER.it
Expand Down
8 changes: 4 additions & 4 deletions DicomTypeTranslation/DicomTypeTranslation.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
<LangVersion>9.0</LangVersion>
<LangVersion>latest</LangVersion>
<AssemblyTitle>DicomTypeTranslation</AssemblyTitle>
<Product>DicomTypeTranslation</Product>
<Copyright>Copyright © 2018-2020</Copyright>
Expand Down Expand Up @@ -32,9 +32,9 @@
<ItemGroup>
<PackageReference Include="fo-dicom" Version="5.0.3" />
<PackageReference Include="HIC.FAnsiSql" Version="3.0.1" />
<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
<PackageReference Include="MongoDB.Driver" Version="2.19.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.1.0" />
<PackageReference Include="YamlDotNet" Version="12.3.1" />
<PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="YamlDotNet" Version="13.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
using FAnsi.Discovery;
using FAnsi.Discovery.TypeTranslation;
using System;
using System;
using TypeGuesser;
using YamlDotNet.Serialization;
using YamlDotNet.Serialization.ObjectFactories;

namespace DicomTypeTranslation.TableCreation
namespace DicomTypeTranslation.TableCreation;

internal class ImageTableTemplateObjectFactory : ObjectFactoryBase
{
internal class ImageTableTemplateObjectFactory : IObjectFactory
public override object Create(Type type)
{
public object Create(Type type)
{
if(type == typeof(DatabaseTypeRequest))
return new DatabaseTypeRequest(typeof(string),null,null);

return Activator.CreateInstance(type);
}
return type == typeof(DatabaseTypeRequest)
? new DatabaseTypeRequest(typeof(string), null, null)
: Activator.CreateInstance(type);
}
}
}
6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
[assembly: AssemblyCulture("")]

// These should be overwritten by release builds
[assembly: AssemblyVersion("4.0.2")]
[assembly: AssemblyFileVersion("4.0.2")]
[assembly: AssemblyInformationalVersion("4.0.2")]
[assembly: AssemblyVersion("4.0.3")]
[assembly: AssemblyFileVersion("4.0.3")]
[assembly: AssemblyInformationalVersion("4.0.3")]
89 changes: 89 additions & 0 deletions Templates/ECG.it
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
Tables:
- TableName: StudyTable
Columns:
- ColumnName: PatientID
- ColumnName: StudyInstanceUID
- ColumnName: StudyDate
AllowNulls: true
- ColumnName: StudyTime
AllowNulls: true
- ColumnName: ModalitiesInStudy
AllowNulls: true
- ColumnName: StudyDescription
AllowNulls: true
- ColumnName: AccessionNumber
AllowNulls: true
- ColumnName: PatientSex
AllowNulls: true
- ColumnName: PatientAge
AllowNulls: true
- ColumnName: NumberOfStudyRelatedInstances
AllowNulls: true
- ColumnName: PatientBirthDate
AllowNulls: true
- ColumnName: SeriesInstanceUID
- ColumnName: Modality
AllowNulls: true
- ColumnName: InstitutionName
AllowNulls: true
- ColumnName: ProtocolName
AllowNulls: true
- ColumnName: ProcedureCodeSequence_CodeValue
Type:
CSharpType: System.String
Size:
IsEmpty: true
Width: 16
AllowNulls: true
- ColumnName: PerformedProcedureStepDescription
AllowNulls: true
- ColumnName: SeriesDescription
AllowNulls: true
- ColumnName: SeriesDate
AllowNulls: true
- ColumnName: SeriesTime
AllowNulls: true
- ColumnName: BodyPartExamined
AllowNulls: true
- ColumnName: DeviceSerialNumber
AllowNulls: true
- ColumnName: SeriesNumber
AllowNulls: true
- ColumnName: SOPInstanceUID
IsPrimaryKey: true
- ColumnName: BurnedInAnnotation
AllowNulls: true
- ColumnName: RelativeFileArchiveURI
AllowNulls: true
- ColumnName: MessageGuid
AllowNulls: true
- ColumnName: ImageType
AllowNulls: true
- ColumnName: ManufacturerModelName
AllowNulls: true
- ColumnName: Manufacturer
AllowNulls: true
- ColumnName: SoftwareVersions
AllowNulls: true
- ColumnName: PhotometricInterpretation
AllowNulls: true
- ColumnName: AcquisitionNumber
AllowNulls: true
- ColumnName: AcquisitionDate
AllowNulls: true
- ColumnName: AcquisitionTime
AllowNulls: true
- ColumnName: PixelSpacing
AllowNulls: true
- ColumnName: AcquisitionDeviceProcessingDescription
AllowNulls: true
- ColumnName: NumberOfWaveformChannels
AllowNulls: true
- ColumnName: NumberOfWaveformSamples
AllowNulls: true
- ColumnName: SamplingFrequency
AllowNulls: true
- ColumnName: WaveformBitsAllocated
AllowNulls: true
- ColumnName: WaveformSequence
AllowNulls: true
52 changes: 52 additions & 0 deletions Templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- [DX](#dx-digital-radiography)
- [XA](#xa-x-ray-angiography)
- [SR](#sr-structured-report)
- [ECG](#ecg-electrocardiogram)
- [OTHER](#other)

## CT (Computerised Tomography)
Expand Down Expand Up @@ -656,6 +657,57 @@ Since structured reports are almost exclusively single file entities only an Ima
| DicomFileSize | |


## ECG (Electrocardiogram)

### ImageTable


| Field | Description |
| ------------- | ------------- |
|PatientID||
|StudyInstanceUID||
|StudyDate||
|StudyTime||
|ModalitiesInStudy||
|StudyDescription||
|AccessionNumber||
|PatientSex||
|PatientAge||
|NumberOfStudyRelatedInstances||
|PatientBirthDate||
|SeriesInstanceUID||
|Modality||
|InstitutionName||
|ProtocolName||
|ProcedureCodeSequence_CodeValue||
|PerformedProcedureStepDescription||
|SeriesDescription||
|SeriesDate||
|SeriesTime||
|BodyPartExamined||
|DeviceSerialNumber||
|SeriesNumber||
|SOPInstanceUID||
|BurnedInAnnotation||
|RelativeFileArchiveURI||
|MessageGuid||
|ImageType||
|ManufacturerModelName||
|Manufacturer||
|SoftwareVersions||
|PhotometricInterpretation||
|AcquisitionNumber||
|AcquisitionDate||
|AcquisitionTime||
|PixelSpacing||
|AcquisitionDeviceProcessingDescription||
|NumberOfWaveformChannels||
|NumberOfWaveformSamples||
|SamplingFrequency||
|WaveformBitsAllocated||
|WaveformSequence||


## OTHER

### ImageTable
Expand Down

0 comments on commit 8f51fdb

Please sign in to comment.