,

Author: tinic

elle-app/elle-electron/preload.d.ts

@@ -3,7 +3,13 @@ declare interface api {
   receive: (channel: any, func: any) => void
 }
 
+declare interface Tool {
+  id: number
+  offset: number
+  description: string
+}
+
 declare interface settings {
-  get: () => Promise<{ diameterMode: boolean; defaultMetricOnStartup: boolean; selectedThreadingTab: number; selectedTurningTab: number; selectedPitchTab: number[]; pitchX: number; pitchZ: number }>
-  save: (settings: { diameterMode: boolean; defaultMetricOnStartup: boolean; selectedThreadingTab: number; selectedTurningTab: number; selectedPitchTab: number[]; pitchX: number; pitchZ: number }) => Promise<boolean>
+  get: () => Promise<{ diameterMode: boolean; defaultMetricOnStartup: boolean; selectedThreadingTab: number; selectedTurningTab: number; selectedPitchTab: number[]; pitchX: number; pitchZ: number; tools?: Tool[]; currentToolIndex?: number; currentToolOffset?: number }>
+  save: (settings: { diameterMode: boolean; defaultMetricOnStartup: boolean; selectedThreadingTab: number; selectedTurningTab: number; selectedPitchTab: number[]; pitchX: number; pitchZ: number; tools?: Tool[]; currentToolIndex?: number; currentToolOffset?: number }) => Promise<boolean>
 }

elle-app/elle-frontend/src/App.vue

@@ -7,13 +7,15 @@ import Dialog from 'primevue/dialog'
 import Numpad from './components/Numpad.vue'
 import DRODisplay from './components/DRODisplay.vue'
 import OperationPreview from './components/OperationPreview.vue'
+import ToolTable from './components/ToolTable.vue'
 import { useHAL } from './composables/useHAL'
 import {
   useCannedCycles,
   ThreadingEntryType,
   TurningEntryType
 } from './composables/useCannedCycles'
 import { useSettings } from './composables/useSettings'
+import { useToolTable } from './composables/useToolTable'
 
 enum EntryType {
   xPosition = 1,
@@ -65,7 +67,10 @@ const {
   xstepperactive,
   zstepperactive,
   currentToolIndex,
-  updateHALOut
+  currentToolOffset,
+  updateHALOut,
+  loadCurrentTool,
+  saveCurrentTool
 } = useHAL()
 
 const {
@@ -179,6 +184,9 @@ const xpitchangle = ref(0)
 // Get settings from composable
 const { metric, diameterMode, defaultMetricOnStartup, selectedThreadingTab, selectedTurningTab, selectedPitchTab, pitchX, pitchZ, isQuitting, loadSettings } = useSettings()
 
+// Get tool table functions
+const { loadTools } = useToolTable()
+
 const cursorpos = ref(0)
 
 enum FeedMode {
@@ -214,6 +222,19 @@ const showBackplot = ref(false)
 const currentOperation = ref<any>(null)
 const pendingOperationExecution = ref<(() => void) | null>(null)
 
+// Tool Table state
+const showToolTable = ref(false)
+
+const openToolTable = () => {
+  showToolTable.value = true
+}
+
+const onToolSelected = (toolId: number, offset: number) => {
+  currentToolIndex.value = toolId
+  currentToolOffset.value = offset
+  showToolTable.value = false
+}
+
 const menuItems = ref([
   { separator: true },
   {
@@ -795,6 +816,11 @@ watch(selectedMenu, () => {
   scheduleHALOut()
 })
 
+// Auto-save current tool when it changes
+watch([currentToolIndex, currentToolOffset], () => {
+  saveCurrentTool()
+})
+
 const PitchPresetSelector = defineAsyncComponent(
   () => import('./components/PitchPresetSelector.vue')
 )
@@ -1080,6 +1106,12 @@ onMounted(async () => {
   // Load settings first
   await loadSettings()
   
+  // Load tool table
+  await loadTools()
+  
+  // Load current tool
+  await loadCurrentTool()
+  
   // Initialize pitch values from settings
   if (pitchX.value > 0) {
     xpitch.value = pitchX.value
@@ -1213,6 +1245,7 @@ onUnmounted(() => {
           @pitch-clicked="pitchClicked"
           @metric-clicked="metricClicked"
           @other-clicked="otherClicked"
+          @tool-clicked="openToolTable"
         />
         <div class="divider-vertical"></div>
         <Numpad class="" @num-pad-clicked="numPadClicked" />
@@ -1438,6 +1471,7 @@ onUnmounted(() => {
           @pitch-clicked="pitchClicked"
           @metric-clicked="threadMetricClicked"
           @other-clicked="otherClicked"
+          @tool-clicked="openToolTable"
         />
         <div class="divider-vertical"></div>
         <Numpad class="" @num-pad-clicked="numPadClicked" />
@@ -2459,6 +2493,14 @@ onUnmounted(() => {
       </div>
     </div>
   </div>
+
+  <!-- Tool Table Modal -->
+  <ToolTable 
+    :visible="showToolTable"
+    @update:visible="showToolTable = $event"
+    :current-tool-id="currentToolIndex"
+    @tool-selected="onToolSelected"
+  />
 </template>
 
 <style scoped>

elle-app/elle-frontend/src/components/DRODisplay.vue

@@ -6,7 +6,8 @@ const emit = defineEmits([
   'zeroClicked',
   'pitchClicked',
   'otherClicked',
-  'metricClicked'
+  'metricClicked',
+  'toolClicked'
 ])
 
 enum NumberEntry {
@@ -197,7 +198,7 @@ const rpmsUnitFormatted = computed(() => `rpm${  ' '.repeat(3)}`)
 
 const toolFormatted = computed(() => {
   const toolNum = props.toolIndex.toString().padStart(2, '0')
-  return `🧰${toolNum}`
+  return `🧰 ${toolNum}`
 })
 
 const xposClicked = () => {
@@ -248,6 +249,10 @@ const unitClicked = () => {
   emit('metricClicked')
 }
 
+const toolClicked = () => {
+  emit('toolClicked')
+}
+
 const xposLabel = computed(() => {
   const prefix = props.diameterMode ? '⌽' : ' '
   return props.entryActive == NumberEntry.xpos
@@ -357,7 +362,13 @@ const zpitchLabel = computed(() => props.entryActive == NumberEntry.zpitch
     >
       mm↔in
     </button>
-    <div class="inline ml-3">{{ toolFormatted }}</div>
+    <button
+      class="dro-font-display-button align-content-center ml-3"
+      style="width: 6em; padding: 0.75rem"
+      @click="toolClicked"
+    >
+      {{ toolFormatted }}
+    </button>
     <br />
     <div style="position: absolute; top: 0.71em">
       <span style="color: #ff0000">{{ xposCursorFormatted }}</span>
@@ -400,4 +411,5 @@ const zpitchLabel = computed(() => props.entryActive == NumberEntry.zpitch
   font-size: 0.6em;
   text-align: center;
 }
+
 </style>

elle-app/elle-frontend/src/composables/useHAL.ts

@@ -387,6 +387,43 @@ export function useHAL() {
     scheduleHALOut()
   }
 
+  const loadCurrentTool = async () => {
+    const userAgent = navigator.userAgent.toLowerCase()
+    if (userAgent.indexOf(' electron/') > -1) {
+      try {
+        if (window.settings && window.settings.get) {
+          const settings = await window.settings.get()
+          if (settings.currentToolIndex !== undefined) {
+            currentToolIndex.value = settings.currentToolIndex
+          }
+          if (settings.currentToolOffset !== undefined) {
+            currentToolOffset.value = settings.currentToolOffset
+          }
+        }
+      } catch (error) {
+        console.error('Failed to load current tool:', error)
+      }
+    }
+  }
+
+  const saveCurrentTool = async () => {
+    const userAgent = navigator.userAgent.toLowerCase()
+    if (userAgent.indexOf(' electron/') > -1) {
+      try {
+        if (window.settings && window.settings.get && window.settings.save) {
+          const currentSettings = await window.settings.get()
+          await window.settings.save({
+            ...currentSettings,
+            currentToolIndex: currentToolIndex.value,
+            currentToolOffset: currentToolOffset.value
+          })
+        }
+      } catch (error) {
+        console.error('Failed to save current tool:', error)
+      }
+    }
+  }
+
   return {
     xpos,
     zpos,
@@ -423,6 +460,8 @@ export function useHAL() {
     scheduleButtonUp,
     getAxisOffset,
     setAxisValue,
-    updateHALOut
+    updateHALOut,
+    loadCurrentTool,
+    saveCurrentTool
   }
 }