Merge pull request #686 from PaulHax/seg-tweeks

Default to Segment Groups under Annotations and Simpify CT Presets

Author: PaulHax

src/components/AnnotationsModule.vue

@@ -33,7 +33,7 @@ const MeasurementToolTypes = new Set<string>(
   MeasurementTools.map(({ type }) => type)
 );
 
-const tab = ref(Tabs.Measurements);
+const tab = ref(Tabs.SegmentGroups);
 const { currentTool } = storeToRefs(useToolStore());
 
 function autoFocusTab() {
@@ -58,16 +58,16 @@ watch(
     <tool-controls />
     <v-divider thickness="4" />
     <v-tabs v-model="tab" align-tabs="center" density="compact" class="my-1">
-      <v-tab value="measurements" class="tab-header">Measurements</v-tab>
       <v-tab value="segmentGroups" class="tab-header">Segment Groups</v-tab>
+      <v-tab value="measurements" class="tab-header">Measurements</v-tab>
     </v-tabs>
     <v-window v-model="tab">
-      <v-window-item value="measurements">
-        <measurements-tool-list :tools="MeasurementTools" />
-      </v-window-item>
       <v-window-item value="segmentGroups">
         <segment-group-controls />
       </v-window-item>
+      <v-window-item value="measurements">
+        <measurements-tool-list :tools="MeasurementTools" />
+      </v-window-item>
     </v-window>
   </div>
 </template>

src/components/tools/windowing/WindowLevelControls.vue

@@ -15,7 +15,7 @@ export default defineComponent({
     const windowingStore = useWindowingStore();
     const viewStore = useViewStore();
     const dicomStore = useDICOMStore();
-    const panel = ref(['tags', 'presets']);
+    const panel = ref(['tags', 'presets', 'auto']);
     const windowingDefaults = defaultWindowLevelConfig();
 
     // Get the relevant view ids
@@ -126,7 +126,7 @@ export default defineComponent({
       <v-expansion-panels v-model="panel" multiple>
         <v-expansion-panel value="tags" v-if="tags.length">
           <v-expansion-panel-title>
-            Data-Specific Presets
+            File Specific Presets
           </v-expansion-panel-title>
           <v-expansion-panel-text>
             <v-radio-group v-model="wlOptions" hide-details>
@@ -141,24 +141,18 @@ export default defineComponent({
           </v-expansion-panel-text>
         </v-expansion-panel>
         <v-expansion-panel v-if="showCtPresets" value="presets">
-          <v-expansion-panel-title>Presets</v-expansion-panel-title>
+          <v-expansion-panel-title>CT Presets</v-expansion-panel-title>
           <v-expansion-panel-text>
             <v-radio-group v-model="wlOptions" hide-details>
-              <template v-if="showCtPresets">
-                <p>CT Presets</p>
-                <hr />
-                <div v-for="(options, category) in WLPresetsCT" :key="category">
-                  <p>{{ parseLabel(category) }}</p>
-                  <v-radio
-                    v-for="(value, key) in options"
-                    :key="key"
-                    :label="parseLabel(key)"
-                    :value="value"
-                    density="compact"
-                    class="ml-3"
-                  />
-                </div>
-              </template>
+              <div v-for="(wl, name) in WLPresetsCT" :key="name">
+                <v-radio
+                  :key="name"
+                  :label="parseLabel(name)"
+                  :value="wl"
+                  density="compact"
+                  class="ml-3"
+                />
+              </div>
             </v-radio-group>
           </v-expansion-panel-text>
         </v-expansion-panel>

src/constants.ts

@@ -82,57 +82,25 @@ export const WL_AUTO_DEFAULT = 'FullRange';
 export const WL_HIST_BINS = 512;
 
 export const WLPresetsCT = {
-  Head: {
-    Brain: {
-      width: 80,
-      level: 40,
-    },
-    Subdural: {
-      width: 300,
-      level: 100,
-    },
-    Stroke: {
-      width: 40,
-      level: 40,
-    },
-    Bones: {
-      width: 2800,
-      level: 600,
-    },
-    SoftTissue: {
-      width: 400,
-      level: 60,
-    },
-  },
-  Chest: {
-    Lungs: {
-      width: 1500,
-      level: -600,
-    },
-    Mediastinum: {
-      width: 350,
-      level: 50,
-    },
-  },
-  Abdomen: {
-    SoftTissue: {
-      width: 400,
-      level: 50,
-    },
-    Liver: {
-      width: 150,
-      level: 30,
-    },
-  },
-  Spine: {
-    SoftTissue: {
-      width: 250,
-      level: 50,
-    },
-    Bones: {
-      width: 1800,
-      level: 400,
-    },
+  Bones: {
+    width: 1000,
+    level: 400,
+  },
+  Air: {
+    width: 1000,
+    level: -426,
+  },
+  SoftTissue: {
+    width: 350,
+    level: 50,
+  },
+  Lungs: {
+    width: 1500,
+    level: -600,
+  },
+  Brain: {
+    width: 80,
+    level: 40,
   },
 };