fix bugs

diff --git a/lib/src1/bruker2dicom2.cxx b/lib/src1/bruker2dicom2.cxx
index a05d413ab282bdc2dbf49097458140ecb4d32e12..df045995c45c964e31018ee99821f94f4f08e2c1 100644 (file)
--- a/lib/src1/bruker2dicom2.cxx
+++ b/lib/src1/bruker2dicom2.cxx
@@ -1452,7 +1452,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels,
         }
         //Slice Thickness 
         {
-            gdcm::Attribute<0x0018,0x00500, gdcm::VR::DS> at;
+            gdcm::Attribute<0x0018,0x0050, gdcm::VR::DS> at;
             
             at.SetValue(sliceDistance);
             ds.Replace(at.GetAsDataElement());
@@ -1465,7 +1465,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels,
         }
          //Instance Number
         {
-            gdcm::Attribute<0x0020,0x00131,gdcm::VR::IS> at;
+            gdcm::Attribute<0x0020,0x0013,gdcm::VR::IS> at;
             at.SetValue(++instanceNumber);
             ds.Replace(at.GetAsDataElement());
             
@@ -1687,16 +1687,16 @@ std::cout << "charImageOrientation  " <<
 > 138 1600
 >
    */
-    {
-             gdcm::Attribute<  0x0029,0x0010, gdcm::VR::LO> at;
-              at.SetValue(  "CREATIS HEADER");
-              ds.Replace(at.GetAsDataElement());
-    }
-    {
-                gdcm::Attribute<  0x0029,0x0011, gdcm::VR::LO> at;
-              at.SetValue( "CREATIS FOR BRUKER-TO-DICOM");
-              ds.Replace(at.GetAsDataElement());
-    }
+    //{
+    //         gdcm::Attribute<  0x0029,0x0010, gdcm::VR::LO> at;
+    //         at.SetValue(.SetValue(  "CREATIS HEADER");
+    //          ds.Replace(at.GetAsDataElement());
+    //}
+    //{
+    //            gdcm::Attribute<  0x0029,0x0011, gdcm::VR::LO> at;
+    //      //    at.SetValue( "CREATIS FOR BRUKER-TO-DICOM");
+    //          ds.Replace(at.GetAsDataElement());
+    //}
 
   // file->InsertEntryString("CREATIS HEADER", 0x0029,0x0010, "LO");
    //file->InsertEntryString("CREATIS FOR BRUKER-TO-DICOM", 0x0029,0x0011, "LO");
@@ -1784,8 +1784,9 @@ std::cout << "charImageOrientation  " <<
 */
      // dcmImageName = "c:\\toto.dcm";
      boost::algorithm::replace_all( dcmImageName,       INVALID_FILE_SEPARATOR ,    VALID_FILE_SEPARATOR);
-   FILE *fil=fopen("c:\\toto", "a");
-    fclose(fil);
+
+   //FILE *fil=fopen(dcmImageName.c_str(), "a");
+   // fclose(fil);
 
    gdcm::ImageWriter writer;
    writer.SetFileName(dcmImageName.c_str());

diff --git a/lib/src1/brukerdataset.cpp b/lib/src1/brukerdataset.cpp
index affe61c6eb68f0a7e9bf6912921b50fc5a878897..853199d6e7a9b904500425c0945524859a81d26d 100644 (file)
--- a/lib/src1/brukerdataset.cpp
+++ b/lib/src1/brukerdataset.cpp
@@ -326,7 +326,7 @@ bool BrukerDataSet::FillMap()
     data.DataType=GetContentType(Substring);
     if (DEBUG) std::cout<<"data.DataType="<< data.DataType <<std::endl;
     data.NumberOfElements=GetKeywordNumberOfElements(Substring);
-    if(data.DataType=="string") 
+ if(data.DataType=="string") 
       data.DimensionNumber=0;
     if(data.DataType=="string") 
       data.NumberOfElements=1;