[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. aa6989a0ad38cc33435fd1a757b6b5db03
Cross-platform DICOM implementation
Brought to you by:
malat
Menu
▾
▴
[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. aa6989a0ad38cc33435fd1a757b6b5db0399e6fe
|
From: Mathieu M. <ma...@us...> - 2019-04-10 15:23:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, release has been updated
via aa6989a0ad38cc33435fd1a757b6b5db0399e6fe (commit)
via 4c2324b3d2a180043ba7d2047509c9a48f027ac4 (commit)
via fd1d96a1e6181be2977ad5fc0ca40556a357d02a (commit)
from f4067e7debe5573801d0cc142232fd4703576f98 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/aa6989a0ad38cc33435fd1a757b6b5db0399e6fe/
commit aa6989a0ad38cc33435fd1a757b6b5db0399e6fe
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Apr 10 17:21:44 2019 +0200
Update Example
diff --git a/Examples/Cxx/DumpToshibaDTI.cxx b/Examples/Cxx/DumpToshibaDTI.cxx
index 51b6ad962..f35eb50c3 100644
--- a/Examples/Cxx/DumpToshibaDTI.cxx
+++ b/Examples/Cxx/DumpToshibaDTI.cxx
@@ -25,28 +25,39 @@
#include <assert.h>
-bool DumpToshibaDTI( const char * input, size_t len )
+static bool DumpToshibaDTI( const char * input, size_t len )
{
+ static int i = 0;
+ ++i;
if( len % 2 ) return false;
std::vector<char> copy( input, input + len );
std::reverse( copy.begin(), copy.end() );
+#if 0
+ std::ostringstream f;
+ f << "debug" << i;
+ std::ofstream of( f.str().c_str(), std::ios::binary );
+ of.write( ©[0], copy.size() );
+ of.close();
+#else
+
std::istringstream is;
std::string dup( ©[0], copy.size() );
is.str( dup );
- gdcm::Reader reader;
- reader.SetStream( is );
- if( !reader.Read() )
- return false;
+ gdcm::File file;
+ gdcm::FileMetaInformation & fmi = file.GetHeader();
+ fmi.SetDataSetTransferSyntax( gdcm::TransferSyntax::ExplicitVRLittleEndian );
+ gdcm::DataSet & ds = file.GetDataSet();
+ ds.Read<gdcm::ExplicitDataElement,gdcm::SwapperNoOp>( is );
- //std::cout << reader.GetFile().GetDataSet() << std::endl;
//gdcm::DictPrinter p;
gdcm::Printer p;
- p.SetFile( reader.GetFile() );
+ p.SetFile( file );
p.SetColor( true );
p.Print( std::cout );
+#endif
return true;
}
https://sourceforge.net/p/gdcm/gdcm/ci/4c2324b3d2a180043ba7d2047509c9a48f027ac4/
commit 4c2324b3d2a180043ba7d2047509c9a48f027ac4
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Apr 10 17:20:30 2019 +0200
Update Toshiba private attribute
diff --git a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
index c77fcadca..752a1d71c 100644
--- a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
+++ b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
@@ -226,6 +226,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x0019,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x0019,"PMTF INFORMATION DATA^11",VR::SQ,VM::VM1,"?",false },
{0x0019,0x001a,"PMTF INFORMATION DATA^10",VR::US,VM::VM1,"?",false },
+ {0x0019,0x001a,"PMTF INFORMATION DATA^11",VR::FL,VM::VM1,"?",false },
{0x0019,0x001b,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x001c,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x001d,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
@@ -239,9 +240,9 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x0028,"PMTF INFORMATION DATA^12",VR::DS,VM::VM1,"?",false },
{0x0019,0x0029,"PMTF INFORMATION DATA^10",VR::SH,VM::VM1,"?",false },
{0x0019,0x0029,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
- {0x0019,0x002a,"PMTF INFORMATION DATA^10",VR::DS,VM::VM3,"?",false }, /* may re-use ^12 in actual dataset, hard to handle */
+ {0x0019,0x002a,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false }, /* may re-use ^12 in actual dataset, hard to handle */
{0x0019,0x002a,"PMTF INFORMATION DATA^11",VR::FL,VM::VM1,"?",false },
- {0x0019,0x002a,"PMTF INFORMATION DATA^12",VR::TM,VM::VM1,"?",false },
+ {0x0019,0x002a,"PMTF INFORMATION DATA^12",VR::DS /* TM*/,VM::VM3 /* 1 */,"?",false },
{0x0019,0x002b,"PMTF INFORMATION DATA^10",VR::SH,VM::VM1,"?",false },
{0x0019,0x002b,"PMTF INFORMATION DATA^11",VR::FL,VM::VM1,"?",false },
{0x0019,0x002b,"PMTF INFORMATION DATA^12",VR::SQ,VM::VM1,"?",false },
@@ -277,6 +278,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x003c,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x003c,"PMTF INFORMATION DATA^11",VR::FL,VM::VM3,"?",false },
{0x0019,0x003d,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
+ {0x0019,0x003d,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
{0x0019,0x003e,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x003e,"PMTF INFORMATION DATA^11",VR::FL,VM::VM9,"?",false },
{0x0019,0x003f,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
@@ -311,6 +313,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x0054,"PMTF INFORMATION DATA^10",VR::US,VM::VM1,"?",false },
{0x0019,0x0055,"PMTF INFORMATION DATA^10",VR::US,VM::VM1,"?",false },
{0x0019,0x0055,"PMTF INFORMATION DATA^11",VR::LO,VM::VM1,"?",false },
+ {0x0019,0x0056,"PMTF INFORMATION DATA^10",VR::FL,VM::VM3,"?",false },
{0x0019,0x0057,"PMTF INFORMATION DATA^10",VR::FL,VM::VM3,"?",false },
{0x0019,0x0057,"PMTF INFORMATION DATA^11",VR::FL,VM::VM1,"?",false },
{0x0019,0x0058,"PMTF INFORMATION DATA^10",VR::FL,VM::VM3,"?",false },
@@ -331,6 +334,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x0063,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
{0x0019,0x0064,"PMTF INFORMATION DATA^10",VR::FL,VM::VM1,"?",false },
{0x0019,0x0065,"PMTF INFORMATION DATA^10",VR::SL,VM::VM2,"?",false },
+ {0x0019,0x0065,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
{0x0019,0x0067,"PMTF INFORMATION DATA^11",VR::FL,VM::VM1,"?",false },
{0x0019,0x0068,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
{0x0019,0x0069,"PMTF INFORMATION DATA^10",VR::FL,VM::VM1,"?",false },
@@ -412,6 +416,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x00a0,"PMTF INFORMATION DATA^10",VR::SL,VM::VM4,"?",false },
{0x0019,0x00a0,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
{0x0019,0x00a1,"PMTF INFORMATION DATA^10",VR::DS,VM::VM1,"?",false },
+ {0x0019,0x00a1,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
{0x0019,0x00a1,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
{0x0019,0x00a2,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00a2,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
@@ -424,7 +429,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x00a5,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
{0x0019,0x00a6,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00a6,"PMTF INFORMATION DATA^11",VR::US,VM::VM1,"?",false },
- {0x0019,0x00a6,"PMTF INFORMATION DATA^12",VR::FL,VM::VM8,"?",false },
+ {0x0019,0x00a6,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1_n,"?",false },
{0x0019,0x00a7,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
{0x0019,0x00a8,"PMTF INFORMATION DATA^10",VR::FL,VM::VM1,"?",false },
{0x0019,0x00a8,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
@@ -451,6 +456,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x00b4,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00b4,"PMTF INFORMATION DATA^11",VR::US,VM::VM1,"?",false },
{0x0019,0x00b4,"PMTF INFORMATION DATA^12",VR::LO,VM::VM1,"?",false },
+ {0x0019,0x00b5,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00b5,"PMTF INFORMATION DATA^11",VR::FL,VM::VM1,"?",false },
{0x0019,0x00b6,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00b6,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1,"?",false },
@@ -483,6 +489,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x00cd,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00cd,"PMTF INFORMATION DATA^12",VR::LO,VM::VM1,"?",false },
{0x0019,0x00ce,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
+ {0x0019,0x00cf,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00cf,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
{0x0019,0x00d0,"PMTF INFORMATION DATA^10",VR::US,VM::VM1,"?",false },
{0x0019,0x00d1,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
@@ -496,8 +503,8 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x00d5,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1,"?",false },
{0x0019,0x00d6,"PMTF INFORMATION DATA^12",VR::FL,VM::VM3,"?",false },
{0x0019,0x00d7,"PMTF INFORMATION DATA^12",VR::US,VM::VM2,"?vect2?",false },
- {0x0019,0x00d8,"PMTF INFORMATION DATA^10",VR::US,VM::VM1,"?",false },
- {0x0019,0x00d8,"PMTF INFORMATION DATA^12",VR::FL,VM::VM5,"?",false },
+ {0x0019,0x00d8,"PMTF INFORMATION DATA^10",VR::US,VM::VM1_n,"?",false },
+ {0x0019,0x00d8,"PMTF INFORMATION DATA^12",VR::FL,VM::VM1_n,"?",false },
{0x0019,0x00d9,"PMTF INFORMATION DATA^10",VR::SQ,VM::VM1,"?",false },
{0x0019,0x00da,"PMTF INFORMATION DATA^10",VR::US,VM::VM1,"?",false },
{0x0019,0x00db,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
@@ -527,6 +534,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0019,0x00ec,"PMTF INFORMATION DATA^12",VR::US,VM::VM1,"?num?",false },
{0x0019,0x00ee,"PMTF INFORMATION DATA^10",VR::FL,VM::VM1,"?",false },
{0x0019,0x00ef,"PMTF INFORMATION DATA^10",VR::FL,VM::VM1,"?",false },
+ {0x0019,0x00ef,"PMTF INFORMATION DATA^12",VR::DS,VM::VM1,"?",false },
{0x0019,0x00f0,"PMTF INFORMATION DATA^10",VR::SL,VM::VM1,"?",false },
{0x0019,0x00f0,"PMTF INFORMATION DATA^11",VR::SL,VM::VM1_n,"?",false },
{0x0019,0x00f1,"PMTF INFORMATION DATA^10",VR::FL,VM::VM1,"?",false },
https://sourceforge.net/p/gdcm/gdcm/ci/fd1d96a1e6181be2977ad5fc0ca40556a357d02a/
commit fd1d96a1e6181be2977ad5fc0ca40556a357d02a
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Apr 10 16:49:06 2019 +0200
Possibly MTR flag
diff --git a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
index d3c7c6c44..c77fcadca 100644
--- a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
+++ b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
@@ -4630,7 +4630,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0029,0x0011,"MMCPrivate",VR::LO,VM::VM1,"?",false },
{0x0029,0x0012,"MMCPrivate",VR::LO,VM::VM1,"?",false },
{0x0029,0x0013,"MMCPrivate",VR::LO,VM::VM1,"?",false },
- {0x0029,0x0014,"MMCPrivate",VR::LO,VM::VM1,"?",false },
+ {0x0029,0x0014,"MMCPrivate",VR::LO,VM::VM1,"?MTR True/False?",false },
{0x0029,0x0015,"MMCPrivate",VR::LO,VM::VM1,"?",false },
{0x0029,0x0016,"MMCPrivate",VR::LO,VM::VM1,"?",false },
{0x0029,0x0017,"MMCPrivate",VR::LO,VM::VM1,"?",false },
-----------------------------------------------------------------------
Summary of changes:
Examples/Cxx/DumpToshibaDTI.cxx | 25 ++++++++++++++++-------
Source/DataDictionary/gdcmPrivateDefaultDicts.cxx | 20 ++++++++++++------
2 files changed, 32 insertions(+), 13 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|
