chris/BionxControl
Public Access
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redesign data structures, part I

Browse Source
This commit is contained in:
PANIK\chris
2025-12-26 15:19:33 +01:00
parent fcfa61c16c
commit 71d7350913
9 changed files with 62 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bcdatamanager.h
View File

@@ -1,38 +1,3 @@
/***************************************************************************
BionxControl
Copyright © 2025 christoph holzheuer
christoph.holzheuer@gmail.com
Using: mhs_can_drv.c
© 2011 - 2023 by MHS-Elektronik GmbH & Co. KG, Germany
Klaus Demlehner, klaus@mhs-elektronik.de
@see www.mhs-elektronik.de
BigXionFlasher USB V 0.2.4 rev. 97
© 2011-2013 by Thomas Koenig <info@bigxionflasher.org>
@see www.bigxionflasher.org
Bionx Bike Info
© 2018 Thorsten Schmidt (tschmidt@ts-soft.de)
@see www.ts-soft.de
mhs_can_drv.c 3.00
© 2011 - 2015 by MHS-Elektronik GmbH & Co. KG, Germany
Demlehner Klaus, info@mhs-elektronik.de
@see www.mhs-elektronik.de
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
@see https://github.com/bikemike/bionx-bikeinfo
***************************************************************************/
#ifndef BCDATAMANAGER_H
#define BCDATAMANAGER_H
/***************************************************************************
BionxControl
@@ -65,13 +30,16 @@ Klaus Demlehner, klaus@mhs-elektronik.de
***************************************************************************/
#ifndef BCDATAMANAGER_H
#define BCDATAMANAGER_H
#include <QMap>
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
#include <QMetaEnum>
#include <QThread>
#include <bcdatamodel.h>
#include <bcvaluemodel.h>
#include <bctransmitter.h>
@@ -85,11 +53,9 @@ public:
BCDataManager( QObject* parent = nullptr);
virtual ~BCDataManager();
std::optional<BCDataModel*> getModel(BCDevice::ID deviceID );
std::optional<BCValueModel*> getModel(BCDevice::ID deviceID );
BCTransmitter* getTransmitter();
public slots:
void loadXmlBikeData();
@@ -119,11 +85,11 @@ protected:
QString UnitType;
};
void loadXmlBikeDeviceData( BCDataList& parsedValues );
void loadXmlBikeDeviceData( BCValueList& parsedValues );
std::optional<BCDataValue> makeDataValue( BCDevice::ID deviceID, const BCDataParams& params );
using BCDeviceModels = QMap<BCDevice::ID, BCDataModel*>;
using BCDeviceModels = QMap<BCDevice::ID, BCValueModel*>;
using BCValueTypeMap = QMap<QString,BCValueType*>;
QXmlStreamReader _xml;