Fixed dummy progress bar.
This commit is contained in:
@@ -230,44 +230,53 @@ void BCAnimatedDelegate::paintSliderIndicator(QPainter* painter, const QStyleOpt
|
|||||||
{
|
{
|
||||||
|
|
||||||
const BCValue& valueX = *(_valueList[ index.row()].get());
|
const BCValue& valueX = *(_valueList[ index.row()].get());
|
||||||
int value = index.model()->data(index, Qt::DisplayRole).toInt();
|
int value = 50;index.model()->data(index, Qt::DisplayRole).toInt();
|
||||||
|
|
||||||
// Hintergrund
|
// Hintergrund
|
||||||
if (option.state & QStyle::State_Selected) {
|
if (option.state & QStyle::State_Selected)
|
||||||
painter->fillRect(option.rect, option.palette.highlight());
|
{
|
||||||
} else if (index.row() % 2 == 1) {
|
painter->fillRect(option.rect, option.palette.highlight());
|
||||||
painter->fillRect(option.rect, QColor(0xFAFAFA));
|
}
|
||||||
} else {
|
else if (index.row() % 2 == 1)
|
||||||
painter->fillRect(option.rect, Qt::white);
|
{
|
||||||
}
|
painter->fillRect(option.rect, QColor(0xFAFAFA));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
painter->fillRect(option.rect, Qt::white);
|
||||||
|
}
|
||||||
|
|
||||||
// Text und kleiner Slider-Indikator zeichnen
|
// Text und kleiner Slider-Indikator zeichnen
|
||||||
painter->save();
|
painter->save();
|
||||||
painter->setRenderHint(QPainter::Antialiasing);
|
painter->setRenderHint(QPainter::Antialiasing);
|
||||||
|
|
||||||
QRect textRect = option.rect.adjusted(8, 0, -120, 0);
|
//QRect textRect = option.rect.adjusted(8, 0, -120, 0);
|
||||||
QRect barRect = option.rect.adjusted(option.rect.width() - 115,
|
|
||||||
option.rect.height() / 2 - 2,
|
|
||||||
-8,
|
|
||||||
-option.rect.height() / 2 + 2);
|
|
||||||
|
|
||||||
// Text
|
QRect barRect = option.rect.adjusted
|
||||||
painter->setPen(option.state & QStyle::State_Selected ?
|
(
|
||||||
option.palette.highlightedText().color() : Qt::black);
|
8,
|
||||||
painter->drawText(textRect, Qt::AlignVCenter | Qt::AlignLeft,
|
option.rect.height() / 2 - 2,
|
||||||
QString::number(value));
|
-8,
|
||||||
|
-option.rect.height() / 2 + 2
|
||||||
|
);
|
||||||
|
|
||||||
// Mini Progress Bar
|
//QRect barRect = option.rect;
|
||||||
painter->setPen(Qt::NoPen);
|
// Text
|
||||||
painter->setBrush(QColor(0xE0E0E0));
|
//painter->setPen(option.state & QStyle::State_Selected ? option.palette.highlightedText().color() : Qt::black);
|
||||||
painter->drawRoundedRect(barRect, 2, 2);
|
//painter->drawText(textRect, Qt::AlignVCenter | Qt::AlignLeft,
|
||||||
|
// QString::number(value));
|
||||||
|
|
||||||
QRect fillRect = barRect;
|
// Mini Progress Bar
|
||||||
fillRect.setWidth(barRect.width() * value / 100);
|
painter->setPen(Qt::NoPen);
|
||||||
painter->setBrush(QColor(0x0078D4));
|
painter->setBrush(QColor(0xE0E0E0));
|
||||||
painter->drawRoundedRect(fillRect, 2, 2);
|
painter->drawRoundedRect(barRect, 2, 2);
|
||||||
|
|
||||||
painter->restore();
|
QRect fillRect = barRect;
|
||||||
|
fillRect.setWidth(barRect.width() * value / 100);
|
||||||
|
painter->setBrush(QColor(0x0078D4));
|
||||||
|
painter->drawRoundedRect(fillRect, 2, 2);
|
||||||
|
|
||||||
|
painter->restore();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -157,10 +157,16 @@ void BCMainWindow::initMainWindow()
|
|||||||
|
|
||||||
// die Daten des eBikes laden
|
// die Daten des eBikes laden
|
||||||
_dataManager.loadXmlBikeData(":/bikeinfo.xml"_L1);
|
_dataManager.loadXmlBikeData(":/bikeinfo.xml"_L1);
|
||||||
//_consoleAction->trigger();
|
_consoleAction->trigger();
|
||||||
_batteryAction->trigger();
|
//_batteryAction->trigger();
|
||||||
|
|
||||||
}
|
// Dummy sync beim starten
|
||||||
|
|
||||||
|
QTimer::singleShot(1000, this, [this]()
|
||||||
|
{
|
||||||
|
onSyncDeviceView();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// 2. Bild für den Zustand UNCHECKED (Off) hinzufügen
|
// 2. Bild für den Zustand UNCHECKED (Off) hinzufügen
|
||||||
@@ -199,7 +205,7 @@ void BCMainWindow::initStatusBar()
|
|||||||
statBar->showMessage("Ready");
|
statBar->showMessage("Ready");
|
||||||
|
|
||||||
setApplicationStyleSheet(":bionxcontrol.qss"_L1);
|
setApplicationStyleSheet(":bionxcontrol.qss"_L1);
|
||||||
//setApplicationStyleSheet(":alt.qss"_L1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ void BCTransmitter::onUpdateValue( BCValuePtrConst valuePtr)
|
|||||||
|
|
||||||
// __fix
|
// __fix
|
||||||
//bc::processEventsFor(150);
|
//bc::processEventsFor(150);
|
||||||
bc::delay_millis(150);
|
bc::delay_millis(50);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -191,7 +191,8 @@ Das Model Gibt hier, unabhängig von der DataRole, immer das
|
|||||||
|
|
||||||
Qt::ItemFlags BCValueModel::flags(const QModelIndex& index) const
|
Qt::ItemFlags BCValueModel::flags(const QModelIndex& index) const
|
||||||
{
|
{
|
||||||
if (!index.isValid())
|
// die label spalte lässt sich nicht editieren
|
||||||
|
if (!index.isValid() || index.column() == 0 )
|
||||||
return Qt::NoItemFlags;
|
return Qt::NoItemFlags;
|
||||||
|
|
||||||
return QAbstractTableModel::flags(index) | Qt::ItemIsEditable;
|
return QAbstractTableModel::flags(index) | Qt::ItemIsEditable;
|
||||||
|
|||||||
Reference in New Issue
Block a user