Merge pull request #698 from ISISComputingGroup/Ticket3252_tcb

Ticket3252 tcb

Author: jeremyspencer39171

base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/timechannels/TimeChannelsPanel.java

@@ -190,19 +190,26 @@ private void clearExistingTimeRegimeViews() {
      * 
      * @param method the new calculation method
      */
-    private void setCalculationMethod(CalculationMethod method) {
+    private void setCalculationMethod(final CalculationMethod method) {
         viewModel.setCalculationMethod(method);
-        switch (method) {
-            case USE_TCB_FILE:
-                radioUseTCBFile.setSelection(true);
-                stack.topControl = tcbFilePanel;
-                break;
-            case SPECIFY_PARAMETERS:
-            default:
-                radioSpecifyParameters.setSelection(true);
-                stack.topControl = timeRegimesPanel;
-                break;
-        }
+        updateCalculationMethod();
+    }
+    
+    private void updateCalculationMethod() {
+    	Display.getDefault().asyncExec(new Runnable(){
+    		@Override
+    		public void run() {
+    			
+    			final CalculationMethod method = viewModel.getCalculationMethod();
+    			
+                radioSpecifyParameters.setSelection(method == CalculationMethod.SPECIFY_PARAMETERS);
+                radioUseTCBFile.setSelection(method == CalculationMethod.USE_TCB_FILE);
+                
+    	        stack.topControl = method == CalculationMethod.USE_TCB_FILE ? tcbFilePanel : timeRegimesPanel;
+    	        
+                tcbSettingsSwitchPanel.layout();
+    		}
+    	});
     }
 
     @SuppressWarnings("checkstyle:magicnumber")
@@ -228,7 +235,6 @@ public void widgetSelected(SelectionEvent e) {
                 } else {
                     setCalculationMethod(CalculationMethod.SPECIFY_PARAMETERS);
                 }
-                tcbSettingsSwitchPanel.layout();
             }
         };
         radioSpecifyParameters.addSelectionListener(listener);