overhaul of raw data handling, now have local image for processing; f…

…ixed colorbars; started fixing sat handling; removed debug trace
jaredmales · Nov 11, 2023 · d13706c · d13706c
1 parent 38c8e12
commit d13706c
Show file tree

Hide file tree

Showing 6 changed files with 293 additions and 636 deletions.
diff --git a/src/images/mzmqImage.cpp b/src/images/mzmqImage.cpp
@@ -314,11 +314,8 @@ void mzmqImage::imageThreadExec()
 
          if( nx != new_nx || ny != new_ny || atype != new_atype || !m_imageAttached)
          {
-            DEBUG_TRACE_CRUMB
             std::lock_guard<std::mutex> guard(*m_accessMutex);
 
-            DEBUG_TRACE_CRUMB
-
             if(m_data) //This can't be a call to detach due to mutex
             {
                m_imageAttached = false;
@@ -375,8 +372,6 @@ void mzmqImage::imageThreadExec()
             xe = xrif_allocate(xrif);
 
             m_imageAttached = true;
-
-            DEBUG_TRACE_CRUMB
          }
 
          atype = new_atype;
@@ -511,32 +506,22 @@ int mzmqImage::update()
 
 void mzmqImage::detach()
 {  
-    DEBUG_TRACE_ANCHOR(mzmqImage::detach begin)
-
     std::lock_guard<std::mutex> guard(*m_accessMutex);
 
-    DEBUG_TRACE_CRUMB
-
     m_imageAttached = false;
     if(m_data) delete m_data;
     m_data = nullptr; 
 
     m_lastCnt0 = -1;
-
-    DEBUG_TRACE_ANCHOR(mzmqImage::detach end)
 }
 
 bool mzmqImage::valid()
 {
-    DEBUG_TRACE_ANCHOR(mzmqImage::valid begin)
-
     if(m_data && m_imageAttached) 
     {
-        DEBUG_TRACE_ANCHOR(mzmqImage::valid true)
         return true;
     }
 
-    DEBUG_TRACE_ANCHOR(mzmqImage::valid false)
     return false;
 
 }