Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump HIC.BadMedicine.Dicom from 0.0.13 to 0.0.14 #133

Merged
merged 4 commits into from
Jul 11, 2022
Merged

Bump HIC.BadMedicine.Dicom from 0.0.13 to 0.0.14 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af51a38
Bump HIC.BadMedicine.Dicom from 0.0.13 to 0.0.14
dependabot[bot] Jul 11, 2022
6d70c8d
Bump CsvHelper from 27.2.1 to 28.0.0
jas88 Jul 11, 2022
959c1ce
Update for new CsvHelper API
jas88 Jul 11, 2022
512687b
Fix typo
jas88 Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Repopulator/CsvToDicomTagMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ public bool BuildMap(DicomRepopulatorOptions options, out string log)

CsvFile = options.CsvFileInfo;

using (var reader = new CsvReader(CsvFile.OpenText(), new(System.Globalization.CultureInfo.CurrentCulture)
var conf = new CsvConfiguration(System.Globalization.CultureInfo.CurrentCulture)
{
TrimOptions = TrimOptions.Trim
}))
TrimOptions=TrimOptions.Trim
};
using (var reader = new CsvReader(CsvFile.OpenText(), conf))
{
reader.Read();
var couldReadHeader = reader.ReadHeader();
Expand Down
7 changes: 4 additions & 3 deletions Repopulator/Matchers/TagMatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ public TagMatcher(CsvToDicomTagMapping map, DicomRepopulatorOptions options):bas
if(_indexer == null)
throw new ArgumentException("No valid indexer could be found, there must be a column in the map for either SOP, Series or Study instance UIDs");

using var reader = new CsvReader(map.CsvFile.OpenText(), new(System.Globalization.CultureInfo.CurrentCulture)
var conf = new CsvConfiguration(System.Globalization.CultureInfo.CurrentCulture)
{
TrimOptions = TrimOptions.Trim
});
TrimOptions=TrimOptions.Trim
};
using var reader = new CsvReader(map.CsvFile.OpenText(), conf);
while (reader.Read())
{
string key = reader[_indexer.Index];
Expand Down
2 changes: 1 addition & 1 deletion Repopulator/Repopulator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Content Include="..\TemplateBuilder\NLog.config" Link="NLog.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="CsvHelper" Version="28.0.0" />
<PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
Expand Down
4 changes: 2 additions & 2 deletions TemplateBuilder/TemplateBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="CsvHelper" Version="28.0.0" />
<PackageReference Include="DockPanelSuite" Version="3.1.0" />
<PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
<PackageReference Include="fo-dicom" Version="5.0.3" />
<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.3" />
<PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.13" />
<PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.14" />
<PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
<PackageReference Include="ObjectListView.Official" Version="2.9.1" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
Expand Down