shao 20 hours ago
parent
commit
ffc696bbc1
2 changed files with 33 additions and 123 deletions
  1. 1 1
      common/options.go
  2. 32 122
      config/options.toml

+ 1 - 1
common/options.go

@@ -43,7 +43,7 @@ type AprCboOptions struct {
 	CompressionForce []Float64ValueEntry `toml:"compression_force"`
 	Dose             []Float64ValueEntry `toml:"dose"`
 	ExpCorrection    []Float64ValueEntry `toml:"exp_correction"`
-	ExposureMode     []Float64ValueEntry `toml:"exposure_mode"`
+	ExposureMode     []StringValueEntry  `toml:"exposure_mode"`
 	Focus            []Float64ValueEntry `toml:"focus"`
 	GridType         []Float64ValueEntry `toml:"grid_type"`
 	PatientSize      []StringValueEntry  `toml:"patient_size"`

+ 32 - 122
config/options.toml

@@ -33,12 +33,17 @@ apr_cbo.exp_correction = [
 ]
 
 apr_cbo.exposure_mode = [
-    { text = "3 pt",  value = 0 },
-    { text = "2 pt",  value = 1 },
-    { text = "AEC",   value = 2 },
-    { text = "AEC2P", value = 3 },
-    { text = "1 pt",  value = 4 },
-    { text = "1pt with ext.exp", value = 5 },
+    { text = "Time", value = "Time" },
+    { text = "mAs", value = "mAs" },
+    { text = "AEC", value = "AEC" },
+    { text = "AEC2P", value = "AEC2P" },
+    { text = "AEC1P", value = "AEC1P" },
+    { text = "AECreduceMA", value = "AECreduceMA" },
+    { text = "Time Mode", value = "Time_Mode" },
+    { text = "mAs Mode", value = "mAs_Mode" },
+    { text = "AEC_Time Mode", value = "AEC_Time_Mode" },
+    { text = "AEC_mAs Mode", value = "AEC_mAs_Mode" },
+    { text = "AEC Mode", value = "AEC_Mode" },
 ]
 
 apr_cbo.focus = [
@@ -47,37 +52,15 @@ apr_cbo.focus = [
 ]
 
 apr_cbo.grid_type = [
-    { text = "0",   value = 0 },
-    { text = "150", value = 2 },
+    { text = "No Grid", value = 0 },
+    { text = "115", value = 1 },
+    { text = "Universal", value = 2 },
     { text = "180", value = 3 },
 ]
 
-apr_cbo.patient_size = [
-    { text = "Large",  value = "Large" },
-    { text = "Medium", value = "Medium" },
-    { text = "Small",  value = "Small" },
-    { text = "Custom", value = "Custom" },
-    { text = "All",    value = "All" },
-]
-
-apr_cbo.tube_load = [
-    { text = "80%",  value = 0.8 },
-    { text = "100%", value = 1 },
-]
-
 apr_cbo.kv = [
     { text = "50",  value = 50 },
-    { text = "55",  value = 55 },
-    { text = "65",  value = 65 },
-    { text = "70",  value = 70 },
-    { text = "75",  value = 75 },
-    { text = "80",  value = 80 },
-    { text = "85",  value = 85 },
-    { text = "90",  value = 90 },
-    { text = "95",  value = 95 },
-    { text = "100", value = 100 },
-    { text = "110", value = 110 },
-    { text = "120", value = 120 }
+    { text = "60",  value = 60 },
 ]
 
 apr_cbo.ma = [
@@ -103,35 +86,11 @@ apr_cbo.ma = [
 ]
 
 apr_cbo.mas = [
-    { text = "0.5",  value = 0.5 },
-    { text = "1",    value = 1 },
-    { text = "1.6",  value = 1.6 },
-    { text = "2",    value = 2 },
-    { text = "2.4",  value = 2.4 },
     { text = "2.5",  value = 2.5 },
-    { text = "3.2",  value = 3.2 },
-    { text = "4",    value = 4 },
-    { text = "5",    value = 5 },
-    { text = "6.3",  value = 6.3 },
-    { text = "6.4",  value = 6.4 },
-    { text = "8",    value = 8 },
-    { text = "10",   value = 10 },
     { text = "12.5", value = 12.5 },
-    { text = "12.8", value = 12.8 },
-    { text = "16",   value = 16 },
-    { text = "20",   value = 20 },
-    { text = "25",   value = 25 },
-    { text = "25.6", value = 25.6 },
-    { text = "32",   value = 32 },
-    { text = "40",   value = 40 },
-    { text = "50",   value = 50 },
-    { text = "64",   value = 64 },
-    { text = "80",   value = 80 },
-    { text = "100",  value = 100 }
 ]
 
 apr_cbo.ms = [
-    { text = "2.5",  value = 2.5 },
     { text = "10",   value = 10 },
     { text = "12",   value = 12 },
     { text = "12.5", value = 12.5 },
@@ -157,14 +116,17 @@ apr_cbo.ms = [
     { text = "3200", value = 3200 },
 ]
 
-rad_images.auto_filming = [
-    { text = "Off", value = 0 },
-    { text = "When study is closed", value = 1 },
+apr_cbo.patient_size = [
+    { text = "Large",  value = "Large" },
+    { text = "Medium", value = "Medium" },
+    { text = "Small",  value = "Small" },
+    { text = "Custom", value = "Custom" },
+    { text = "All",    value = "All" },
 ]
 
-rad_images.auto_sending = [
-    { text = "Off", value = 0 },
-    { text = "When study is closed", value = 1 },
+apr_cbo.tube_load = [
+    { text = "80%",  value = 0.8 },
+    { text = "100%", value = 1 },
 ]
 
 hardware_cbo.baud = [
@@ -189,11 +151,11 @@ hardware_cbo.baud = [
 ]
 
 hardware_cbo.byte_size = [
-    { text = "1",    value = 1 },
-    { text = "2",    value = 2 },
-    { text = "3",    value = 3 },
     { text = "4",    value = 4 },
     { text = "5",    value = 5 },
+    { text = "6",    value = 6 },
+    { text = "7",    value = 7 },
+    { text = "8",    value = 8 },
 ]
 
 hardware_cbo.calibration_mode = [
@@ -208,6 +170,10 @@ hardware_cbo.control_level = [
 
 ]
 
+handware_cbo.dap_type = [
+
+]
+
 hardware_cbo.default_rotation = [
 
 ]
@@ -276,34 +242,6 @@ hardware_cbo.xray_tube_vendor = [
 
 ]
 
-image_display_item_types = [
-
-]
-
-img_proc.brightness_offset = [
-
-]
-
-img_proc.contrast_offset = [
-
-]
-
-lut_curve_type = [
-
-]
-
-labeling = [
-
-]
-
-length_unit = [
-
-]
-
-network_cbo.print_size = [
-
-]
-
 patient.category_option = [
 
 ]
@@ -336,18 +274,10 @@ protocol_cbo.collimator_size = [
 
 ]
 
-protocol_cbo.curve_type = [
-
-]
-
 protocol_cbo.film_orientation = [
 
 ]
 
-protocol_cbo.film_size = [
-
-]
-
 protocol_cbo.image_laterality = [
 
 ]
@@ -400,26 +330,6 @@ protocol.process_image_style = [
 
 ]
 
-sex_full_option = [
-
-]
-
-sex_option = [
-
-]
-
-sex_neuterted_option = [
-
-]
-
-thickness_unit = [
-
-]
-
-weight_unit = [
-
-]
-
 workflow_cbo.crop_mode = [
 
 ]
@@ -440,6 +350,6 @@ workflow_cbo.tag_location = [
 
 ]
 
-workflow_cbo.x_shutter_offset = [
+workflow_cbo.xshutter_offset = [
 
 ]