Commit 8e7707c0 authored by JosefBrandt's avatar JosefBrandt
Browse files

Small Bugfixes / Optimizations

parent 3ad72d39

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -6,3 +6,7 @@ gepard\.cfg 
analysis/database_config\.txt



*.so



*.c



external/build/

analysis/analysisview.py

+4 −5
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ class ParticleAnalysis(QtWidgets.QMainWindow): 
        self.specNumberSelector = QtWidgets.QSpinBox()

        self.specNumberSelector.setMinimumWidth(100)

        self.specNumberSelector.setMinimum(1)

        numParticles = self.particleContainer.getNumberOfParticles()

        self.specNumberSelector.setMaximum(numParticles)

        numSpectra = self.particleContainer.getNumberOfMeasurements()

        self.specNumberSelector.setMaximum(numSpectra)

        

        self.jumpToSpecBtn = QtWidgets.QPushButton('Jump To Spectrum of Number:')

        self.jumpToSpecBtn.released.connect(self.jumpToIndicatedSpectrum)
@@ -387,8 +387,8 @@ class ParticleAnalysis(QtWidgets.QMainWindow): 
        self.typeSelectorCombo.addItems(uniquePolymers)

        self.typeSelectorCombo.currentIndexChanged.connect(self.setTypeSelector)

        

        numParticles = self.particleContainer.getNumberOfParticles()

        self.specNumberSelector.setMaximum(numParticles)

        numSpectra = self.particleContainer.getNumberOfMeasurements()

        self.specNumberSelector.setMaximum(numSpectra)

        

    def initializeSpecPlot(self):

        self.specPlot.loadSpectraAndInitializeSpecPlot()
@@ -531,7 +531,6 @@ class ParticleAnalysis(QtWidgets.QMainWindow): 
        

        self.particleSelector.setValue(partIndices.index(particleIndex)+1)

        

        

        specIndices = self.particleContainer.getSpectraIndicesOfParticle(self.currentParticleIndex)

        self.spectrumSelector.setValue(1)

        self.spectrumSelector.setMaximum(len(specIndices))

analysis/particleContainer.py

+3 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ class ParticleContainer(object): 
    def getNumberOfParticles(self):

        return len(self.particles)

    

    def getNumberOfMeasurements(self):

        return len(self.measurements)

    

    def getParticleContours(self):

        contours = [part.contour for part in self.particles]

        return contours

analysis/particlePainter.py

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ class ParticlePainter(QtWidgets.QGraphicsItem): 
            painter.drawEllipse(p[0]-p[2], p[1]-p[2], 2*p[2], 2*p[2])            

        

        if self.pixmap is not None:

            painter.setOpacity(0.6)

            painter.setOpacity(0.4)

            painter.drawPixmap(self.topLeft[1], self.topLeft[0], self.pixmap)

dataset.py

+6 −2
Original line number Diff line number Diff line
@@ -252,6 +252,9 @@ class DataSet(object): 
            

            self.particleContainer.clearMeasurements()

            

            if self.particles2spectra is None:

                self.particles2spectra = [[int(np.where(self.ramanscansortindex == i)[0])] for i in range(len(self.ramanscansortindex))]

            

            if len(self.particlestats) > 0:   #i.e., particle detection was completed and particle data is there 

                self.particleDetectionDone = True

                for particleIndex, listOfScanIndices in enumerate(self.particles2spectra):
@@ -259,7 +262,8 @@ class DataSet(object): 
                    curParticle.measurements = []

                    for scanIndex in listOfScanIndices:

                        indexOfNewMeas = self.particleContainer.addEmptyMeasurement()

                        x, y = self.ramanpoints[indexOfNewMeas][0], self.ramanpoints[indexOfNewMeas][1]

                        indexOfMeasInRamanPoints = self.ramanscansortindex[scanIndex]

                        x, y = self.ramanpoints[indexOfMeasInRamanPoints][0], self.ramanpoints[indexOfMeasInRamanPoints][1]

                        self.particleContainer.setMeasurementPixelCoords(indexOfNewMeas, x, y)

                        self.particleContainer.setMeasurementScanIndex(indexOfNewMeas, scanIndex)

                        curParticle.addMeasurement(self.particleContainer.measurements[indexOfNewMeas])