Changeset 12188 for trunk/FACT++

Timestamp:

10/17/11 19:47:14 (13 years ago)

Author:

tbretz

Message:

Fixed several mappings.

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (11 diffs)
• RawEventsViewer.h (modified) (2 diffs)

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

@@ -167 +167 @@
         color = float(eventsData[eventNum][i][whichSlice]+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
 #else
-        color = float(eventData[nRoi*i + whichSlice]+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
+        color = float(eventData[nRoi*hardwareMapping[i] + whichSlice]+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
         if (logScale)
         {
@@ -271 +271 @@
     float plusMe = VALUES_SPAN/2;
 
-    cout << "---> value span..." << endl;
-
     /*
     if (drawCalibrationLoaded)
@@ -281 +279 @@
         plusMe = 0 ;///=2;
         }*/
+
+    const int hw = hardwareMapping[selectedPixel];
 
     for (int i=0;i<nRoi-1;i++)
@@ -291 +291 @@
 #else
 
-        float d1 = eventData[nRoi*selectedPixel + i]+plusMe;
-        float d2 = eventData[nRoi*selectedPixel + i+1]+plusMe;
+
+        float d1 = eventData[nRoi*hw + i]+plusMe;
+        float d2 = eventData[nRoi*hw + i+1]+plusMe;
         if (!finite(d1)) d1 = 20000;
         if (!finite(d2)) d2 = 20000;
@@ -1103 +1104 @@
             for (int i=0;i<nRoi;i++)
             {
-                aMeas[i] = eventData[j*1024+i];// * adcCount;
+                aMeas[i] = eventData[j*nRoi+i];// * adcCount;
 
             }
@@ -1398 +1399 @@
         timer.start();
 }
-/************************************************************
- * CURRENT SLICE HAS CHANGE. ui handler
- ************************************************************/
-void UIConnector::currentSliceHasChanged(int slice)
+
+void UIConnector::displaySliceValue()
 {
     if (!GLWindow->nRoi)
         return;
-//    str << "Displaying Slice " << slice;
-//    QString qstr(str.str().c_str());
+
+    const int idx =
+        GLWindow->nRoi*GLWindow->hardwareMapping[GLWindow->selectedPixel]
+        + GLWindow->whichSlice;
+
+    ostringstream str;
+    str << "Current Pixel val.: " << GLWindow->eventData[idx];
+    currentPixelValue->setText(QString(str.str().c_str()));
+}
+
+/************************************************************
+ * CURRENT SLICE HAS CHANGE. ui handler
+ ************************************************************/
+void UIConnector::currentSliceHasChanged(int slice)
+{
+    if (!GLWindow->nRoi)
+        return;
+
     if (updateSpinnerDisplay)
         displayingSliceBox->setValue(slice);
 
-    ostringstream str;
-    str << "Current Pixel val.: " << GLWindow->eventData[GLWindow->nRoi*GLWindow->selectedPixel + GLWindow->whichSlice];
-    currentPixelValue->setText(QString(str.str().c_str()));
-
-}
-/************************************************************
+    displaySliceValue();
+}
+
+/*****
+ *******************************************************
  * CURRENT EVENT HAS CHANGED. ui handler
  ************************************************************/
+
 double xval[50000];
 double yval[50000];
@@ -1472 +1487 @@
     triggerTypeLabel->setText(QString(str.str().c_str()));
 
-    str.str("");
-    str << "Current Pixel val.: " << GLWindow->eventData[GLWindow->nRoi*GLWindow->selectedPixel + GLWindow->whichSlice];
-    currentPixelValue->setText(QString(str.str().c_str()));
+    displaySliceValue();
 
     if (autoScaleColor->isChecked())
@@ -1807 +1820 @@
     triggerDelayHistoZoom->setZoomStack(stack);
     stack.pop();
+
     pixelChanged(GLWindow->selectedPixel);
 }
@@ -1933 +1947 @@
 
 }
+
 void UIConnector::pixelChanged(int pixel)
 {
     pixel = GLWindow->hardwareMapping[pixel];
+
     HwIDBox->setValue(pixel);
 
@@ -1970 +1986 @@
     stack.pop();
 
-    ostringstream str;
-    QString qstr;
-    str << "Current Pixel val.: " << GLWindow->eventData[GLWindow->nRoi*GLWindow->selectedPixel + GLWindow->whichSlice];
-    currentPixelValue->setText(qstr.fromStdString(str.str()));
+    displaySliceValue();
     on_autoScaleColor_clicked();
 }
@@ -1997 +2010 @@
     updating = false;
 
-    pixelChanged(GLWindow->softwareMapping[hwID]);
-
     GLWindow->selectedPixel = GLWindow->softwareMapping[hwID];
     GLWindow->updateGL();
+
+    pixelChanged(GLWindow->selectedPixel);
 }
 

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

@@ -248 +248 @@
     void on_blueValue4_valueChanged(double);
 
-    void pixelChanged(int pixel);
+    void pixelChanged(int);
 
     void cbpxChanged();
@@ -269 +269 @@
     void on_displayingSliceBox_valueChanged(int);
     void on_displayingEventBox_valueChanged(int);
+
+    void displaySliceValue();
 
     int SetupConfiguration(Configuration &conf);