Merge remote-tracking branch 'origin/Pouya-Azimi' into milad

logic/include/viewModel/MainViewModel.h

@@ -4,6 +4,7 @@
 #include <QtMvvmCore/ViewModel>
 #include "utils/Property.h"
 #include "model/Console.h"
+#include <QList>
 
 #define LED_OFF 0x00
 #define LED_COLOR_WHITE 0x01
@@ -140,6 +141,19 @@ class MainViewModel : public QtMvvm::ViewModel
 	JOYSTICK_PROPERTY(js4, Js4)
 	JOYSTICK_PROPERTY(js5, Js5)
 
+    //Probes
+//BUTTON_LED_PROPERTY(probe1, Probe1, false, LED_OFF)
+//BUTTON_LED_PROPERTY(probe2, Probe2, false, LED_OFF)
+//BUTTON_LED_PROPERTY(probe3, Probe3, false, LED_OFF)
+//BUTTON_LED_PROPERTY(probe4, Probe4, false, LED_OFF)
+
+    MVVM_PROPERTY(QList<QVariant>, probeList, QList<QVariant>({"Pouya", "Mamad"}))
+
+    MVVM_PROPERTY(int, currentSelectedProbe1, 0)
+    MVVM_PROPERTY(int, currentSelectedProbe2, 0)
+    MVVM_PROPERTY(int, currentSelectedProbe3, 0)
+    MVVM_PROPERTY(int, currentSelectedProbe4, 0)
+
 public:
 	Q_INVOKABLE explicit MainViewModel(QObject* parent = nullptr);
 

logic/src/viewModel/MainViewModel.cpp

@@ -90,5 +90,5 @@ MainViewModel::MainViewModel(QObject* parent) :
 	CONNECT_LED(depthCenter)
 	CONNECT_LED(focusCenter)
 	CONNECT_LED(depthBottom)
-	CONNECT_LED(focusBottom)
+    CONNECT_LED(focusBottom)
 }

ui/App.qml

@@ -12,9 +12,9 @@ QtMvvmApp {
     onHeightChanged: Const.heightRatio = mvvmApp.height / Const.windowHeight
 
     Component.onCompleted: {
-		width =  Const.windowWidth
+        width = Const.windowWidth / 1.3
-		height = Const.windowHeight
+        height = Const.windowHeight / 1.3
         x = (Screen.width - width) / 2
-		y = (Screen.height - height)
+        y = (Screen.height - height)
     }
 }

ui/emulator/Emulator.qml

@@ -14,6 +14,9 @@ Item {
 		anchors.top: topLeft.bottom
 		anchors.topMargin: 120
 	}
+    TopLeftTop {
+
+    }
 
 	TopLeft {
 		id: topLeft

ui/emulator/elements/ProbeButton.qml

@@ -0,0 +1,361 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.13
+import QtGraphicalEffects 1.13
+
+import "qrc:/theme"
+import "qrc:/const"
+import "qrc:/emulator/components"
+
+
+import de.skycoder42.QtMvvm.Core 1.0
+import de.skycoder42.QtMvvm.Quick 1.0
+import com.example.consoleemulator 1.0
+
+Button {
+    id: button
+
+    //=========================================
+    property var name
+    property var nameLed: name + "Led"
+
+    MvvmBinding {
+        viewModel: mainView.viewModel
+        viewProperty: "down"
+        viewModelProperty: name
+        type: MvvmBinding.OneWayToViewModel
+    }
+
+    MvvmBinding {
+        viewModel: mainView.viewModel
+        viewProperty: "colorMode"
+        viewModelProperty: nameLed
+    }
+    //=========================================
+
+
+    property var image: ""
+    property var radius: Math.min(width / 2, height / 2)
+    property var timeToPress: 100
+    property var border: 6
+
+    property var colorMode: 0 // 0->None; 1->White; 2->Green; 3->Yellow
+    property color lightColor: getColor()
+    property color lightGlow: getColorGlow()
+
+    signal pressed
+    signal released
+
+    implicitWidth: width
+    implicitHeight: height
+
+    onPressed: { button.down = true }
+    onReleased: { button.down = false }
+
+    function getColor() {
+        switch(colorMode) {
+        case(0): return Theme.current.none
+        case(1): return Theme.current.white
+        case(2): return Theme.current.green
+        case(3): return Theme.current.yellow
+        }
+    }
+
+    function getColorGlow() {
+        switch(colorMode) {
+        case(0): return Theme.current.noneGlow
+        case(1): return Theme.current.whiteGlow
+        case(2): return Theme.current.greenGlow
+        case(3): return Theme.current.yellowGlow
+        }
+    }
+
+    width: Const.macroButton
+    height: Const.macroButton*2
+
+    contentItem: Item {
+        id: content
+        anchors.fill: parent
+        z: 1
+
+        Item {
+            property var factor: button.state == "Pressed" ?
+                                     Const.imageScalePressed : Const.imageScale
+            property var elevator: button.state == "Pressed" ? 3 : 0
+
+            anchors.horizontalCenter: parent.horizontalCenter
+            y: (parent.height * (1-factor)) / 2 + elevator
+            width: parent.width * factor
+            height: parent.height * factor
+
+            Behavior on y {
+                NumberAnimation {
+                    duration: timeToPress
+                    easing.type: Easing.InOutQuad
+                }
+            }
+
+            Behavior on width {
+                NumberAnimation {
+                    duration: timeToPress
+                    easing.type: Easing.InOutQuad
+                }
+            }
+
+            Behavior on height {
+                NumberAnimation {
+                    duration: timeToPress
+                    easing.type: Easing.InOutQuad
+                }
+            }
+
+            Image {
+                id: img
+                anchors.fill: parent
+                source: image
+                fillMode: Image.PreserveAspectFit
+                antialiasing: true
+                smooth: true
+            }
+
+            ColorOverlay {
+                anchors.fill: img
+                source: img
+                color: button.state == "Pressed" ? Theme.current.textSelected : Theme.current.text
+                antialiasing: true
+                smooth: true
+            }
+        }
+    }
+
+    background: Item{
+        width: parent.width
+        height: parent.height
+
+        Rectangle {
+            id: backLightGlow
+            property var diffusion: Theme.current.glowRaduis
+            width: backLight.width + diffusion
+            height: backLight.height + diffusion
+            radius: width / 2
+            anchors.horizontalCenter: backLight.horizontalCenter
+            y: - diffusion / 4
+            color: Theme.current.background
+            border {
+                width: diffusion / 2
+                color: Theme.current.background
+            }
+        }
+
+        Rectangle {
+            anchors.fill: backLightGlow
+
+            color: "transparent"
+            layer.enabled: true
+            layer.effect: OpacityMask {
+                maskSource: backLightGlow
+            }
+
+            Rectangle {
+                width: parent.width
+                height: parent.height
+                radius: parent.radius
+                color: "transparent"
+
+                RadialGradient {
+                    anchors.fill: parent
+                    gradient: Gradient {
+                        GradientStop { position: 0.0; color: lightGlow }
+                        GradientStop {
+                            position: 0.5 * (backLight.width - backLightGlow.diffusion / backLightGlow.width)
+                            color: lightGlow
+                        }
+                        GradientStop { position: 0.5; color: "transparent" }
+                        GradientStop { position: 1.0; color: "transparent" }
+                    }
+                }
+            }
+        }
+
+        Rectangle {
+            id: backLight
+            width: parent.width + 4
+            height: parent.height + 4
+            radius: width / 2
+            color: lightColor
+            anchors.top: parent.top
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+
+        Rectangle {
+            id: background
+            anchors.fill: parent
+            radius: button.radius
+            color: Theme.current.button
+
+            Behavior on color {
+                ColorAnimation {
+                    duration: timeToPress
+                    easing.type: Easing.InOutQuad
+                }
+            }
+        }
+
+        Item {
+            id: coloredRing
+            width: parent.width
+            height: parent.height
+
+            Rectangle {
+                id: lightRing
+                width: parent.width
+                height: parent.height
+                radius: width / 2
+                color: "transparent"
+                border{
+                    color: background.color
+                    width: button.border
+                }
+            }
+
+            Item {
+                id: borderGrad
+                implicitWidth: parent.width
+                implicitHeight: parent.height
+                anchors.fill: parent
+
+                layer.enabled: true
+                layer.effect:
+                    OpacityMask {
+                    maskSource: lightRing
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: parent.height
+                    color: background.color
+
+                    LinearGradient {
+                        id: linGrad
+                        anchors.fill: parent
+                        start: Qt.point(0, parent.height)
+                        end: Qt.point(0, 0)
+                        gradient: Gradient {
+                            GradientStop {
+                                id: buttonDown
+                                position: 0
+                                color: Theme.current.shadow
+
+                                Behavior on color {
+                                    ColorAnimation {
+                                        duration: timeToPress
+                                        easing.type: Easing.InOutQuad
+                                    }
+                                }
+                            }
+
+                            GradientStop {
+                                id: buttonUp
+                                position: 1
+                                color: Theme.current.light
+
+                                Behavior on color {
+                                    ColorAnimation {
+                                        duration: timeToPress
+                                        easing.type: Easing.InOutQuad
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        MouseArea {
+            hoverEnabled: true
+            anchors.fill: background
+            onEntered: {
+                button.state = "Hovering"
+            }
+
+            onExited: {
+                button.state = ""
+            }
+
+            onPressed: {
+                button.state = "Pressed"
+                button.pressed()
+            }
+
+            onReleased: {
+                button.released()
+                if (containsMouse)
+                    button.state = "Hovering"
+                else
+                    button.state = ""
+            }
+        }
+    }
+
+    Item {
+        id: hoverLight
+        implicitWidth: parent.width
+        implicitHeight: parent.height
+        anchors.fill: parent
+
+        layer.enabled: true
+        layer.effect: OpacityMask {
+            maskSource: background
+        }
+
+        Rectangle {
+            id: hoverGlow
+            width: 2 * parent.width
+            height: parent.height
+            x: - 2 * parent.width
+            color: "transparent"
+
+            HoverGlow {}
+        }
+    }
+
+    states: [
+        State {
+            name: "Hovering"
+            PropertyChanges {
+                target: hoverGlow
+                x: 0
+            }
+        },
+
+        State {
+            name: "Pressed"
+            PropertyChanges {
+                target: background
+                color: Theme.current.buttonSelected
+            }
+
+            PropertyChanges {
+                target: buttonUp
+                color: Theme.current.shadow
+            }
+
+            PropertyChanges {
+                target: buttonDown
+                color: Theme.current.light
+            }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            from: ""; to: "Hovering"
+            NumberAnimation {
+                properties: "x"
+                duration: 500
+                easing.type: Easing.OutQuad
+            }
+        }
+    ]
+}
+

ui/emulator/items/TopLeft.qml

@@ -5,33 +5,33 @@ import "qrc:/emulator/components"
 import "qrc:/const"
 
 GridLayout {
-	id: topLeft
+    id: topLeft
-	x: 70
+    x: 70
-	y: 120
+    y: 270
-	rows: 3
+    rows: 3
-	columns: 4
+    columns: 4
-	rowSpacing: 36
+    rowSpacing: 36
-	columnSpacing: 36
+    columnSpacing: 36
-
+
-	NeuLight {
+    NeuLight {
-		image: "qrc:/icons/topLeft/power.png"
+        image: "qrc:/icons/topLeft/power.png"
-		Layout.column: 3
+        Layout.column: 3
-		colorMode: 3
+        colorMode: 3
 //		enabled: false
-		// name: "power"
+        // name: "power"
-	}
+    }
-
+
-	KnobLightBind { name: "patient" ; image: "qrc:/icons/topLeft/patient.png" }
+    KnobLightBind { name: "patient" ; image: "qrc:/icons/topLeft/patient.png" }
-	KnobLightBind { name: "utils" ; image: "qrc:/icons/topLeft/utils.png" }
+    KnobLightBind { name: "utils" ; image: "qrc:/icons/topLeft/utils.png" }
-	KnobLightBind { name: "dvd" ; image: "qrc:/icons/topLeft/dvd.png" }
+    KnobLightBind { name: "dvd" ; image: "qrc:/icons/topLeft/dvd.png" }
-	KnobLightBind { name: "report" ; image: "qrc:/icons/topLeft/report.png" }
+    KnobLightBind { name: "report" ; image: "qrc:/icons/topLeft/report.png" }
-	KnobLightBind { name: "probe" ; image: "qrc:/icons/topLeft/probe.png"
+    KnobLightBind { name: "probe" ; image: "qrc:/icons/topLeft/probe.png"
-		Layout.column: 1
+        Layout.column: 1
-		Layout.row: 2
+        Layout.row: 2
-	}
+    }
-
+
-	KnobLightBind { name: "archive" ; image: "qrc:/icons/topLeft/archive.png" }
+    KnobLightBind { name: "archive" ; image: "qrc:/icons/topLeft/archive.png" }
-	KnobLightBind { name: "end" ; image: "qrc:/icons/topLeft/end.png" }
+    KnobLightBind { name: "end" ; image: "qrc:/icons/topLeft/end.png" }
 }
 
 

ui/emulator/items/TopLeftTop.qml

@@ -0,0 +1,87 @@
+import QtQuick 2.0
+import QtQuick.Layouts 1.13
+import QtQuick.Controls 2.12
+import de.skycoder42.QtMvvm.Core 1.0
+import de.skycoder42.QtMvvm.Quick 1.0
+import com.example.consoleemulator 1.0
+
+import "qrc:/emulator/elements"
+import "qrc:/emulator/components"
+import "qrc:/const"
+import "qrc:/qtmvvm/views"
+
+GridLayout {
+    x: 70
+    y: 50
+    rowSpacing: 36
+    columns: 4
+
+    ProbeButton {
+        name: "probe1"
+        image: "qrc:/icons/topLeft/probe.png"
+    }
+    ProbeButton {
+        name: "probe2"
+        image: "qrc:/icons/topLeft/probe.png"
+    }
+    ProbeButton {
+        name: "probe3"
+        image: "qrc:/icons/topLeft/probe.png"
+    }
+    ProbeButton {
+        name: "probe4"
+        image: "qrc:/icons/topLeft/probe.png"
+    }
+    property var widthOfBtns: 130
+    property var probeList: []
+
+    MvvmBinding {
+        viewModel: mainView.viewModel
+        viewProperty: "probeList"
+        viewModelProperty: "probeList"
+    }
+    ComboBox {
+        model: probeList
+        width: widthOfBtns
+        implicitWidth: width
+        implicitHeight: 25
+        MvvmBinding {
+            viewModel: mainView.viewModel
+            viewProperty: "currentIndex"
+            viewModelProperty: "currentSelectedProbe1"
+        }
+    }
+    ComboBox {
+        model: probeList
+        width: widthOfBtns
+        implicitWidth: width
+        implicitHeight: 25
+        MvvmBinding {
+            viewModel: mainView.viewModel
+            viewProperty: "currentIndex"
+            viewModelProperty: "currentSelectedProbe2"
+        }
+    }
+    ComboBox {
+        model: probeList
+        width: widthOfBtns
+        implicitWidth: width
+        implicitHeight: 25
+        MvvmBinding {
+            viewModel: mainView.viewModel
+            viewProperty: "currentIndex"
+            viewModelProperty: "currentSelectedProbe3"
+        }
+    }
+    ComboBox {
+        model: probeList
+        width: widthOfBtns
+        implicitWidth: width
+        implicitHeight: 25
+        MvvmBinding {
+            viewModel: mainView.viewModel
+            viewProperty: "currentIndex"
+            viewModelProperty: "currentSelectedProbe4"
+        }
+    }
+}

ui/ui.qrc

@@ -95,6 +95,8 @@
         <file>emulator/components/SliderBar.qml</file>
         <file>emulator/elements/SliderBarBind.qml</file>
         <file>emulator/items/Setting.qml</file>
+        <file>emulator/items/TopLeftTop.qml</file>
+        <file>emulator/elements/ProbeButton.qml</file>
     </qresource>
     <qresource prefix="/qtmvvm/views">
         <file>MainView.qml</file>