Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed color of progressbar in log-config and changes column-headers #418

Merged
merged 8 commits into from
Jul 28, 2020
Merged

Changed color of progressbar in log-config and changes column-headers #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e699d7d
Changed column headers in log-config
victorhook Jul 28, 2020
0063a59
Changed color of progressbar in log-config window, and allow it to go…
victorhook Jul 28, 2020
b00cca2
Removed unused function
victorhook Jul 28, 2020
3f0b57a
Merge remote-tracking branch 'bitcraze/master'
victorhook Jul 28, 2020
e33f04b
merge from master
victorhook Jul 28, 2020
0981bbc
fixed wildcard import issue
victorhook Jul 28, 2020
d499103
Added a text-label that was missing in the log-config tab
victorhook Jul 28, 2020
bc30262
Merge branch 'master' into issue_360
victorhook Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 26 additions & 32 deletions src/cfclient/ui/dialogs/logconfigdialogue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@
"""

import logging
import struct

import cfclient
from PyQt5 import QtWidgets, uic, QtGui
from PyQt5.QtCore import pyqtSlot, Qt, QTimer
#from PyQt5.QtCore import * # noqa
#from PyQt5.QtWidgets import * # noqa
#from PyQt5.Qt import * # noqa

from cflib.crazyflie.log import LogConfig

Expand All @@ -52,8 +50,10 @@

NAME_FIELD = 0
ID_FIELD = 1
PTYPE_FIELD = 2
CTYPE_FIELD = 3
TYPE_FIELD = 2
SIZE_FIELD = 3
MAX_LOG_SIZE = 26
COLOR_GREEN = '#7cdb37'


class LogConfigDialogue(QtWidgets.QWidget, logconfig_widget_class):
Expand All @@ -63,9 +63,9 @@ def __init__(self, helper, *args):
self.setupUi(self)
self.helper = helper

self.logTree.setHeaderLabels(['Name', 'ID', 'Type', 'Size'])
self.varTree.setHeaderLabels(['Name', 'ID', 'Type', 'Size'])
self.categoryTree.setHeaderLabels(['Cathegories'])
self.logTree.setHeaderLabels(['Name', 'ID', 'Unpack', 'Storage'])
self.varTree.setHeaderLabels(['Name', 'ID', 'Unpack', 'Storage'])

self.logTree.setSortingEnabled(True)
self.varTree.setSortingEnabled(True)
Expand All @@ -87,8 +87,8 @@ def __init__(self, helper, *args):
self.varTree, self.logTree))
self.loggingPeriod.textChanged.connect(self.periodChanged)

self.packetSize.setMaximum(26)
self.currentSize = 0
self.packetSize.setMaximum(100)
self.packetSize.setValue(0)
self.period = 0

Expand Down Expand Up @@ -363,20 +363,6 @@ def resetTrees(self):
self.logTree.clear()
self.updateToc()

def decodeSize(self, s):
size = 0
if ("16" in s):
size = 2
if ("float" in s):
size = 4
if ("8" in s):
size = 1
if ("FP16" in s):
size = 2
if ("32" in s):
size = 4
return size

def sortTrees(self):
""" Sorts all trees by their name. """
for tree in [self.logTree, self.varTree, self.categoryTree]:
Expand All @@ -395,15 +381,23 @@ def updatePacketSizeBar(self):
for node in self.getNodeChildren(self.varTree.invisibleRootItem()):
for leaf in self.getNodeChildren(node):
self.currentSize = (self.currentSize +
self.decodeSize(leaf.text(CTYPE_FIELD)))
if self.currentSize > 26:
self.packetSize.setMaximum(self.currentSize / 26.0 * 100.0)
int(leaf.text(SIZE_FIELD)))

self.packetSizeText.setText('%s/%s bytes' % (self.currentSize,
MAX_LOG_SIZE))

if self.currentSize > MAX_LOG_SIZE:
self.packetSize.setMaximum(self.currentSize / MAX_LOG_SIZE * 100)
self.packetSize.setFormat("%v%")
self.packetSize.setValue(self.currentSize / 26.0 * 100.0)
self.packetSize.setValue(self.currentSize / MAX_LOG_SIZE * 100)
self.packetSize.setStyleSheet(
'QProgressBar::chunk { background: red;}')
else:
self.packetSize.setMaximum(26)
self.packetSize.setMaximum(MAX_LOG_SIZE)
self.packetSize.setFormat("%p%")
self.packetSize.setValue(self.currentSize)
self.packetSize.setStyleSheet(
'QProgressBar::chunk { background: %s;}' % COLOR_GREEN)

def addNewVar(self, logTreeItem, target):
parentName = logTreeItem.parent().text(NAME_FIELD)
Expand Down Expand Up @@ -472,7 +466,7 @@ def periodChanged(self, value):
self.period = 0

def showErrorPopup(self, caption, message):
self.box = QMessageBox() # noqa
self.box = QtWidgets.QMessageBox() # noqa
self.box.setWindowTitle(caption)
self.box.setText(message)
# self.box.setButtonText(1, "Ok")
Expand All @@ -491,10 +485,10 @@ def updateToc(self):
item.setData(NAME_FIELD, Qt.DisplayRole, param)
item.setData(ID_FIELD, Qt.DisplayRole,
toc.toc[group][param].ident)
item.setData(PTYPE_FIELD, Qt.DisplayRole,
toc.toc[group][param].pytype)
item.setData(CTYPE_FIELD, Qt.DisplayRole,
item.setData(TYPE_FIELD, Qt.DisplayRole,
toc.toc[group][param].ctype)
item.setData(SIZE_FIELD, Qt.DisplayRole,
struct.calcsize(toc.toc[group][param].pytype))
groupItem.addChild(item)

self.logTree.addTopLevelItem(groupItem)
Expand Down Expand Up @@ -593,7 +587,7 @@ def createConfigFromSelection(self, config):

for leaf in self.getNodeChildren(node):
varName = leaf.text(NAME_FIELD)
varType = str(leaf.text(CTYPE_FIELD))
varType = str(leaf.text(TYPE_FIELD))
completeName = "%s.%s" % (parentName, varName)
logconfig.add_variable(completeName, varType)

Expand Down
40 changes: 40 additions & 0 deletions src/cfclient/ui/dialogs/logconfigdialogue.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,51 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="packetSizeText">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QProgressBar" name="packetSize">
<property name="value">
<number>24</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
Expand Down