Refine > Optimize Transitions dialog

pwiz_tools/Shared/Common/DataBinding/Internal/AbstractQuery.cs

@@ -190,6 +190,7 @@ protected IEnumerable<RowItem> Sort(CancellationToken cancellationToken, DataSch
             var sortRows = new SortRow[unsortedRows.Count];
             for (int iRow = 0; iRow < sortRows.Length; iRow++)
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 sortRows[iRow] = new SortRow(cancellationToken, dataSchema, sortDescriptions, unsortedRows[iRow], iRow);
             }
             Array.Sort(sortRows);

pwiz_tools/Shared/CommonUtil/Collections/IndexedList.cs

@@ -103,6 +103,10 @@ public int IndexOf(T item)
 
         public void Insert(int index, T item)
         {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
             if (index == Count)
             {
                 Add(item);
@@ -128,6 +132,10 @@ public T this[int index]
             }
             set
             {
+                if (null == value)
+                {
+                    throw new ArgumentNullException();
+                }
                 var oldValue = _items[index];
                 _itemIndexes.Remove(oldValue);
                 _itemIndexes.Add(value, index);

pwiz_tools/Skyline/Controls/Databinding/CandidatePeakForm.cs

@@ -413,7 +413,7 @@ public void DocumentOnChanged(object sender, DocumentChangedEventArgs args)
             }
         }
 
-        public new bool IsComplete
+        public override bool IsComplete
         {
             get
             {

pwiz_tools/Skyline/Controls/Databinding/DataboundGridForm.cs

@@ -198,7 +198,7 @@ public DataGridViewColumn FindColumn(PropertyPath propertyPath)
             return databoundGridControl.FindColumn(propertyPath);
         }
 
-        public bool IsComplete
+        public virtual bool IsComplete
         {
             get
             {

pwiz_tools/Skyline/Controls/Graphs/Calibration/CalibrationCurveOptionsDlg.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Forms;
+using pwiz.Skyline.Model.DocSettings.AbsoluteQuantification;
+using pwiz.Skyline.Util;
+
+namespace pwiz.Skyline.Controls.Graphs.Calibration
+{
+    public partial class CalibrationCurveOptionsDlg : FormEx
+    {
+        public CalibrationCurveOptionsDlg()
+        {
+            InitializeComponent();
+            checkedListBoxSampleTypes.Items.AddRange(SampleType.ALL.ToArray());
+            var options = Properties.Settings.Default.CalibrationCurveOptions;
+            textLineWidth.Text = options.LineWidth.ToString(CultureInfo.CurrentCulture);
+            GraphFontSize.PopulateCombo(textSizeComboBox, options.FontSize);
+            cbxLogXAxis.Checked = options.LogXAxis;
+            cbxLogYAxis.Checked = options.LogYAxis;
+            for (int i = 0; i < checkedListBoxSampleTypes.Items.Count; i++)
+            {
+                checkedListBoxSampleTypes.SetItemChecked(i, options.DisplaySampleTypes.Contains(checkedListBoxSampleTypes.Items[i]));
+            }
+
+            cbxSingleBatch.Checked = options.SingleBatch;
+            cbxShowLegend.Checked = options.ShowLegend;
+            cbxShowFiguresOfMerit.Checked = options.ShowFiguresOfMerit;
+            cbxShowBootstrapCurves.Checked = options.ShowBootstrapCurves;
+        }
+
+        public void OkDialog()
+        {
+            var options = Properties.Settings.Default.CalibrationCurveOptions;
+            options = options.ChangeLineWidth((float)textLineWidth.Value)
+                .ChangeFontSize(GraphFontSize.GetFontSize(textSizeComboBox).PointSize)
+                .ChangeLogXAxis(cbxLogXAxis.Checked)
+                .ChangeLogYAxis(cbxLogYAxis.Checked)
+                .ChangeDisplaySampleTypes(checkedListBoxSampleTypes.CheckedItems.OfType<SampleType>())
+                .ChangeSingleBatch(cbxSingleBatch.Checked)
+                .ChangeShowLegend(cbxShowLegend.Checked)
+                .ChangeShowFiguresOfMerit(cbxShowFiguresOfMerit.Checked)
+                .ChangeShowBootstrapCurves(cbxShowBootstrapCurves.Checked);
+            Properties.Settings.Default.CalibrationCurveOptions = options;
+            DialogResult = DialogResult.OK;
+        }
+
+        private void btnOk_Click(object sender, EventArgs e)
+        {
+            OkDialog();
+        }
+    }
+}