Commit 5a43b674 authored by Lars Bittrich's avatar Lars Bittrich
Browse files

Merge branch 'ZeissImport' into RefactoringAnalysisModules 

# Conflicts:
#	__main__.py
#	analysis/datastats.py
#	dataset.py
#	detectionview.py
#	sampleview.py
#	viewitems.py

# fixed a lot of other relative import bugs
parents a6fa4f0e 9e096e02

__init__.py

0 → 100644
+0 −0

Empty file added.

gepard.py→__main__.py

+10 −10
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License 
along with this program, see COPYING.  

If not, see <https://www.gnu.org/licenses/>.

"""

from PyQt5 import QtCore, QtWidgets, QtGui

from sampleview import SampleView

from scalebar import ScaleBar

from ramancom.ramancontrol import defaultPath

from ramancom.ramanSwitch import RamanSwitch

from analysis.colorlegend import ColorLegend

import os

from PyQt5 import QtCore, QtWidgets, QtGui

from .sampleview import SampleView

from .scalebar import ScaleBar

from .ramancom.ramancontrol import defaultPath

from .ramancom.ramanSwitch import RamanSwitch

from .analysis.colorlegend import ColorLegend

            

class GEPARDMainWindow(QtWidgets.QMainWindow):

    def __init__(self, logpath):
@@ -37,7 +37,7 @@ class GEPARDMainWindow(QtWidgets.QMainWindow): 
        self.view.imparent = self

        self.view.ScalingChanged.connect(self.scalingChanged)

        self.scalebar = ScaleBar(self)

        self.legend = ColorLegend()

        self.legend = ColorLegend(self)

        self.ramanSwitch = RamanSwitch(self)

        self.view.ScalingChanged.connect(self.scalebar.updateScale)
@@ -126,7 +126,7 @@ class GEPARDMainWindow(QtWidgets.QMainWindow): 


    def createActions(self):

        fname = os.path.join(os.path.split(__file__)[0],

                             os.path.join("data","brand.png"))

                             os.path.join('data', 'brand.png'))

        self.aboutAct = QtWidgets.QAction(QtGui.QIcon(fname),

                                          "About Particle Measurment", self)

        self.aboutAct.triggered.connect(self.about)
@@ -177,7 +177,7 @@ class GEPARDMainWindow(QtWidgets.QMainWindow): 
                

        self.opticalScanAct = QtWidgets.QAction("Optical Scan", self)

        self.opticalScanAct.setEnabled(False)

        self.opticalScanAct.setCheckable(True)#        self.importWindow.exec()

        self.opticalScanAct.setCheckable(True)

        self.opticalScanAct.triggered.connect(QtCore.pyqtSlot()(lambda :self.view.switchMode("OpticalScan")))



        self.detectParticleAct = QtWidgets.QAction("Detect Particles", self)

analysis/database.py

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class DataBaseWindow(QtWidgets.QMainWindow): 
        self.path = os.path.join(logpath, 'databases')

        self.importPath = self.path

        if not os.path.exists(self.path):

            os.mkdir(self.path)

            os.makedirs(self.path)

        self.activeDatabase = None

        self.activeSpectrum = None

        self.activeSpectrumName = None

analysis/particleCharacterization.py

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ from copy import deepcopy 


from .particleClassification.colorClassification import ColorClassifier

from .particleClassification.shapeClassification import ShapeClassifier

from segmentation import closeHolesOfSubImage

from errors import InvalidParticleError

from ..segmentation import closeHolesOfSubImage

from ..errors import InvalidParticleError



class ParticleStats(object):

    longSize = None

analysis/particleClassification/shapeClassification.py

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ along with this program, see COPYING. 
If not, see <https://www.gnu.org/licenses/>.

"""

import cv2

from errors import InvalidParticleError

from ...errors import InvalidParticleError



class ShapeClassifier(object):

    def __init__(self):