Changeset 14076 for trunk/FACT++

Timestamp:

06/05/12 14:10:02 (12 years ago)

Author:

lyard

Message:

fixed zooming with qwt < 0x06

File:

• trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (4 diffs)

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

@@ -370 +370 @@
 
     PixelMap mypMap;
-    if (!mypMap.Read("FACTmap111030.txt"))
+    if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
     {
         cerr << "ERROR - Problems reading FACTmap111030.txt" << endl;
@@ -411 +411 @@
     //Should not be required, but apparently it helps when piping it through X forwarding
     glFinish();
-    makeCurrent();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
@@ -638 +637 @@
     catch (const runtime_error&)
     {
-        try
+            try
         {
             inputFile->SetPtrAddress("PCTime", pcTime);
@@ -1940 +1939 @@
     QStack< QRectF > stack;
     stack.push(scaleBoundingRectangle(pixelValueCurveItem.boundingRect(), 1.5f));
+    curveZoom->setZoomBase(scaleBoundingRectangle(pixelValueCurveItem.boundingRect(), 1.5f));
     curveZoom->setZoomStack(stack);
     stack.pop();
     stack.push(scaleBoundingRectangle(pixelAverageCurveItem.boundingRect(), 1.5f));
+    averageCurveZoom->setZoomBase(scaleBoundingRectangle(pixelAverageCurveItem.boundingRect(), 1.5f));
     averageCurveZoom->setZoomStack(stack);
     stack.pop();