Changeset 12671 for trunk/FACT++/gui


Ignore:
Timestamp:
Nov 29, 2011, 4:55:46 PM (8 years ago)
Author:
lyard
Message:
changed color palette
Location:
trunk/FACT++/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/gui/BasicGlCamera.cc

    r12473 r12671  
    7474        calculatePixelsCoords();
    7575
    76 /*        ifstream fin2("MasterList-v3.txt");
    77         if (!fin2.is_open())
    78         {
    79             cout << "Error: file \"MasterList-v3\" missing. aborting." << endl;
    80             exit(-1);
    81         }
    82         int l = 0;
    83         string buf;
    84         while (getline(fin2, buf, '\n'))
    85         {
    86             buf = Tools::Trim(buf);
    87             if (buf[0]=='#')
    88                 continue;
    89 
    90             unsigned int softid, hardid, dummy;
    91 
    92             stringstream str(buf);
    93 
    94             str >> softid;
    95             str >> dummy;
    96             str >> hardid;
    97 
    98             if (softid>=1440)
    99                 continue;
    100 
    101             hardwareMapping[softid] = hardid;
    102             softwareMapping[hardid] = softid;
    103 
    104             l++;
    105         }*/
    10676        buildVerticesList();
    10777/*
     
    143113        buildPatchesIndices();
    144114*/////////////////////////////////
    145         ss[0] = 0;    ss[1] = 0.25f; ss[2] = 0.5f; ss[3] = 0.75f; ss[4] = 1.0f;
    146         rr[0] = 0.15; rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 0.85f;
    147         gg[0] = 0.15; gg[1] = 0;     gg[2] = 1;    gg[3] = 0;     gg[4] = 0.85f;
    148         bb[0] = 0.15; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0.85f;
     115        regularPalettePlease(true);
     116//        ss[0] = 0;    ss[1] = 0.25f; ss[2] = 0.5f; ss[3] = 0.75f; ss[4] = 1.0f;
     117//        rr[0] = 0.15; rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 0.85f;
     118//        gg[0] = 0.15; gg[1] = 0;     gg[2] = 1;    gg[3] = 0;     gg[4] = 0.85f;
     119//        bb[0] = 0.15; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0.85f;
    149120
    150121        fPixelStride = 1;
     
    292263                pixelsPatch[softwareMapping[i*9+j]] = i;
    293264
     265        calculatePixelsCoords();
     266
    294267        for (int i=0;i<1440;i++)
    295268        {
     
    298271            updateNeighbors(i);
    299272        }
     273
     274        buildVerticesList();
     275
    300276        buildPatchesIndices();
    301277
     
    551527        if (!checked) return;
    552528        ss[0] = 0;    ss[1] = 0.25f; ss[2] = 0.5f; ss[3] = 0.75f; ss[4] = 1.0f;
    553         rr[0] = 0.15; rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 0.85f;
    554         gg[0] = 0.15; gg[1] = 0;     gg[2] = 1;    gg[3] = 0;     gg[4] = 0.85f;
    555         bb[0] = 0.15; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0.85f;
     529        rr[0] = 0;    rr[1] = 0;     rr[2] = 0;    rr[3] = 1.0f;  rr[4] = 1;
     530        gg[0] = 0;    gg[1] = 1;     gg[2] = 1;    gg[3] = 1;     gg[4] = 0;
     531        bb[0] = 0.5f; bb[1] = 1;     bb[2] = 0;    bb[3] = 0;     bb[4] = 0;
    556532        tooHighValueCoulour[0] = 1.f;
    557533        tooHighValueCoulour[1] = 1.f;
    558         tooHighValueCoulour[2] = 0.f;
     534        tooHighValueCoulour[2] = 1.f;
    559535        tooLowValueCoulour[0] = 0.f;
    560         tooLowValueCoulour[1] = 1.f;
    561         tooLowValueCoulour[2] = 1.f;
     536        tooLowValueCoulour[1] = 0.f;
     537        tooLowValueCoulour[2] = 0.f;
    562538        pixelColorUpToDate = false;
    563539
     
    660636    void BasicGlCamera::initializeGL()
    661637    {
    662         qglClearColor(QColor(25,25,38));
     638        qglClearColor(QColor(212,208,200));//25,25,38));
    663639        glShadeModel(GL_FLAT);
    664640        glEnable(GL_DEPTH_TEST);
     
    10681044                     cVertex[k] = hexcoords[j][k]*hexRadius + pixelsCoords[i][k];
    10691045
    1070                  cVertex[1] -= hexRadius;
     1046//                 cVertex[1] -= hexRadius;
    10711047
    10721048                 bool found = false;
     
    10981074                     cVertex[k] = hexcoords[j][k]*hexRadius + pixelsCoords[i][k];
    10991075
    1100                  cVertex[1] -= hexRadius;
     1076//                 cVertex[1] -= hexRadius;
    11011077
    11021078                 for (int k=0;k<numVertices;k++)
  • trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

    r12670 r12671  
    23922392    }
    23932393//    cout << "min: " << min << " max: " << max << " average: " << average << endl;
    2394     double minRange = (double)(min+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
    2395     double maxRange = (double)(max+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
    2396     double midRange = (double)(average+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
     2394    float minRange = (float)(min+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
     2395    float maxRange = (float)(max+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
     2396    float midRange = (float)(average+(VALUES_SPAN/2))/(float)(VALUES_SPAN-1);
    23972397    if (GLWindow->logScale)
    23982398    {
Note: See TracChangeset for help on using the changeset viewer.