Changeset 12189 for trunk

Timestamp:

10/17/11 19:59:41 (13 years ago)

Author:

tbretz

Message:

Fixed startup.

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

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

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

@@ -368 +368 @@
     eventData = NULL;
     drawPatch = true;
-    drawImpulse = false;
+    drawImpulse = true;
     drawBlur = false;
     loopCurrentEvent = false;
@@ -1155 +1155 @@
  * UICONNECTOR CONSTRUCTOR
  ************************************************************/
-UIConnector::UIConnector(QWidget*)
+UIConnector::UIConnector(QWidget *p)
 {
     setupUi(this);
@@ -1170 +1170 @@
                      this, SLOT(nextSlicePlease()));
 
-    QButtonGroup &scaleGroup = *new QButtonGroup(GLWindow);// = new QButtonGroup(canvas);
-    QButtonGroup &animateGroup = *new QButtonGroup(GLWindow);// = new QButtonGroup(canvas);
-
-    scaleGroup.addButton(Ui::MainWindow::currentPixelScale);
-    scaleGroup.addButton(Ui::MainWindow::entireCameraScale);
-
-    animateGroup.addButton(Ui::MainWindow::playEventsRadio);
-    animateGroup.addButton(Ui::MainWindow::playSlicesRadio);
+    QButtonGroup &scaleGroup = *new QButtonGroup(p);// = new QButtonGroup(canvas);
+    QButtonGroup &animateGroup = *new QButtonGroup(p);// = new QButtonGroup(canvas);
+
+    scaleGroup.addButton(currentPixelScale);
+    scaleGroup.addButton(entireCameraScale);
+
+    animateGroup.addButton(playEventsRadio);
+    animateGroup.addButton(playSlicesRadio);
+
+    entireCameraScale->setChecked(true);
 
     QObject::connect(GLWindow, SIGNAL(colorPaletteHasChanged()),
@@ -1392 +1394 @@
  * PLAY PAUSE CLICKED. ui handler
  ************************************************************/
-void UIConnector::playPauseClicked()
+void UIConnector::on_playPauseButton_clicked()
 {
     if (timer.isActive())
@@ -2226 +2228 @@
     blueValue4->setValue(canvas->bb[4]);
 
+    if (conf.Has("drs"))
+    {
+        const QString qstr(conf.Get<string>("drs").c_str());
+        calibFileSelected(qstr);
+    }
+
     if (conf.Has("file"))
     {
@@ -2232 +2240 @@
     }
 
-    if (conf.Has("drs"))
-    {
-        const QString qstr(conf.Get<string>("drs").c_str());
-        calibFileSelected(qstr);
-    }
 
     return 0;

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

@@ -213 +213 @@
 
     void newFileLoaded();
-    void playPauseClicked();
     void slicesPerSecondChanged(double value);
     void nextSlicePlease();
@@ -219 +218 @@
     void currentEventHasChanged(int event);
 
+    void on_playPauseButton_clicked();
     void on_loadNewFileButton_clicked();
     void on_loadDRSCalibButton_clicked();