Merge pull request #1781 from HEXRD/various-fixes

Various fixes

Author: psavery

hexrdgui/calibration/calibration_dialog.py

@@ -551,15 +551,21 @@ def mirror_constraints_from_first_detector(self):
             for transform, transform_vary in statuses.items():
                 det_transform = detector['transform'][transform]
                 for k, v in transform_vary.items():
-                    det_transform[k]['_param'].vary = v
+                    param = det_transform[k]['_param']
+                    if param.expr is not None:
+                        # Skip over expression parameters
+                        continue
+
+                    param.vary = v
                     det_transform[k]['_vary'] = v
 
             if self.delta_boundaries:
                 # Mirror the delta values too
                 for transform, delta_dict in deltas.items():
                     det_transform = detector['transform'][transform]
                     for k, v in delta_dict.items():
-                        det_transform[k]['_param'].delta = v
+                        param = det_transform[k]['_param']
+                        param.delta = v
                         det_transform[k]['_delta'] = v
 
         self.tree_view.reset_gui()

hexrdgui/main_window.py

@@ -1641,7 +1641,7 @@ def on_action_open_preconfigured_instrument_file_triggered(self):
         aliases = {
             'dcs.yml': 'DCS',
             'dual_dexelas.yml': 'Dual Dexelas',
-            'rigaku.yml': 'Rigaku',
+            'rigaku.hexrd': 'Rigaku',
             'varex.yml': 'Varex',
         }
 

hexrdgui/resources/ui/llnl_import_tool_dialog.ui

@@ -301,9 +301,6 @@
           </property>
           <item row="0" column="2">
            <widget class="QPushButton" name="add_transform">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
             <property name="text">
              <string>Add Transform</string>
             </property>
@@ -318,9 +315,6 @@
           </item>
           <item row="0" column="1">
            <widget class="QComboBox" name="transforms">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
             <item>
              <property name="text">
               <string>None</string>