From 82f7e8358fe994196919d12b5108e5fdbe32bdce Mon Sep 17 00:00:00 2001
From: Tom Titcombe <t.j.titcombe@gmail.com>
Date: Wed, 23 Jan 2019 10:04:08 +0000
Subject: [PATCH] Only update sample shape from file information if it is empty
Refs #23961
---
scripts/SANS/sans/gui_logic/models/table_model.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/SANS/sans/gui_logic/models/table_model.py b/scripts/SANS/sans/gui_logic/models/table_model.py
index 229b1f95325..45fcf36d509 100644
--- a/scripts/SANS/sans/gui_logic/models/table_model.py
+++ b/scripts/SANS/sans/gui_logic/models/table_model.py
@@ -188,7 +188,8 @@ class TableModel(object):
self._table_entries[row].update_attribute('sample_thickness', rounded_file_thickness)
self._table_entries[row].update_attribute('sample_height', rounded_file_height)
self._table_entries[row].update_attribute('sample_width', rounded_file_width)
- self._table_entries[row].update_attribute('sample_shape', file_information.get_shape())
+ if self.table_entries[row].sample_shape_string == "":
+ self._table_entries[row].update_attribute('sample_shape', file_information.get_shape())
self._table_entries[row].file_finding = False
self.reset_row_state(row)
@@ -470,6 +471,7 @@ class SampleShapeColumnModel(object):
shape_enum_string = SampleShapeColumnModel.SAMPLE_SHAPES_DICT[shape]
self.sample_shape = SampleShape.from_string(shape_enum_string)
self.sample_shape_string = shape_enum_string
+ break
@staticmethod
def get_hint_strategy():
--
GitLab