|
|
2b1fba5 |
Index: aeskulap-0.2.2b1/imagepool/netloader.cpp
|
|
|
2b1fba5 |
===================================================================
|
|
|
2b1fba5 |
--- aeskulap-0.2.2b1.orig/imagepool/netloader.cpp 2011-02-14 11:48:44.000000000 +0100
|
|
|
2b1fba5 |
+++ aeskulap-0.2.2b1/imagepool/netloader.cpp 2011-02-14 11:48:47.000000000 +0100
|
|
|
2b1fba5 |
@@ -112,7 +112,7 @@
|
|
|
2b1fba5 |
e->putString("STUDY");
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
- e = newDicomElement(DCM_PatientsName);
|
|
|
2b1fba5 |
+ e = newDicomElement(DCM_PatientName);
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
e = newDicomElement(DCM_PatientID);
|
|
|
2b1fba5 |
Index: aeskulap-0.2.2b1/imagepool/netquery.cpp
|
|
|
2b1fba5 |
===================================================================
|
|
|
2b1fba5 |
--- aeskulap-0.2.2b1.orig/imagepool/netquery.cpp 2011-02-14 11:48:44.000000000 +0100
|
|
|
2b1fba5 |
+++ aeskulap-0.2.2b1/imagepool/netquery.cpp 2011-02-14 11:48:47.000000000 +0100
|
|
|
2b1fba5 |
@@ -210,7 +210,7 @@
|
|
|
2b1fba5 |
e->putString(dicom_enc.c_str());
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
- e = newDicomElement(DCM_PatientsName);
|
|
|
2b1fba5 |
+ e = newDicomElement(DCM_PatientName);
|
|
|
2b1fba5 |
e->putString(patientsname.c_str());
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
@@ -225,10 +225,10 @@
|
|
|
2b1fba5 |
e->putString(modality.c_str());
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
- e = newDicomElement(DCM_PatientsBirthDate);
|
|
|
2b1fba5 |
+ e = newDicomElement(DCM_PatientBirthDate);
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
- e = newDicomElement(DCM_PatientsSex);
|
|
|
2b1fba5 |
+ e = newDicomElement(DCM_PatientSex);
|
|
|
2b1fba5 |
query.insert(e);
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
e = newDicomElement(DCM_StudyDate);
|
|
|
2b1fba5 |
Index: aeskulap-0.2.2b1/imagepool/poolinstance.cpp
|
|
|
2b1fba5 |
===================================================================
|
|
|
2b1fba5 |
--- aeskulap-0.2.2b1.orig/imagepool/poolinstance.cpp 2011-02-14 12:10:41.000000000 +0100
|
|
|
2b1fba5 |
+++ aeskulap-0.2.2b1/imagepool/poolinstance.cpp 2011-02-14 12:11:04.000000000 +0100
|
|
|
2b1fba5 |
@@ -515,7 +515,7 @@
|
|
|
2b1fba5 |
}
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
// set ManufacturersModelName
|
|
|
2b1fba5 |
- if(dset->findAndGetOFString(DCM_ManufacturersModelName, ofstr).good()) {
|
|
|
2b1fba5 |
+ if(dset->findAndGetOFString(DCM_ManufacturerModelName, ofstr).good()) {
|
|
|
2b1fba5 |
r->m_model = ofstr.c_str();
|
|
|
2b1fba5 |
}
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
@@ -565,12 +565,12 @@
|
|
|
2b1fba5 |
//std::cout << "intercept: " << r->m_intercept << std::endl;
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
// study params
|
|
|
2b1fba5 |
- if(dset->findAndGetOFString(DCM_PatientsName, ofstr).good()) {
|
|
|
2b1fba5 |
+ if(dset->findAndGetOFString(DCM_PatientName, ofstr).good()) {
|
|
|
2b1fba5 |
r->m_patientsname = r->convert_string(ofstr.c_str());
|
|
|
2b1fba5 |
}
|
|
|
2b1fba5 |
- dset->findAndGetOFString(DCM_PatientsBirthDate, ofstr);
|
|
|
2b1fba5 |
+ dset->findAndGetOFString(DCM_PatientBirthDate, ofstr);
|
|
|
2b1fba5 |
r->m_patientsbirthdate = ofstr.c_str();
|
|
|
2b1fba5 |
- dset->findAndGetOFString(DCM_PatientsSex, ofstr);
|
|
|
2b1fba5 |
+ dset->findAndGetOFString(DCM_PatientSex, ofstr);
|
|
|
2b1fba5 |
r->m_patientssex = ofstr.c_str();
|
|
|
2b1fba5 |
if(dset->findAndGetOFString(DCM_StudyDescription, ofstr).good()) {
|
|
|
2b1fba5 |
r->m_studydescription = r->convert_string(ofstr.c_str());
|