Changeset 11907 for trunk/FACT++/gui

Timestamp:

08/16/11 11:53:58 (13 years ago)

Author:

lyard

Message:

added spinners for slices and events

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (11 diffs)
• RawEventsViewer.h (modified) (4 diffs)
• viewer.ui (modified) (2 diffs)

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

@@ -5 +5 @@
  *      Author: lyard
  */
+
 
 #include "RawEventsViewer.h"
@@ -603 +604 @@
         delete inputFile;
     }
+    try {
     inputFile = new fits(file);
+    }
+    catch (std::runtime_error e)
+    {
+        cout << "Something went wrong while loading fits. aborting: " << e.what() << endl;
+        return;
+    }
     if (!*inputFile)
     {
@@ -635 +643 @@
     for (vector<string>::const_iterator it=entriesToCheck.begin(); it != entriesToCheck.end(); it++)
     {
+        try {
         if (!inputFile->HasKey(*it)){
             cout << *it << " missing. Aborting load..." << endl;
             return;}
+        }
+        catch (std::runtime_error e)
+        {
+            cout << e.what() << endl;
+            return;
+        }
     }
     nRows = inputFile->GetInt("NAXIS2");
@@ -779 +794 @@
         return;
     inputFile->GetRow(rowNum);
+//    cout << "Getting row " << rowNum << endl;
     for (int i=0;i<(1440+160)*nRoi;i++)
         eventData[i] = (float)rawEventData[i];
@@ -841 +857 @@
 UIConnector::UIConnector(QWidget*)
 {
+    updateSpinnerDisplay = true;
+
     timer.setInterval(10.0);
     QObject::connect(&timer, SIGNAL(timeout()),
@@ -1169 +1187 @@
 {
     ostringstream str;
-    str << "File loaded: " << currentFile << "\n";
-    str << "Calibration file loaded: " << currentCalibFile << "\n";
+
+    //extract the file name only (no path) from the full name
+    str << "File: " << currentFile.substr(currentFile.find_last_of("//")+1, currentFile.size()) << "\n";
+    str << "Calibration: " << currentCalibFile.substr(currentCalibFile.find_last_of("//")+1, currentCalibFile.size()) << "\n";
 //    fileLoadedLabel->setText(QString(str.str().c_str()));
 //    str.str("");
@@ -1177 +1197 @@
 //    str.str("");
     str << "Number of Events: " << viewer->nRows << "\n";
+
+    eventNumberBox->setMaximum(viewer->nRows-1);
+
     str << "Number of Slices: " << viewer->nRoi << "\n";// << "/1024";
 //    numberOfSlicesLabel->setText(QString(str.str().c_str()));
@@ -1226 +1249 @@
 {
     ostringstream str;
-    str << "Displaying Slice " << slice;
-    QString qstr(str.str().c_str());
-    emit updateCurrentSliceDisplay(qstr);
+//    str << "Displaying Slice " << slice;
+//    QString qstr(str.str().c_str());
+    if (updateSpinnerDisplay)
+        emit updateCurrentSliceDisplay(slice);
 
     str.str("");
     str << "Current Pixel val.: " << viewer->eventData[viewer->nRoi*viewer->selectedPixel + viewer->whichSlice];
-    qstr = qstr.fromStdString(str.str());
+    QString qstr = qstr.fromStdString(str.str());
     emit updateCurrentPixelSliceValue(qstr);
 
@@ -1241 +1265 @@
 double xval[4096];
 double yval[4096];
-
+void UIConnector::eventChangedFromSpinner(int cEvent)
+{
+//    cout << "Here " << updateSpinnerDisplay << endl;
+    if (!updateSpinnerDisplay)
+        return;
+    updateSpinnerDisplay = false;
+//    currentEventHasChanged(cEvent);
+    viewer->rowNum = cEvent - viewer->eventStep;
+    viewer->eventStepping(true);
+    updateSpinnerDisplay = true;
+
+//    viewer->updateGL();
+}
+void UIConnector::sliceChangedFromSpinner(int cSlice)
+{
+    updateSpinnerDisplay = false;
+    currentSliceHasChanged(cSlice);
+    updateSpinnerDisplay = true;
+    viewer->whichSlice = cSlice;
+    viewer->updateGL();
+}
 void UIConnector::currentEventHasChanged(int cEvent)
 {
     ostringstream str;
-    str << "Displaying Event " << cEvent;
-    QString qstr(str.str().c_str());
-    emit updateCurrentEventDisplay(qstr);
-    //retrieve the data that we want to display
+//    str << "Displaying Event " << cEvent;
+//    QString qstr(str.str().c_str());
+//    emit updateCurrentEventDisplay(qstr);
+    if (updateSpinnerDisplay)
+    {
+        updateSpinnerDisplay = false;
+        emit updateCurrentEventDisplay(viewer->rowNum);
+        updateSpinnerDisplay = true;
+    }
+        //retrieve the data that we want to display
     str.str("");
     str << "PC Time: " << viewer->pcTime;
-    qstr = qstr.fromStdString(str.str());
+    QString qstr = qstr.fromStdString(str.str());
     emit updateCurrentPCTime(qstr);
 
@@ -2032 +2082 @@
     connector.patchIDBox = myUi.patchIDBox;
 
+    connector.eventNumberBox = myUi.displayingEventBox;
+
     connector.range0 = myUi.colorRange0;
     connector.range1 = myUi.colorRange1;
@@ -2157 +2209 @@
                      &connector, SLOT(currentEventHasChanged(int)));
 
-    QObject::connect(&connector, SIGNAL(updateCurrentSliceDisplay(QString)),
-                     myUi.displayingSliceLabel, SLOT(setText(const QString)));
-    QObject::connect(&connector, SIGNAL(updateCurrentEventDisplay(QString)),
-                     myUi.displayingEventLabel, SLOT(setText(const QString)));
+    QObject::connect(&connector, SIGNAL(updateCurrentSliceDisplay(int)),
+                     myUi.displayingSliceBox, SLOT(setValue(int)));
+
+    QObject::connect(myUi.displayingSliceBox, SIGNAL(valueChanged(int)),
+                    &connector, SLOT(sliceChangedFromSpinner(int)));
+    QObject::connect(myUi.displayingEventBox, SIGNAL(valueChanged(int)),
+                    &connector, SLOT(eventChangedFromSpinner(int)));
+
+//    QObject::connect(&connector, SIGNAL(updateCurrentEventDisplay(QString)),
+//                     myUi.displayingEventLabel, SLOT(setText(const QString)));
+    QObject::connect(&connector, SIGNAL(updateCurrentEventDisplay(int)),
+                     myUi.displayingEventBox, SLOT(setValue(int)));
+
     QObject::connect(&connector, SIGNAL(updateCurrentPCTime(QString)),
                      myUi.PCTimeLabel, SLOT(setText(const QString)));

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

@@ -44 +44 @@
 
 #include <string>
+
 #include "externals/fits.h"
 
@@ -222 +223 @@
     void slicesMinusMinus();
     void drawCalibratedDataChanged(int state);
+    void eventChangedFromSpinner(int cEvent);
+    void sliceChangedFromSpinner(int cSlice);
 
 Q_SIGNALS:
-    void updateCurrentSliceDisplay(QString);
-    void updateCurrentEventDisplay(QString);
+    void updateCurrentSliceDisplay(int);
+    void updateCurrentEventDisplay(int);
     void updateCurrentPCTime(QString);
     void updateCurrentSoftTrigger(QString);
@@ -244 +247 @@
     bool rescaleWholeCamera;
     QRectF scaleBoundingRectangle(QRectF rectangle, float scale);
+    bool updateSpinnerDisplay;
 public:
     QListWidget *boardsTimeList;
@@ -285 +289 @@
     QSpinBox*   patchIDBox;
 
+    QSpinBox*   eventNumberBox;
+
     QRadioButton* currentPixelScale;
     QRadioButton* entireCameraScale;

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

@@ -213 +213 @@
          <widget class="QLabel" name="label">
           <property name="text">
-           <string>FACT - Raw events viewer - v0.2</string>
+           <string>FACT - Raw events viewer - v0.3</string>
           </property>
          </widget>
@@ -393 +393 @@
           </item>
           <item>
-           <widget class="QLabel" name="displayingEventLabel">
-            <property name="text">
-             <string>Displaying Event 0</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="displayingSliceLabel">
-            <property name="text">
-             <string>Displaying Slice 0</string>
-            </property>
-           </widget>
+           <layout class="QHBoxLayout" name="horizontalLayout_10">
+            <item>
+             <widget class="QLabel" name="displayingEventLabel">
+              <property name="text">
+               <string>Displaying Event</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="displayingEventBox"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_9">
+            <item>
+             <widget class="QLabel" name="displayingSliceLabel">
+              <property name="text">
+               <string>Displaying Slice  </string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="displayingSliceBox">
+              <property name="maximum">
+               <number>1023</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </item>
           <item>