Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Marcel Paffrath 2017-05-24 14:13:43 +02:00
commit 69b2daaab8

View File

@ -2172,9 +2172,9 @@ class ChannelOrderTab(PropTab):
self.setLayout(layout) self.setLayout(layout)
def getValues(self): def getValues(self):
values = {"Channel Z [up/down, default=3]": self.ChannelOrderZEdit.text(), values = {"Channel Z [up/down, default=3]": int(self.ChannelOrderZEdit.text()),
"Channel N [north/south, default=1]": self.ChannelOrderNEdit.text(), "Channel N [north/south, default=1]": int(self.ChannelOrderNEdit.text()),
"Channel E [east/west, default=2]": self.ChannelOrderEEdit.text()} "Channel E [east/west, default=2]": int(self.ChannelOrderEEdit.text())}
return values return values
def resetValues(self, infile=None): def resetValues(self, infile=None):