Changeset 19376 for trunk/FACT++/gui


Ignore:
Timestamp:
11/11/18 14:44:12 (6 years ago)
Author:
tbretz
Message:
Commented some obsolete code. Do not reset the palette if it is set to 'manual' when changing events.
Location:
trunk/FACT++/gui/RawEventsViewer
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r19374 r19376  
    416416            patchesColor[i][j] = color[j];
    417417    }
    418     fZeroArray = NULL;
     418    //fZeroArray = NULL;
    419419
    420420    _softwareOrdering = false;
    … …  
    430430        delete inputFile;
    431431    }
    432     if (fZeroArray != NULL)
    433         delete[] fZeroArray;
    434 }
     432    //if (fZeroArray != NULL)
     433    //    delete[] fZeroArray;
     434}
     435/*
    435436void RawDataViewer::allocateZeroArray()
    436437{
    … …  
    440441    }
    441442}
     443*/
    442444/************************************************************
    443445 * PAINT GL. main drawing function.
    … …  
    949951     emit signalCurrentPixel(pix);
    950952}
     953/*
    951954void RawDataViewer::computePulsesStatistics()
    952955{
    … …  
    10191022 //   }
    10201023}
     1024*/
    10211025/************************************************************
    10221026 * UICONNECTOR CONSTRUCTOR
    … …  
    11131117    threeD_Window->setData(GLWindow->eventData.data());
    11141118
    1115     on_autoScaleColor_clicked();
     1119    if (autoScaleColor->isChecked())
     1120        on_autoScaleColor_clicked();
    11161121    pixelChanged(GLWindow->selectedPixel);
    11171122
    … …  
    20422047
    20432048    displaySliceValue();
    2044     on_autoScaleColor_clicked();
     2049    if (autoScaleColor->isChecked())
     2050        on_autoScaleColor_clicked();
    20452051}
    20462052

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

    r19373 r19376  
    101101
    102102    ///Used to load zero data in case of missing fits columns
    103     void allocateZeroArray();
    104     char* fZeroArray;
     103    //void allocateZeroArray();
     104    //char* fZeroArray;
    105105    //bool telling whether the data is natively ordered in software or hardware id
    106106    //used to correctly display monte-carlo data.
    … …  
    175175//    float triggerOffsetMean[1440*1024];
    176176//    bool calibrationLoaded;
    177     bool drawCalibrationLoaded;
     177//    bool drawCalibrationLoaded;
    178178
    179179    QPoint lastPos;
    180180public:
     181    /*
    181182    void computePulsesStatistics();
    182183    double aMeas[1024];
    … …  
    184185    double n2mean[1024];
    185186    double vCorr[1024];
     187    */
    186188    int64_t VALUES_SPAN;
    187189
Note: See TracChangeset for help on using the changeset viewer.