Changeset 12055

Timestamp:

09/09/11 10:12:06 (13 years ago)

Author:

tbretz

Message:

Added some const-qualifiers; fixed some compiler warings; removed a global namespace defintion from the header file; fixed the errornous includes (no path in Qt and Qwt includes -- the path is defined by the configure script); fixed a type from yesterday (mean not sum)

Location:

trunk/FACT++/gui

Files:

• BasicGlCamera.cc (modified) (5 diffs)
• BasicGlCamera.h (modified) (6 diffs)

trunk/FACT++/gui/BasicGlCamera.cc

@@ -6 +6 @@
 #include <sstream>
 #include "src/tools.h"
+
+using namespace std;;
 
 const PixelMapEntry PixelMap::empty = { 0, 0, 0, 0, 0, 0 };
@@ -268 +270 @@
     {
     }
-    void BasicGlCamera::assignPixelMap(PixelMap& map)
+    void BasicGlCamera::assignPixelMap(const PixelMap& map)
     {
         fPixelMap = map;
@@ -277 +279 @@
         }
     }
-    void BasicGlCamera::assignTriggerPatchesMap(vector<int>& pa)
+    void BasicGlCamera::assignTriggerPatchesMap(const vector<int>& pa)
     {
         vector<vector<int> > intervec;
@@ -296 +298 @@
 
         //now construct the correspondance between pixels and patches
-        for (int i=0;i<NTMARK;i++)
+        for (i=0;i<NTMARK;i++)
             for (int j=0;j<9;j++)
                 pixelsPatch[softwareMapping[patches[i][j]]] = i;
 
-        for (int i=0;i<1440;i++)
+        for (i=0;i<1440;i++)
             updateNeighbors(i);
 
@@ -379 +381 @@
 
         mean /= ACTUAL_NUM_PIXELS;
-        rms = sqrt(rms/ACTUAL_NUM_PIXELS - sum * sum);
+        rms = sqrt(rms/ACTUAL_NUM_PIXELS - mean * mean);
 
         multiset<double>::iterator it = medianSet.begin();

trunk/FACT++/gui/BasicGlCamera.h

@@ -9 +9 @@
 #define ACTUAL_NUM_PIXELS 1440
 
+#include <set>
+#include <vector>
+
 #include <QtOpenGL/QGLWidget>
 #include <QtGui/QMouseEvent>
-#include <vector>
 
 #include <QtGui/QRadioButton>
@@ -17 +19 @@
 #include <QtGui/QButtonGroup>
 
-#include <set>
-
 #include "src/PixelMap.h"
 
-using namespace std;
 //#include <QtGui/QMouseEvent>
 ///structure for storing edges of hexagons (for blurry display)
@@ -69 +68 @@
     GLfloat tooLowValueCoulour[3];
 
-    string dataText;
-    string unitsText;
-    string titleText;
+    std::string dataText;
+    std::string unitsText;
+    std::string titleText;
 
-    void setUnits(const string& units);
-    void setTitle(const string& title);
+    void setUnits(const std::string& units);
+    void setTitle(const std::string& title);
     void SetWhite(int idx);
     void SetMin(int64_t min);
@@ -80 +79 @@
     void SetAutoRefresh(bool on);
     void updateCamera();
-    void assignPixelMap(PixelMap& );
-    void assignTriggerPatchesMap(vector<int>& );
+    void assignPixelMap(const PixelMap& );
+    void assignTriggerPatchesMap(const std::vector<int>& );
 
     float ss[5];// = {0.00, 0.25, 0.5, 0.75, 1.00};
@@ -125 +124 @@
     int fPixelStride;
     int fcSlice;
-    vector<double>fData;
+    std::vector<double>fData;
 
  //   bool recalcColorPlease;
@@ -133 +132 @@
     GLfloat pixelsColor[NPIX][3];
     static  GLfloat verticesList[NPIX*6][2];
-    static vector<edge> patchesIndices[160];
+    static std::vector<edge> patchesIndices[160];
     static int verticesIndices[NPIX][6];
     static int pixelsPatch[NPIX];