Mercurial > hg > orthanc-stone

changeset 1291:ea6c2254536d bugs/2020-02-invisible-slice

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removal of debug logs
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 21 Feb 2020 15:23:40 +0100
parents 7def6ab2929f
children f037422f3a66
files Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.cpp Framework/Toolbox/DicomInstanceParameters.cpp Framework/Toolbox/ImageToolbox.h Framework/Volumes/DicomVolumeImageMPRSlicer.cpp
diffstat 4 files changed, 1 insertions(+), 134 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.cpp	Fri Feb 21 15:20:29 2020 +0100
+++ b/Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.cpp	Fri Feb 21 15:23:40 2020 +0100
@@ -26,9 +26,6 @@
 
 #include <Core/OrthancException.h>
 
-
-int OrthancStone_Internals_dump_LoadTexture_histogram = 0;
-
 namespace OrthancStone
 {
   namespace Internals
@@ -82,16 +79,6 @@
             sizeof(float) == 4);
 
           
-          std::map<uint8_t, int> debugHistogram;
-          if (OrthancStone_Internals_dump_LoadTexture_histogram == 1)
-          {
-            for (int i = 0; i <= 255; ++i)
-            {
-              uint8_t k = static_cast<uint8_t>(i);
-              debugHistogram[k] = 0;
-            }
-          }
-
           for (unsigned int y = 0; y < height; y++)
           {
             const float* p = reinterpret_cast<const float*>(source.GetConstRow(y));
@@ -111,10 +98,6 @@
 
               uint8_t vv = static_cast<uint8_t>(v);
 
-              if (OrthancStone_Internals_dump_LoadTexture_histogram == 1)
-                debugHistogram[vv] += 1;
-
-
               q[0] = lut[4 * vv + 0];  // R
               q[1] = lut[4 * vv + 1];  // G
               q[2] = lut[4 * vv + 2];  // B
@@ -125,64 +108,6 @@
             }
           }
 
-          if (OrthancStone_Internals_dump_LoadTexture_histogram == 1)
-          {
-            LOG(INFO) << "+----------------------------------------+";
-            LOG(INFO) << "|        This is not an error!           |";
-            LOG(INFO) << "+----------------------------------------+";
-            LOG(INFO) << "Work on the \"invisible slice\" bug";
-            LOG(INFO) << "--> in OpenGLLookupTableTextureRenderer::LoadTexture():";
-            LOG(INFO) << "layer.GetMinValue() = " << layer.GetMinValue() << " | layer.GetMaxValue() = " << layer.GetMaxValue();
-            LOG(INFO) << "a = " << a << " | slope = " << slope;
-
-            LOG(INFO) << "SOURCE gets scaled and offset, this yields --> TEMP that gets through the lut to yield RESULT";
-            LOG(INFO) << "The SOURCE (layer.GetTexture()) will be dumped below (format is Float32)";
-            LOG(INFO) << "";
-            HistogramData hd;
-            double minValue = 0;
-            double maxValue = 0;
-            ComputeMinMax(source, minValue, maxValue);
-            double binSize = (maxValue - minValue) * 0.01; // split in 100 bins
-            ComputeHistogram(source, hd, binSize);
-            std::string s;
-            DumpHistogramResult(s, hd);
-            LOG(INFO) << s;
-            LOG(INFO) << "";
-
-
-            LOG(INFO) << "TEMP will be dumped below (format is uint8_t)";
-            LOG(INFO) << "";
-
-            {
-              uint8_t vv = 0;
-              do
-              {
-                LOG(INFO) << "    TEMP. Pixel " << (int)vv << " is present "
-                  << debugHistogram[vv] << " times";
-              } while (vv++ != 255);
-            }
-
-            LOG(INFO) << "\nThe LUT will be dumped below";
-            LOG(INFO) << "----------------------------";
-            LOG(INFO) << "bgotag-2020-02-18-20-26";
-            LOG(INFO) << "";
-
-            {
-              uint8_t vv = 0;
-              // proper way to loop on all unsigned values is a do while loop
-              do
-              {
-                LOG(INFO) << "    LUT[" << (int)vv << "] ="
-                  << " R:" << (int)lut[4 * vv + 0]
-                  << " G:" << (int)lut[4 * vv + 1]
-                  << " B:" << (int)lut[4 * vv + 2]
-                  << " A:" << (int)lut[4 * vv + 3];
-              } while (vv++ != 255);
-            }
-            LOG(INFO) << "+----------------------------------------+";
-            LOG(INFO) << "|        end of debug dump               |";
-            LOG(INFO) << "+----------------------------------------+";
-          }
         }
 
         context_.MakeCurrent();
--- a/Framework/Toolbox/DicomInstanceParameters.cpp	Fri Feb 21 15:20:29 2020 +0100
+++ b/Framework/Toolbox/DicomInstanceParameters.cpp	Fri Feb 21 15:23:40 2020 +0100
@@ -281,16 +281,6 @@
       offset = rescaleIntercept_;
     }
 
-    if (OrthancStone_Internals_dump_LoadTexture_histogram == 1)
-    {
-      LOG(INFO) << "in DicomInstanceParameters::Data::ApplyRescaleAndDoseScaling:";
-      LOG(INFO) << "    doseGridScaling_ = " << doseGridScaling_ 
-        << " hasRescale_ = " << hasRescale_ 
-        << " rescaleSlope_ = " << rescaleSlope_ 
-        << " rescaleIntercept_ = " << rescaleIntercept_;
-      LOG(INFO) << "    --> factor = " << factor << " offset = " << offset;
-    }
-
     if ( (factor != 1.0) || (offset != 0.0) )
     {
       const unsigned int width = image.GetWidth();
@@ -385,57 +375,11 @@
                                                                false));
     Orthanc::ImageProcessing::Convert(*converted, pixelData);
 
-    if (OrthancStone_Internals_dump_LoadTexture_histogram == 1)
-    {
-      LOG(INFO) << "+----------------------------------------+";
-      LOG(INFO) << "|        This is not an error!           |";
-      LOG(INFO) << "+----------------------------------------+";
-      LOG(INFO) << "Work on the \"invisible slice\" bug";
-      LOG(INFO) << "in: DicomInstanceParameters::ConvertToFloat()";
-      LOG(INFO) << "dumping texture hist after conversion from native sliceReader to Float32";
-      LOG(INFO) << "(source buffer address before conversion is: " << pixelData.GetConstBuffer() << ")";
-      LOG(INFO) << " target buffer address after conversion is: " << converted->GetConstBuffer();
-
-      LOG(INFO) << "Target histo:";
-      LOG(INFO) << "-------------";
-      {
-        HistogramData hd;
-        double minValue = 0;
-        double maxValue = 0;
-        ComputeMinMax(*converted, minValue, maxValue);
-        double binSize = (maxValue - minValue) * 0.01;
-        ComputeHistogram(*converted, hd, binSize);
-        std::string s;
-        DumpHistogramResult(s, hd);
-        LOG(INFO) << s;
-      }
-    }
                                                    
     // Correct rescale slope/intercept if need be
     //data_.ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32));
     data_.ApplyRescaleAndDoseScaling(*converted, false);
 
-    if (OrthancStone_Internals_dump_LoadTexture_histogram == 1)
-    {
-
-      LOG(INFO) << "Target histo after data_.ApplyRescaleAndDoseScaling";
-      LOG(INFO) << "---------------------------------------------------";
-      {
-        HistogramData hd;
-        double minValue = 0;
-        double maxValue = 0;
-        ComputeMinMax(*converted, minValue, maxValue);
-        double binSize = (maxValue - minValue) * 0.01;
-        ComputeHistogram(*converted, hd, binSize);
-        std::string s;
-        DumpHistogramResult(s, hd);
-        LOG(INFO) << s;
-      }
-      LOG(INFO) << "+----------------------------------------+";
-      LOG(INFO) << "|        end of debug dump               |";
-      LOG(INFO) << "+----------------------------------------+";
-    }
-
     return converted.release();
   }
 
--- a/Framework/Toolbox/ImageToolbox.h	Fri Feb 21 15:20:29 2020 +0100
+++ b/Framework/Toolbox/ImageToolbox.h	Fri Feb 21 15:23:40 2020 +0100
@@ -74,5 +74,3 @@
                      double& minValue, double& maxValue);
 
 }
-
-extern int OrthancStone_Internals_dump_LoadTexture_histogram;
--- a/Framework/Volumes/DicomVolumeImageMPRSlicer.cpp	Fri Feb 21 15:20:29 2020 +0100
+++ b/Framework/Volumes/DicomVolumeImageMPRSlicer.cpp	Fri Feb 21 15:23:40 2020 +0100
@@ -165,7 +165,7 @@
     {
       texture->SetAngle(atan2(dy, dx));
     }
-        
+
     Vector tmp = volume_.GetGeometry().GetVoxelDimensions(projection_);
     texture->SetPixelSpacing(tmp[0], tmp[1]);