miladS
/
ConsoleEmulatorAddProbes
forked from Sepanta/console-emulator
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add joystick connection

mode-button
Alireza 3 years ago
parent
9821afc96c
commit
edaa63d95e
17 changed files with 258 additions and 239 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      logic/include/viewModel/MainViewModel.h
  2. 27
      logic/include/viewModel/utils/Property.h
  3. 2
      logic/src/viewModel/MainViewModel.cpp
  4. 2
      ui/emulator/components/JoystickButton.qml
  5. 6
      ui/emulator/components/ModeButton.qml
  6. 6
      ui/emulator/components/ModeOption.qml
  7. 2
      ui/emulator/components/NeuLight.qml
  8. 21
      ui/emulator/components/Trackball.qml
  9. 41
      ui/emulator/elements/JoystickButtonBind.qml
  10. 1
      ui/emulator/elements/KnobLightBind.qml
  11. 26
      ui/emulator/elements/ModeButtonBind.qml
  12. 28
      ui/emulator/elements/ModeOptionBind.qml
  13. 20
      ui/emulator/items/Encoders.qml
  14. 14
      ui/emulator/items/JoystickCouple.qml
  15. 56
      ui/emulator/items/Joysticks.qml
  16. 211
      ui/emulator/items/Trackball.qml
  17. 1
      ui/ui.qrc

33
logic/include/viewModel/MainViewModel.h
View File

@ -16,6 +16,9 @@ class MainViewModel : public QtMvvm::ViewModel
Console * panel;
MVVM_PROPERTY(int, dialStepInc, 1)
MVVM_PROPERTY(int, dialStepDec, -1)
//Top Left
BUTTON_LED_PROPERTY(patient, Patient, false, LedOFF)
BUTTON_LED_PROPERTY(utils, Utils, false, LedColorWhite)
@ -75,6 +78,18 @@ class MainViewModel : public QtMvvm::ViewModel
LED_PROPERTY(modeCCenter, LedOFF) //modeC -> modeCCenterLed
LED_PROPERTY(modeBCenter, LedOFF) //modeB -> modeBCenterLed
BUTTON_PROPERTY(modePwCenter, ModePwCenter, false)
BUTTON_PROPERTY(modeMCenter, ModeMCenter, false)
BUTTON_PROPERTY(modePdCenter, ModePdCenter, false)
BUTTON_PROPERTY(modeCCenter, ModeCCenter, false)
BUTTON_PROPERTY(modeBCenter, ModeBCenter, false)
JOYSTICK_PROPERTY(modePw, ModePw)
JOYSTICK_PROPERTY(modePd, ModePd)
JOYSTICK_PROPERTY(modeC, ModeC)
JOYSTICK_PROPERTY(modeM, ModeM)
JOYSTICK_PROPERTY(modeB, ModeB)
//JoystickCouple
LED_PROPERTY(depthCenter, LedOFF) //zoom -> depthCenterLed
LED_PROPERTY(depthBottom, LedOFF) //depth -> depthBottomLed
@ -82,6 +97,18 @@ class MainViewModel : public QtMvvm::ViewModel
LED_PROPERTY(focusCenter, LedOFF) //focus zone -> focusCenterLed
LED_PROPERTY(focusBottom, LedOFF) //focus-depth -> focusBottomLed
BUTTON_PROPERTY(depthCenter, DepthCenter, false)
BUTTON_PROPERTY(focusCenter, FocusCenter, false)
BUTTON_PROPERTY(depthBottom, DepthBottom, false)
BUTTON_PROPERTY(focusBottom, FocusBottom, false)
BUTTON_PROPERTY(depthTop, DepthTop, false)
BUTTON_PROPERTY(focusTop, FocusTop, false)
JOYSTICK_PROPERTY(depth, Depth)
JOYSTICK_PROPERTY(focus, Focus)
//Joysticks
BUTTON_PROPERTY(js1Top, Js1Top, false)
BUTTON_PROPERTY(js2Top, Js2Top, false)
@ -101,7 +128,11 @@ class MainViewModel : public QtMvvm::ViewModel
BUTTON_PROPERTY(js4Bottom, Js4Bottom, false)
BUTTON_PROPERTY(js5Bottom, Js5Bottom, false)
//TODO
JOYSTICK_PROPERTY(js1, Js1)
JOYSTICK_PROPERTY(js2, Js2)
JOYSTICK_PROPERTY(js3, Js3)
JOYSTICK_PROPERTY(js4, Js4)
JOYSTICK_PROPERTY(js5, Js5)
public:
Q_INVOKABLE explicit MainViewModel(QObject* parent = nullptr);

27
logic/include/viewModel/utils/Property.h
View File

@ -26,10 +26,10 @@
TYPE NAME() const { return _ ## NAME ; } \
void NAME(TYPE value) { \
if (_ ## NAME == value) return; \
_ ## NAME = value; \
emit NAME ## Changed(value); \
NAME ## Handle(); \
qDebug() << #NAME << value; \
_ ## NAME = value; \
emit NAME ## Changed(value); \
NAME ## Handle(); \
qDebug() << #NAME << value; \
} \
Q_SIGNAL void NAME ## Changed(TYPE value);\
private: \
@ -56,6 +56,25 @@
#define LED_PROPERTY(NAME, LED_DEF_VAL) \
MVVM_PROPERTY(int, NAME ## Led, LED_DEF_VAL) \
/**************************************************************************************************/
#define JOYSTICK_PROPERTY(NAME, CAP_NAME) \
MVVM_PROPERTY_CUSTOM(bool, NAME ## Left, false) \
MVVM_PROPERTY_CUSTOM(bool, NAME ## Right, false) \
void NAME ## LeftHandle() { \
if(NAME ## Left()) \
{ \
panel->rotate ## CAP_NAME(dialStepDec()); \
qDebug() << #NAME << "decresed"; \
} \
} \
void NAME ## RightHandle() { \
if(NAME ## Right()) \
{ \
panel->rotate ## CAP_NAME(dialStepInc()); \
qDebug() << #NAME << "incresed"; \
} \
}
/**************************************************************************************************/
#define LED_SLOT(NAME) \
void NAME ## LedHandle(char value) { \

2
logic/src/viewModel/MainViewModel.cpp
View File

@ -91,4 +91,6 @@ MainViewModel::MainViewModel(QObject* parent) :
panel->modeCCenterLedChanged(1);
panel->modeMCenterLedChanged(1);
panel->modeBCenterLedChanged(2);
//panel->rotateD(1);
}

2
ui/emulator/components/JoystickButton.qml
View File

@ -6,6 +6,7 @@ import "qrc:/const"
Item {
id: control
property bool centerButDown: centerBut.down
property bool leftButDown
property bool rightButDown
property bool topButDown
@ -166,6 +167,7 @@ Item {
NeuButton {
id: centerBut
width: 2 * (Const.radiusShort - Const.margin)
height: 2 * (Const.radiusShort - Const.margin)
anchors.centerIn: parent

6
ui/emulator/components/ModeButton.qml
View File

@ -9,9 +9,9 @@ ModeBg {
property var image: "qrc:/icons/topLeft/utils.png"
property alias down: mainKnob.down
property alias increase: incButton.down
property alias decrease: decButton.down
property var down: mainKnob.down
property var increase: incButton.down
property var decrease: decButton.down
property var led: 1

6
ui/emulator/components/ModeOption.qml
View File

@ -11,9 +11,9 @@ ModeBgOption {
property var image: "qrc:/icons/topLeft/utils.png"
property var imageOption: "qrc:/icons/topLeft/utils.png"
property alias down: mainKnob.down
property alias increase: incButton.down
property alias decrease: decButton.down
property bool down: mainKnob.down
property bool increase: incButton.down
property bool decrease: decButton.down
property var led: 1
property var ledOption: 0

2
ui/emulator/components/NeuLight.qml
View File

@ -13,6 +13,7 @@ Button {
property var colorMode: 0 // 0->None; 1->White; 2->Green; 3->Yellow
property color backLightColor: getColorMode()
property var specialScale: 1
property var visibleGlow: true
signal pressed
signal released
@ -185,6 +186,7 @@ Button {
samples: 20
color: backLightColor
transparentBorder: true
visible: visibleGlow
}
Item {

21
ui/emulator/components/Trackball.qml
View File

@ -34,12 +34,20 @@ Item {
width: longBut + shortBut + 2 * margin
height: width
NeuButton {
enabled: false
anchors.centerIn: parent
width: longBut + shortBut + 2 * margin + 115
height: width
}
LightRing {
colorMode: 0
anchors.centerIn: parent
width: longBut + shortBut + 2 * margin + 115
width: longBut + shortBut - margin
height: width
thickness: 70
thickness: 10
}
NeuLight {
@ -49,6 +57,7 @@ Item {
implicitWidth: shortBut
implicitHeight: longBut
colorMode: leftColor
visibleGlow: false
}
NeuLight {
@ -58,6 +67,7 @@ Item {
implicitWidth: shortBut
implicitHeight: longBut
colorMode: rightColor
visibleGlow: false
}
NeuLight {
@ -67,6 +77,7 @@ Item {
implicitWidth: longBut
implicitHeight: shortBut
colorMode: topColor
visibleGlow: false
}
NeuLight {
@ -76,6 +87,7 @@ Item {
implicitWidth: longBut
implicitHeight: shortBut
colorMode: bottomColor
visibleGlow: false
}
NeuLight {
@ -85,6 +97,7 @@ Item {
implicitWidth: shortBut
implicitHeight: shortBut
colorMode: topLeftColor
visibleGlow: false
}
NeuLight {
@ -94,6 +107,7 @@ Item {
implicitWidth: shortBut
implicitHeight: shortBut
colorMode: topRightColor
visibleGlow: false
}
NeuLight {
@ -103,6 +117,7 @@ Item {
implicitWidth: shortBut
implicitHeight: shortBut
colorMode: bottomLeftColor
visibleGlow: false
}
NeuLight {
@ -112,5 +127,7 @@ Item {
implicitWidth: shortBut
implicitHeight: shortBut
colorMode: bottomRightColor
visibleGlow: false
}
}

41
ui/emulator/elements/JoystickButtonBind.qml
View File

@ -9,5 +9,44 @@ import "qrc:/const"
import "qrc:/emulator/components"
JoystickButton {
property var name
property var nameCenter
property var nameLeft
property var nameRight
property var nameTop
property var nameBottom
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "centerButDown"
viewModelProperty: nameCenter
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "leftButDown"
viewModelProperty: nameLeft
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "rightButDown"
viewModelProperty: nameRight
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "topButDown"
viewModelProperty: nameTop
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "bottomButDown"
viewModelProperty: nameBottom
type: MvvmBinding.OneWayToViewModel
}
}

1
ui/emulator/elements/KnobLightBind.qml
View File

@ -17,6 +17,7 @@ KnobLight {
viewModel: mainView.viewModel
viewProperty: "down"
viewModelProperty: name
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {

26
ui/emulator/elements/ModeButtonBind.qml
View File

@ -9,7 +9,31 @@ import "qrc:/const"
import "qrc:/emulator/components"
ModeButton {
property var nameLed
property var name: ""
property var nameIncrease: ""
property var nameDecrease: ""
property var nameLed: ""
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "down"
viewModelProperty: name
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "increase"
viewModelProperty: nameIncrease
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "decrease"
viewModelProperty: nameDecrease
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel

28
ui/emulator/elements/ModeOptionBind.qml
View File

@ -9,8 +9,32 @@ import "qrc:/const"
import "qrc:/emulator/components"
ModeOption {
property var nameLed
property var nameLedOption
property var name: ""
property var nameIncrease: ""
property var nameDecrease: ""
property var nameLed: ""
property var nameLedOption: ""
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "down"
viewModelProperty: name
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "increase"
viewModelProperty: nameIncrease
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel
viewProperty: "decrease"
viewModelProperty: nameDecrease
type: MvvmBinding.OneWayToViewModel
}
MvvmBinding {
viewModel: mainView.viewModel

20
ui/emulator/items/Encoders.qml
View File

@ -16,38 +16,58 @@ Item {
Row {
spacing: 40
ModeOptionBind {
id: modePw
y: 130
name: "modePwCenter"
nameLed: "modePwCenterLed"
nameLedOption: "modeBLed" // x name
nameIncrease: "modePwRight"
nameDecrease: "modePwLeft"
image: "qrc:/icons/encoder/modePw.png"
imageOption: "qrc:/icons/encoder/x.png"
}
ModeOptionBind {
id: modeM
y: 41
name: "modeMCenter"
nameLed: "modeMCenterLed"
nameLedOption: "modeCLed" // y name
nameIncrease: "modeMRight"
nameDecrease: "modeMLeft"
image: "qrc:/icons/encoder/modeM.png"
imageOption: "qrc:/icons/encoder/y.png"
}
ModeOptionBind {
id: modePd
name: "modePdCenter"
nameLed: "modePdCenterLed"
nameLedOption: "modePdLed" // z name
nameIncrease: "modePdRight"
nameDecrease: "modePdLeft"
imageOption: "qrc:/icons/encoder/z.png"
image: "qrc:/icons/encoder/modePd.png"
}
ModeOptionBind {
id: modeC
y: 41
name: "modeCCenter"
nameLed: "modeCCenterLed"
nameLedOption: "modeMLed" // quadrat name
nameIncrease: "modeCRight"
nameDecrease: "modeCLeft"
imageOption: "qrc:/icons/encoder/quadratic.png"
image: "qrc:/icons/encoder/modeC.png"
}
ModeButtonBind {
id: modeB
y: 130
name: "modeBCenter"
nameIncrease: "modeBRight"
nameDecrease: "modeBLeft"
nameLed: "modeBCenterLed"
image: "qrc:/icons/encoder/mode2d.png"
led: 2

14
ui/emulator/items/JoystickCouple.qml
View File

@ -8,7 +8,12 @@ Item {
JoystickButtonBind {
id: leftJoy
name: "depth"
// name: "depth"
nameCenter: "depthCenter"
nameLeft: "depthLeft"
nameRight: "depthRight"
nameTop: "depthTop"
nameBottom: "depthBottom"
x: 1481
}
@ -31,7 +36,12 @@ Item {
JoystickButtonBind {
id: rightJoy
name: "focus"
// name: "focus"
nameCenter: "focusCenter"
nameLeft: "focusLeft"
nameRight: "focusRight"
nameTop: "focusTop"
nameBottom: "focusBottom"
x: 1711
}

56
ui/emulator/items/Joysticks.qml
View File

@ -4,22 +4,62 @@ import "qrc:/emulator/elements"
import "qrc:/const"
Item {
// width: 820
// height: 80
width: childrenRect.width
height: childrenRect.height
anchors.horizontalCenter: parent.horizontalCenter
// x: 550
// width: 820
// height: 80
// x: 550
y: 50
Row {
spacing: 64
JoystickButtonBind { name: "joystick1" }
JoystickButtonBind { name: "joystick2" }
JoystickButtonBind { name: "joystick3" }
JoystickButtonBind { name: "joystick4" }
JoystickButtonBind { name: "joystick5" }
JoystickButtonBind {
id: joystick1
nameCenter: "js1Center"
nameLeft: "js1Left"
nameRight: "js1Right"
nameTop: "js1Top"
nameBottom: "js1Bottom"
}
JoystickButtonBind {
id: joystick2
nameCenter: "js2Center"
nameLeft: "js2Left"
nameRight: "js2Right"
nameTop: "js2Top"
nameBottom: "js2Bottom"
}
JoystickButtonBind {
id: joystick3
nameCenter: "js3Center"
nameLeft: "js3Left"
nameRight: "js3Right"
nameTop: "js3Top"
nameBottom: "js3Bottom"
}
JoystickButtonBind {
id: joystick4
nameCenter: "js4Center"
nameLeft: "js4Left"
nameRight: "js4Right"
nameTop: "js4Top"
nameBottom: "js4Bottom"
}
JoystickButtonBind {
id: joystick5
nameCenter: "js5Center"
nameLeft: "js5Left"
nameRight: "js5Right"
nameTop: "js5Top"
nameBottom: "js5Bottom"
}
}
}

211
ui/emulator/items/Trackball.qml
View File

@ -1,211 +0,0 @@
import QtQuick 2.0
import de.skycoder42.QtMvvm.Core 1.0
import de.skycoder42.QtMvvm.Quick 1.0
import com.example.console 1.0
import "qrc:/ui"
Item {
width: 384 * UI.ratio
height: 384 * UI.ratio
x: 1036 * UI.ratio
y: 656 * UI.ratio
property bool tt: false
property bool tb: false
property bool tr: false
property bool tl: false
property bool ttr: false
property bool tbr: false
property bool ttl: false
property bool tbl: false
onTtChanged: {
if(tt) {
mainView.textLog = mainView.textLog + "Top trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Top trackball key released.\n"
}
}
onTbChanged: {
if(tb) {
mainView.textLog = mainView.textLog + "Bottom trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Bottom trackball key released.\n"
}
}
onTrChanged: {
if(tr) {
mainView.textLog = mainView.textLog + "Right trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Right trackball key released.\n"
}
}
onTlChanged: {
if(tl) {
mainView.textLog = mainView.textLog + "Left trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Left trackball key released.\n"
}
}
onTtrChanged: {
if(ttr) {
mainView.textLog = mainView.textLog + "Top Right trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Top Right trackball key released.\n"
}
}
onTbrChanged: {
if(tbr) {
mainView.textLog = mainView.textLog + "Bottom Right trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Bottom Right trackball key released.\n"
}
}
onTtlChanged: {
if(ttl) {
mainView.textLog = mainView.textLog + "Top Left trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Top Left trackball key released.\n"
}
}
onTblChanged: {
if(tbl) {
mainView.textLog = mainView.textLog + "Bottom Left trackball key pressed.\n"
}
else {
mainView.textLog = mainView.textLog + "Bottom Left trackball key released.\n"
}
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTT"
viewProperty: "tt"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTB"
viewProperty: "tb"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTR"
viewProperty: "tr"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTL"
viewProperty: "tl"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTTR"
viewProperty: "ttr"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTBR"
viewProperty: "tbr"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTTL"
viewProperty: "ttl"
}
MvvmBinding {
viewModel: mainView.viewModel
viewModelProperty: "trackballTBL"
viewProperty: "tbl"
}
Image {
visible: tt
source: "qrc:/ui/icons/trackball/TT.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: tb
source: "qrc:/ui/icons/trackball/TB.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: tr
source: "qrc:/ui/icons/trackball/TR.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: tl
source: "qrc:/ui/icons/trackball/TL.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: ttr
source: "qrc:/ui/icons/trackball/TTR.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: tbr
source: "qrc:/ui/icons/trackball/TBR.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: ttl
source: "qrc:/ui/icons/trackball/TTL.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
visible: tbl
source: "qrc:/ui/icons/trackball/TBL.svg"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
Image {
source: "qrc:/ui/icons/trackball/Trackball.png"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
}

1
ui/ui.qrc
View File

@ -33,7 +33,6 @@
<file>emulator/items/Joysticks.qml</file>
<file>emulator/items/TopLeft.qml</file>
<file>emulator/items/TopRight.qml</file>
<file>emulator/items/Trackball.qml</file>
<file>emulator/items/TrackballGroup.qml</file>
<file>emulator/Emulator.qml</file>
<file>icons/bottomRight/dual.png</file>

Write Preview
Loading…
Cancel
Save