Kaynağa Gözat

new Icon and bugfixes

Matze 4 yıl önce
ebeveyn
işleme
560c51c899

+ 27 - 0
KCG/icons/correlation.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 8 8" style="enable-background:new 0 0 8 8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:0.4;stroke-miterlimit:10;}
+	.st1{fill:#1D1DFF;}
+	.st2{fill:none;stroke:#E90000;stroke-width:0.5;stroke-miterlimit:10;}
+</style>
+<polyline class="st0" points="7.4,7.5 0.6,7.5 0.6,0.4 "/>
+<circle class="st1" cx="3.4" cy="3.2" r="0.3"/>
+<line class="st2" x1="1.8" y1="6" x2="6.7" y2="1.7"/>
+<circle class="st1" cx="2.1" cy="6.2" r="0.3"/>
+<circle class="st1" cx="5.8" cy="3.3" r="0.3"/>
+<circle class="st1" cx="5.5" cy="1.9" r="0.3"/>
+<circle class="st1" cx="4" cy="4.6" r="0.3"/>
+<circle class="st1" cx="1.8" cy="4.9" r="0.3"/>
+<circle class="st1" cx="4.8" cy="2.8" r="0.3"/>
+<circle class="st1" cx="5" cy="4" r="0.3"/>
+<circle class="st1" cx="3.4" cy="5.9" r="0.3"/>
+<circle class="st1" cx="6.4" cy="1.1" r="0.3"/>
+<circle class="st1" cx="6.4" cy="2.5" r="0.3"/>
+<circle class="st1" cx="2.6" cy="4.5" r="0.3"/>
+<circle class="st1" cx="7.2" cy="1.2" r="0.3"/>
+<circle class="st1" cx="4.9" cy="5.2" r="0.3"/>
+<circle class="st1" cx="3.6" cy="4" r="0.3"/>
+</svg>

+ 3 - 1
KCG/widgets/TimingWidget.py

@@ -143,7 +143,7 @@ class TimingPart(kcgw.KCGWidgets):
                              [
                                 #self.coarseInputFpga,
                                 #self.coarseInputAdc,
-                                self.coarseInputTh_2,
+                                #self.coarseInputTh_2,
                                 #self.coarse2InputAdc,
                                 #self.coarse2InputFpga,
                                 self.coarse2InputTh_2
@@ -352,6 +352,7 @@ class TimingPart(kcgw.KCGWidgets):
                     self.labelCoarseAdcDelay_2.setEnabled(False)
                     #self.labelCoarseFpgaDelay_2.setEnabled(False)
                     self.labelCascade.setEnabled(False)
+                    self.coarseInputTh_2.setEnabled(False)
                     self.coarseInputAdc_2.setEnabled(False)
                     #self.coarseInputFpga_2.setEnabled(False)
                     self.coarse2InputAdc_2.setEnabled(False)
@@ -371,6 +372,7 @@ class TimingPart(kcgw.KCGWidgets):
                     self.labelCoarseAdcDelay_2.setEnabled(True)
                     #self.labelCoarseFpgaDelay_2.setEnabled(True)
                     self.labelCascade.setEnabled(True)
+                    self.coarseInputTh_2.setEnabled(True)
                     self.coarseInputAdc_2.setEnabled(True)
                     #self.coarseInputFpga_2.setEnabled(True)
                     self.coarse2InputAdc_2.setEnabled(True)

+ 1 - 1
KCG/widgets/UpdateCalibrationWidget.py

@@ -134,5 +134,5 @@ def addUpdateCalibrationWidget():
 kcgw.register_widget(QtGui.QIcon(config.icon_path('calib.svg')),
                      "Update Calibration",
                      addUpdateCalibrationWidget,
-                     "Ctrl+u"
+                     "Ctrl+U"
                      )