Changeset 12671

Timestamp:

11/29/11 16:55:46 (13 years ago)

Author:

lyard

Message:

changed color palette

Location:

trunk/FACT++/gui

Files:

• BasicGlCamera.cc (modified) (8 diffs)
• RawEventsViewer/RawEventsViewer.cc (modified) (1 diff)

trunk/FACT++/gui/BasicGlCamera.cc

@@ -74 +74 @@
         calculatePixelsCoords();
 
-/*        ifstream fin2("MasterList-v3.txt");
-        if (!fin2.is_open())
-        {
-            cout << "Error: file \"MasterList-v3\" missing. aborting." << endl;
-            exit(-1);
-        }
-        int l = 0;
-        string buf;
-        while (getline(fin2, buf, '\n'))
-        {
-            buf = Tools::Trim(buf);
-            if (buf[0]=='#')
-                continue;
-
-            unsigned int softid, hardid, dummy;
-
-            stringstream str(buf);
-
-            str >> softid;
-            str >> dummy;
-            str >> hardid;
-
-            if (softid>=1440)
-                continue;
-
-            hardwareMapping[softid] = hardid;
-            softwareMapping[hardid] = softid;
-
-            l++;
-        }*/
         buildVerticesList();
 /*
@@ -143 +113 @@
         buildPatchesIndices();
 */////////////////////////////////
-        ss[0] = 0;    ss[1] = 0.25f; ss[2] = 0.5f; ss[3] = 0.75f; ss[4] = 1.0f;
-        rr[0] = 0.15; rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 0.85f;
-        gg[0] = 0.15; gg[1] = 0;     gg[2] = 1;    gg[3] = 0;     gg[4] = 0.85f;
-        bb[0] = 0.15; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0.85f;
+        regularPalettePlease(true);
+//        ss[0] = 0;    ss[1] = 0.25f; ss[2] = 0.5f; ss[3] = 0.75f; ss[4] = 1.0f;
+//        rr[0] = 0.15; rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 0.85f;
+//        gg[0] = 0.15; gg[1] = 0;     gg[2] = 1;    gg[3] = 0;     gg[4] = 0.85f;
+//        bb[0] = 0.15; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0.85f;
 
         fPixelStride = 1;
@@ -292 +263 @@
                 pixelsPatch[softwareMapping[i*9+j]] = i;
 
+        calculatePixelsCoords();
+
         for (int i=0;i<1440;i++)
         {
@@ -298 +271 @@
             updateNeighbors(i);
         }
+
+        buildVerticesList();
+
         buildPatchesIndices();
 
@@ -551 +527 @@
         if (!checked) return;
         ss[0] = 0;    ss[1] = 0.25f; ss[2] = 0.5f; ss[3] = 0.75f; ss[4] = 1.0f;
-        rr[0] = 0.15; rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 0.85f;
-        gg[0] = 0.15; gg[1] = 0;     gg[2] = 1;    gg[3] = 0;     gg[4] = 0.85f;
-        bb[0] = 0.15; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0.85f;
+        rr[0] = 0;    rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 1;
+        gg[0] = 0;    gg[1] = 1;     gg[2] = 1;    gg[3] = 1;     gg[4] = 0;
+        bb[0] = 0.5f; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0;
         tooHighValueCoulour[0] = 1.f;
         tooHighValueCoulour[1] = 1.f;
-        tooHighValueCoulour[2] = 0.f;
+        tooHighValueCoulour[2] = 1.f;
         tooLowValueCoulour[0] = 0.f;
-        tooLowValueCoulour[1] = 1.f;
-        tooLowValueCoulour[2] = 1.f;
+        tooLowValueCoulour[1] = 0.f;
+        tooLowValueCoulour[2] = 0.f;
         pixelColorUpToDate = false;
 
@@ -660 +636 @@
     void BasicGlCamera::initializeGL()
     {
-        qglClearColor(QColor(25,25,38));
+        qglClearColor(QColor(212,208,200));//25,25,38));
         glShadeModel(GL_FLAT);
         glEnable(GL_DEPTH_TEST);
@@ -1068 +1044 @@
                      cVertex[k] = hexcoords[j][k]*hexRadius + pixelsCoords[i][k];
 
-                 cVertex[1] -= hexRadius;
+//                 cVertex[1] -= hexRadius;
 
                  bool found = false;
@@ -1098 +1074 @@
                      cVertex[k] = hexcoords[j][k]*hexRadius + pixelsCoords[i][k];
 
-                 cVertex[1] -= hexRadius;
+//                 cVertex[1] -= hexRadius;
 
                  for (int k=0;k<numVertices;k++)

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

@@ -2392 +2392 @@
     }
 //    cout << "min: " << min << " max: " << max << " average: " << average << endl;
-    double minRange = (double)(min+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
-    double maxRange = (double)(max+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
-    double midRange = (double)(average+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
+    float minRange = (float)(min+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
+    float maxRange = (float)(max+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
+    float midRange = (float)(average+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
     if (GLWindow->logScale)
     {