flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add deviceName attribute to CJoystickButton

Browse Source 
ref T254
This commit is contained in:
Roland Winklmeier
2018-09-24 11:55:39 +02:00
committed by Klaus Basan
parent f62ab3266f
commit fa74f28bca
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/input/joystickbutton.cpp
View File

@@ -15,8 +15,8 @@ namespace BlackMisc
{
namespace Input
{
CJoystickButton::CJoystickButton(int buttonIndex) :
m_buttonIndex(buttonIndex)
CJoystickButton::CJoystickButton(const QString deviceName, int index) :
m_deviceName(deviceName), m_buttonIndex(index)
{}
void CJoystickButton::setButtonIndex(int buttonIndex)
@@ -35,6 +35,9 @@ namespace BlackMisc
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexDeviceName:
this->setDeviceName(variant.value<QString>());
break;
case IndexButton:
case IndexButtonAsString:
this->setButtonIndex(buttonIndexFromString(variant.value<QString>()));
@@ -54,6 +57,8 @@ namespace BlackMisc
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexDeviceName:
return CVariant::from(this->getDeviceName());
case IndexButton:
return CVariant::from(this->getButtonIndex());
case IndexButtonAsString:

15
src/blackmisc/input/joystickbutton.h
View File

@@ -33,7 +33,8 @@ namespace BlackMisc
//! Properties by index
enum ColumnIndex
{
IndexButton = 0,
IndexDeviceName = 0,
IndexButton,
IndexButtonAsString,
IndeButtonObject, // just for updates
};
@@ -42,7 +43,10 @@ namespace BlackMisc
CJoystickButton() = default;
//! Constructor
CJoystickButton(int buttonIndex);
CJoystickButton(const QString deviceName, int index);
//! Get device name
QString getDeviceName() const { return m_deviceName; }
//! Get button index
int getButtonIndex() const { return m_buttonIndex; }
@@ -50,11 +54,14 @@ namespace BlackMisc
//! Get button as String
QString getButtonAsString() const { return buttonIndexToString(m_buttonIndex); }
//! Set owning device name
void setDeviceName(const QString &deviceName) { m_deviceName = deviceName; }
//! Set button index
void setButtonIndex(int buttonIndex);
//! Is valid?
bool isValid() const { return m_buttonIndex >= 0 ? true : false; }
bool isValid() const { return !m_deviceName.isEmpty() && m_buttonIndex >= 0 ? true : false; }
//! Set button object
void setButtonObject(CJoystickButton button);
@@ -78,12 +85,14 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
QString m_deviceName;
int m_buttonIndex = m_invalidIndex;
static constexpr int m_invalidIndex = -1;
BLACK_METACLASS(
CJoystickButton,
BLACK_METAMEMBER(deviceName),
BLACK_METAMEMBER(buttonIndex)
);
};