Changeset 19376 for trunk/FACT++

Timestamp:

11/11/18 14:44:12 (6 years ago)

Author:

tbretz

Message:

Commented some obsolete code. Do not reset the palette if it is set to 'manual' when changing events.

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (7 diffs)
• RawEventsViewer.h (modified) (3 diffs)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -416 +416 @@
             patchesColor[i][j] = color[j];
     }
-    fZeroArray = NULL;
+    //fZeroArray = NULL;
 
     _softwareOrdering = false;
@@ -430 +430 @@
         delete inputFile;
     }
-    if (fZeroArray != NULL)
-        delete[] fZeroArray;
-}
+    //if (fZeroArray != NULL)
+    //    delete[] fZeroArray;
+}
+/*
 void RawDataViewer::allocateZeroArray()
 {
@@ -440 +441 @@
     }
 }
+*/
 /************************************************************
  * PAINT GL. main drawing function.
@@ -949 +951 @@
      emit signalCurrentPixel(pix);
 }
+/*
 void RawDataViewer::computePulsesStatistics()
 {
@@ -1019 +1022 @@
  //   }
 }
+*/
 /************************************************************
  * UICONNECTOR CONSTRUCTOR
@@ -1113 +1117 @@
     threeD_Window->setData(GLWindow->eventData.data());
 
-    on_autoScaleColor_clicked();
+    if (autoScaleColor->isChecked())
+        on_autoScaleColor_clicked();
     pixelChanged(GLWindow->selectedPixel);
 
@@ -2042 +2047 @@
 
     displaySliceValue();
-    on_autoScaleColor_clicked();
+    if (autoScaleColor->isChecked())
+        on_autoScaleColor_clicked();
 }
 

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h

@@ -101 +101 @@
 
     ///Used to load zero data in case of missing fits columns
-    void allocateZeroArray();
-    char* fZeroArray;
+    //void allocateZeroArray();
+    //char* fZeroArray;
     //bool telling whether the data is natively ordered in software or hardware id
     //used to correctly display monte-carlo data.
@@ -175 +175 @@
 //    float triggerOffsetMean[1440*1024];
 //    bool calibrationLoaded;
-    bool drawCalibrationLoaded;
+//    bool drawCalibrationLoaded;
 
     QPoint lastPos;
 public:
+    /*
     void computePulsesStatistics();
     double aMeas[1024];
@@ -184 +185 @@
     double n2mean[1024];
     double vCorr[1024];
+    */
     int64_t VALUES_SPAN;