Changeset 12297 for trunk/FACT++/gui/RawEventsViewer

Timestamp:

10/27/11 14:42:09 (13 years ago)

Author:

lyard

Message:

added RMS tab

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (6 diffs)
• RawEventsViewer.h (modified) (1 diff)
• viewer.ui (modified) (5 diffs)

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

@@ -352 +352 @@
  * CONSTRUCTOR.
  ************************************************************/
-RawDataViewer::RawDataViewer(QWidget *cParent) : BasicGlCamera(cParent)
+RawDataViewer::RawDataViewer(QWidget *cParent) : BasicGlCamera(cParent), RMSvalues(1440)
 {
  //   setFormat(QGLFormat(QGL::DoubleBuffer));// | QGL::DepthBuffer));
@@ -608 +608 @@
     }
     eventData = new float[(1440+160)*nRoi];
+
     rawEventData = new int16_t[(1440+160)*nRoi];
     waveLetArray = new int16_t[1024*1440];
@@ -1037 +1038 @@
         DataCalib::Apply(eventData, rawEventData, startPix, nRoi);
         CalibData::RemoveSpikes(eventData, nRoi);
+
+        vector<float> pixelStatsData(1440*4);
+        CalibData::GetPixelStats(pixelStatsData.data(), eventData, nRoi);
+
+
+        for (vector<PixelMapEntry>::const_iterator it=fPixelMap.begin(); it!=fPixelMap.end(); it++)
+        {
+            RMSvalues[it->index] = pixelStatsData[1*1440+it->hw()];
+        }
+
         /*
 
@@ -1050 +1061 @@
     }
     */
-        updateGL();
+        if (isVisible())
+            updateGL();
     emit signalCurrentEvent(eventNum);
     emit signalCurrentPixel(selectedPixel);
@@ -1189 +1201 @@
     entireCameraScale->setChecked(true);
 
+    GLWindow_2->enableText(false);
+
     QObject::connect(GLWindow, SIGNAL(colorPaletteHasChanged()),
                      this, SLOT(on_autoScaleColor_clicked()));
@@ -1471 +1485 @@
 void UIConnector::currentEventHasChanged(int )
 {
+
+    GLWindow_2->SetData(GLWindow->RMSvalues);
+    if (GLWindow_2->isVisible())
+        GLWindow_2->updateGL();
     ostringstream str;
 //    str << "Displaying Event " << cEvent;

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

@@ -96 +96 @@
     int selectedPixel;
     float *eventData;
+    float *rmsData;
     int16_t* rawEventData;
     int16_t* waveLetArray;
+    valarray<double> RMSvalues;//(1440);
 
 private:

trunk/FACT++/gui/RawEventsViewer/viewer.ui

@@ -16 +16 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="1">
+    <item row="0" column="0">
      <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="10,0">
       <item>
@@ -201 +201 @@
            </layout>
           </widget>
+          <widget class="QWidget" name="tab_2">
+           <attribute name="title">
+            <string>RMS</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_6">
+            <item row="0" column="0">
+             <widget class="QCameraWidget" name="GLWindow_2" native="true">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>10000</width>
+                <height>10000</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
          </widget>
         </item>
@@ -213 +239 @@
          <widget class="QLabel" name="label">
           <property name="text">
-           <string>FACT - Raw events viewer - v0.3</string>
+           <string>FACT - Raw events viewer - v0.4</string>
           </property>
          </widget>
@@ -475 +501 @@
      </layout>
     </item>
-    <item row="1" column="1">
+    <item row="1" column="0">
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="7">
@@ -1012 +1038 @@
    <extends>QGLWidget</extends>
    <header>RawEventsViewer.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QCameraWidget</class>
+   <extends>QWidget</extends>
+   <header>../QCameraWidget.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>