Merge pull request #1647 from OpenC3/cursor

Default screen cursor, pointer only on linked screens
OpenC3 · Oct 24, 2024 · 2f7f8d0 · 2f7f8d0
2 parents 904875b + 4111050
commit 2f7f8d0
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 3 deletions.
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/screens/rollup.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/screens/rollup.txt
@@ -11,7 +11,7 @@ HORIZONTAL
     SETTING SCREEN <%= target_name %> LIMITS
     SETTING TLM <%= target_name %> HEALTH_STATUS TEMP1
   ROLLUP equipment "Processor" "CPU"
-    SETTING SCREEN <%= target_name %> ADCS
+    # No SCREEN should display without pointer cursor
     SETTING TLM <%= target_name %> HEALTH_STATUS TEMP4
   ROLLUP satellite-transmit "Satellite" "all temps"
     SETTING SCREEN <%= target_name %> HS

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/rollup.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/rollup.txt
@@ -11,7 +11,7 @@ HORIZONTAL
     SETTING SCREEN <%= target_name %> LIMITS
     SETTING TLM <%= target_name %> HEALTH_STATUS TEMP1
   ROLLUP equipment "Processor" "CPU"
-    SETTING SCREEN <%= target_name %> ADCS
+    # No SCREEN should display without pointer cursor
     SETTING TLM <%= target_name %> HEALTH_STATUS TEMP4
   ROLLUP satellite-transmit "Satellite" "all temps"
     SETTING SCREEN <%= target_name %> HS

diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Openc3Screen.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Openc3Screen.vue
@@ -25,7 +25,7 @@
 
 <template>
   <div :style="computedStyle" ref="bar">
-    <v-card :min-height="height" :min-width="width">
+    <v-card :min-height="height" :min-width="width" style="cursor: default">
       <v-system-bar>
         <div v-show="errors.length !== 0">
           <v-tooltip top>

diff --git a/...mos-init/plugins/packages/openc3-tool-common/src/components/widgets/CanvasimageWidget.vue b/...mos-init/plugins/packages/openc3-tool-common/src/components/widgets/CanvasimageWidget.vue
@@ -28,6 +28,7 @@
     :y="parameters[2]"
     :width="width"
     :height="height"
+    :style="pointerStyle"
     @click="clickHandler"
   />
 </template>
@@ -58,6 +59,17 @@ export default {
       }
       return '100%'
     },
+    pointerStyle() {
+      if (this.screenTarget && this.screenName) {
+        return {
+          cursor: 'pointer',
+        }
+      } else {
+        return {
+          cursor: 'default',
+        }
+      }
+    },
   },
   created: function () {
     // Look through the settings and get a reference to the screen

diff --git a/...nit/plugins/packages/openc3-tool-common/src/components/widgets/CanvasimagevalueWidget.vue b/...nit/plugins/packages/openc3-tool-common/src/components/widgets/CanvasimagevalueWidget.vue
@@ -31,6 +31,7 @@
       :y="image.y"
       :width="image.width"
       :height="image.height"
+      :style="pointerStyle"
       @click="clickHandler"
     />
     <image
@@ -41,6 +42,7 @@
       :y="defaultImage.y"
       :width="defaultImage.width"
       :height="defaultImage.height"
+      :style="pointerStyle"
       @click="clickHandler"
     />
   </g>
@@ -72,6 +74,17 @@ export default {
     showDefault: function () {
       return !this.images.some((image) => image.value == this.selectedValue)
     },
+    pointerStyle() {
+      if (this.screenTarget && this.screenName) {
+        return {
+          cursor: 'pointer',
+        }
+      } else {
+        return {
+          cursor: 'default',
+        }
+      }
+    },
   },
   created: function () {
     // Look through the settings and get a reference to the screen

diff --git a/...3-cosmos-init/plugins/packages/openc3-tool-common/src/components/widgets/RollupWidget.vue b/...3-cosmos-init/plugins/packages/openc3-tool-common/src/components/widgets/RollupWidget.vue
@@ -21,6 +21,7 @@
     v-bind="attrs"
     v-on="on"
     class="rux-icon"
+    :style="pointerStyle"
     :icon="icon"
     :status="status"
     :label="label"
@@ -76,6 +77,17 @@ export default {
       }
       return state
     },
+    pointerStyle() {
+      if (this.screenTarget && this.screenName) {
+        return {
+          cursor: 'pointer',
+        }
+      } else {
+        return {
+          cursor: 'default',
+        }
+      }
+    },
   },
   created: function () {
     this.icon = this.parameters[0]