Changeset 12300

Timestamp:

10/27/11 16:30:58 (13 years ago)

Author:

lyard

Message:

added RMS tab and fixed time for old format

Location:

trunk/FACT++/gui

Files:

• BasicGlCamera.h (modified) (2 diffs)
• RawEventsViewer/RawEventsViewer.cc (modified) (5 diffs)
• RawEventsViewer/RawEventsViewer.h (modified) (1 diff)

trunk/FACT++/gui/BasicGlCamera.h

@@ -61 +61 @@
 
     static PixelMap fPixelMap;
+    static int pixelsPatch[NPIX];
 
     bool pixelColorUpToDate;
@@ -140 +141 @@
     static std::vector<edge> patchesIndices[160];
     static int verticesIndices[NPIX][6];
-    static int pixelsPatch[NPIX];
     static int softwareMapping[NPIX];
     float shownSizex;

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

@@ -638 +638 @@
     catch (const runtime_error&)
     {
+        try
+        {
+            inputFile->SetPtrAddress("PCTime", pcTime);
+        }
+        catch (const runtime_error&)
+        {
+
+        }
     }
 
@@ -1103 +1111 @@
     updateGL();
 }
-
+void RawDataViewer::setCurrentPixel(int pix)
+{
+    if (pix == -1)
+        return;
+    selectedPixel = pix;
+    if (isVisible())
+    updateGL();
+     emit signalCurrentPixel(pix);
+}
 void RawDataViewer::computePulsesStatistics()
 {
@@ -1202 +1218 @@
 
     GLWindow_2->enableText(false);
+ //   GLWindow_2->ShowPatchCursor(true);
 
     QObject::connect(GLWindow, SIGNAL(colorPaletteHasChanged()),
@@ -1213 +1230 @@
     QObject::connect(GLWindow, SIGNAL(newFileLoaded()),
                      this, SLOT(newFileLoaded()));
+
+    QObject::connect(GLWindow_2, SIGNAL(signalCurrentPixel(int)),
+                     GLWindow, SLOT(setCurrentPixel(int)));
+
 
     show();
@@ -1981 +2002 @@
 void UIConnector::pixelChanged(int pixel)
 {
+    GLWindow_2->fWhite = pixel;
+    GLWindow_2->fWhitePatch = GLWindow_2->pixelsPatch[pixel];
+
+
     pixel = GLWindow->hardwareMapping[pixel];
 

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

@@ -75 +75 @@
     void nextSlice();
     void previousSlice();
+    void setCurrentPixel(int);
 
 Q_SIGNALS: