summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Assets/Common/Videos/map_movie.mp4bin13005019 -> 0 bytes
-rw-r--r--GUIModel/ACC/ACC_Animation.qml32
-rw-r--r--GUIModel/CruisingRange/CruisingRange.qml8
-rw-r--r--GUIModel/Map/Map.qml8
-rw-r--r--GUIModel/Menu/Menu.qml10
-rw-r--r--GUIModel/Meter/ChargeGuage.qml8
-rw-r--r--GUIModel/Meter/DigitalSpeed.qml8
-rw-r--r--GUIModel/Meter/Mask.qml8
-rw-r--r--GUIModel/Meter/Meter.qml8
-rw-r--r--GUIModel/Meter/Ready.qml8
-rw-r--r--GUIModel/Meter/Ring.qml8
-rw-r--r--GUIModel/Meter/Sideline.qml8
-rw-r--r--GUIModel/Meter/SpeedGuage.qml8
-rw-r--r--GUIModel/Meter/SpeedNeedle.qml8
-rw-r--r--GUIModel/Meter/Tachometer.qml8
-rw-r--r--GUIModel/ShiftPosition/ShiftPosition.qml8
-rw-r--r--GUIModel/TurnByTurn/TurnByTurn.qml8
-rw-r--r--GUIModel/main.qml23
18 files changed, 0 insertions, 177 deletions
diff --git a/Assets/Common/Videos/map_movie.mp4 b/Assets/Common/Videos/map_movie.mp4
deleted file mode 100644
index 38eab0a..0000000
--- a/Assets/Common/Videos/map_movie.mp4
+++ /dev/null
Binary files differ
diff --git a/GUIModel/ACC/ACC_Animation.qml b/GUIModel/ACC/ACC_Animation.qml
index 161b6a2..f87a3c4 100644
--- a/GUIModel/ACC/ACC_Animation.qml
+++ b/GUIModel/ACC/ACC_Animation.qml
@@ -72,38 +72,6 @@ Item {
else if(rootItem.arrow_state == "arrow_normal_near"){
rootItem.arrow_state = "arrow_adas_near"}
}
-
- onTransAdasToMap:{
- adasToMapAnimation_acc3d.start()
-
- }
-
- onTransMapToNormal:{
- ddditemTonormalsize.start()
- if(rootItem.set_state == "set_default"){
- fadeout_in_default.start()
- }else if(rootItem.set_state == "set_middle"){
- fadeout_in_mid.start()
- }else if(rootItem.set_state == "set_near"){
- fadeout_in_near.start()
- }
- cameraTonormalPos.start()
-
-
- if(rootItem.car_state == "adas_default"){
- rootItem.car_state = "normal_default"}
- else if(rootItem.car_state == "adas_middle"){
- rootItem.car_state = "normal_middle"}
- else if(rootItem.car_state == "adas_near"){
- rootItem.car_state = "normal_near"}
-
- if(rootItem.arrow_state == "arrow_adas_default"){
- rootItem.arrow_state = "arrow_normal_default"}
- else if(rootItem.arrow_state == "arrow_adas_middle"){
- rootItem.arrow_state = "arrow_normal_middle"}
- else if(rootItem.arrow_state == "arrow_adas_near"){
- rootItem.arrow_state = "arrow_normal_near"}
- }
}
function lineposchange(){
diff --git a/GUIModel/CruisingRange/CruisingRange.qml b/GUIModel/CruisingRange/CruisingRange.qml
index 7e6bc8f..98986b3 100644
--- a/GUIModel/CruisingRange/CruisingRange.qml
+++ b/GUIModel/CruisingRange/CruisingRange.qml
@@ -39,14 +39,6 @@ Item{
onTransNormalToAdas:{
normalToAdasAnimationFuel.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimationFuel.start()
- }
}
function updateCruisingRangeValue(){
diff --git a/GUIModel/Map/Map.qml b/GUIModel/Map/Map.qml
index f7a4243..d9ab347 100644
--- a/GUIModel/Map/Map.qml
+++ b/GUIModel/Map/Map.qml
@@ -46,14 +46,6 @@ Item {
id: mapParts
visible:false
anchors.fill: parent
- Video {
- id: mapVideo
- autoLoad: true
- anchors.fill: parent
- visible: true
- loops: MediaPlayer.Infinite
- source: "gst-pipeline: filesrc location=" + CurDirPath + "/map_movie.mp4 ! decodebin ! videoconvert ! qtvideosink"
- }
Item{
id:mapMask
diff --git a/GUIModel/Menu/Menu.qml b/GUIModel/Menu/Menu.qml
index c242730..9610b49 100644
--- a/GUIModel/Menu/Menu.qml
+++ b/GUIModel/Menu/Menu.qml
@@ -30,16 +30,6 @@ Item{
menuShade.startAnimationNormalToAdas()
}
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- menuMain.startAnimationMapToNormal()
- menuContents.startAnimationMapToNormal()
- menuShade.startAnimationMapToNormal()
- }
-
onKeyPressed_Up:{
if(menu.state === "open"){
menuMain.incrementIndex()
diff --git a/GUIModel/Meter/ChargeGuage.qml b/GUIModel/Meter/ChargeGuage.qml
index 4e41cad..038df02 100644
--- a/GUIModel/Meter/ChargeGuage.qml
+++ b/GUIModel/Meter/ChargeGuage.qml
@@ -38,14 +38,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
function limitChargeValue(){
diff --git a/GUIModel/Meter/DigitalSpeed.qml b/GUIModel/Meter/DigitalSpeed.qml
index b039b6f..7d9534b 100644
--- a/GUIModel/Meter/DigitalSpeed.qml
+++ b/GUIModel/Meter/DigitalSpeed.qml
@@ -35,14 +35,6 @@ Item{
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
function updateSpeedValue(){
diff --git a/GUIModel/Meter/Mask.qml b/GUIModel/Meter/Mask.qml
index 333f258..56a7497 100644
--- a/GUIModel/Meter/Mask.qml
+++ b/GUIModel/Meter/Mask.qml
@@ -27,14 +27,6 @@ Item{
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /* nop */
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
Item {
diff --git a/GUIModel/Meter/Meter.qml b/GUIModel/Meter/Meter.qml
index 06f9f95..1c7c0fe 100644
--- a/GUIModel/Meter/Meter.qml
+++ b/GUIModel/Meter/Meter.qml
@@ -49,14 +49,6 @@ Item {
onTransNormalToAdas:{
/ *nop */
}
-
- onTransAdasToMap:{
- / *nop */
- }
-
- onTransMapToNormal:{
- / *nop */
- }
}
Sideline {
diff --git a/GUIModel/Meter/Ready.qml b/GUIModel/Meter/Ready.qml
index 87e013c..fd2bde0 100644
--- a/GUIModel/Meter/Ready.qml
+++ b/GUIModel/Meter/Ready.qml
@@ -29,14 +29,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
Image{
diff --git a/GUIModel/Meter/Ring.qml b/GUIModel/Meter/Ring.qml
index 1b1fc59..c41188b 100644
--- a/GUIModel/Meter/Ring.qml
+++ b/GUIModel/Meter/Ring.qml
@@ -29,14 +29,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
Image{
diff --git a/GUIModel/Meter/Sideline.qml b/GUIModel/Meter/Sideline.qml
index ac1eba2..0da9931 100644
--- a/GUIModel/Meter/Sideline.qml
+++ b/GUIModel/Meter/Sideline.qml
@@ -29,14 +29,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- / *nop */
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
Image{
diff --git a/GUIModel/Meter/SpeedGuage.qml b/GUIModel/Meter/SpeedGuage.qml
index 3015b1f..056c00a 100644
--- a/GUIModel/Meter/SpeedGuage.qml
+++ b/GUIModel/Meter/SpeedGuage.qml
@@ -39,14 +39,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /* nop */
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
function limitSpeedValue(){
diff --git a/GUIModel/Meter/SpeedNeedle.qml b/GUIModel/Meter/SpeedNeedle.qml
index 86767c2..b2153ae 100644
--- a/GUIModel/Meter/SpeedNeedle.qml
+++ b/GUIModel/Meter/SpeedNeedle.qml
@@ -39,14 +39,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
function setNeedleAngle(){
diff --git a/GUIModel/Meter/Tachometer.qml b/GUIModel/Meter/Tachometer.qml
index f6b948a..9ad0d7a 100644
--- a/GUIModel/Meter/Tachometer.qml
+++ b/GUIModel/Meter/Tachometer.qml
@@ -34,14 +34,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimation.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimation.start()
- }
}
function limitTachoValue(){
diff --git a/GUIModel/ShiftPosition/ShiftPosition.qml b/GUIModel/ShiftPosition/ShiftPosition.qml
index 54580ad..33e4302 100644
--- a/GUIModel/ShiftPosition/ShiftPosition.qml
+++ b/GUIModel/ShiftPosition/ShiftPosition.qml
@@ -30,14 +30,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimationShift.start()
}
-
- onTransAdasToMap:{
- /**/
- }
-
- onTransMapToNormal:{
- mapToNormalAnimationShift.start()
- }
}
function idchange(){
diff --git a/GUIModel/TurnByTurn/TurnByTurn.qml b/GUIModel/TurnByTurn/TurnByTurn.qml
index b67ea56..9f5c7b0 100644
--- a/GUIModel/TurnByTurn/TurnByTurn.qml
+++ b/GUIModel/TurnByTurn/TurnByTurn.qml
@@ -48,14 +48,6 @@ Item {
onTransNormalToAdas:{
normalToAdasAnimationTbt.start()
}
-
- onTransAdasToMap:{
- adasToMapAnimationTbt.start()
- }
-
- onTransMapToNormal:{
- mapToNormalAnimationTbt.start()
- }
}
diff --git a/GUIModel/main.qml b/GUIModel/main.qml
index 438ec37..5389797 100644
--- a/GUIModel/main.qml
+++ b/GUIModel/main.qml
@@ -22,7 +22,6 @@ import "./FPSItem"
import "./ACC"
import "./CruisingRange"
import "./Header"
-import "./Map"
import "./Menu"
import "./Meter"
import "./ShiftPosition"
@@ -50,8 +49,6 @@ Window {
property string arrow_state : "arrow_normal_default"
property string set_state : "set_default"
signal transNormalToAdas()
- signal transAdasToMap()
- signal transMapToNormal()
signal keyPressed_Up()
signal keyPressed_Down()
@@ -121,10 +118,6 @@ Window {
}
- Map{
- id: map
- }
-
TurnByTurn{
id:turnByTurn
}
@@ -153,22 +146,6 @@ Window {
Keys.onPressed: {
switch(event.key){
- case(Qt.Key_C):
-
- if(mode === 0){
- transNormalToAdas();
- }else if(mode === 1){
- transAdasToMap();
- }else if(mode === 2){
- transMapToNormal()
- }
-
- mode++;
- if(mode > 2) mode = 0;
- break
-
-
-
case(Qt.Key_1):
if(shiftPosition.shiftId < 5) {
shiftPosition.shiftId++