Merge pull request #116 from africanmathsinitiative/master

updating branch

instat/UserControls/DataGrid/ReoGrid/ucrColumnMetadataReoGrid.vb

@@ -40,9 +40,13 @@ Public Class ucrColumnMetadataReoGrid
         rngDataRange = New RangePosition(0, 0, grdData.CurrentWorksheet.Rows, grdData.CurrentWorksheet.Columns)
         grdData.CurrentWorksheet.SetRangeDataFormat(rngDataRange, DataFormat.CellDataFormatFlag.Text)
 
+        Dim iColumnIndex As Integer = GetColumnIndex("Signif_Figures")
         For i = 0 To grdData.CurrentWorksheet.Rows - 1
             For j = 0 To grdData.CurrentWorksheet.Columns - 1
                 grdData.CurrentWorksheet(row:=i, col:=j) = columnMetaData.Data(i, j)
+                If grdData.CurrentWorksheet.Item(row:=i, col:=j) = "list" AndAlso iColumnIndex >= 0 Then
+                    grdData.CurrentWorksheet.GetCell(row:=i, col:=iColumnIndex).IsReadOnly = True
+                End If
             Next
             grdData.CurrentWorksheet.RowHeaders.Item(i).Text = columnMetaData.strRowName(i)
         Next
@@ -60,6 +64,17 @@ Public Class ucrColumnMetadataReoGrid
         End If
     End Sub
 
+    Private Function GetColumnIndex(strColName As String) As Integer
+        If grdData.CurrentWorksheet IsNot Nothing Then
+            For i As Integer = 0 To grdData.CurrentWorksheet.Columns - 1
+                If grdData.CurrentWorksheet.ColumnHeaders(i).Text = strColName Then
+                    Return i
+                End If
+            Next
+        End If
+        Return -1
+    End Function
+
     Public Function GetSelectedColumns() As List(Of String) Implements IColumnMetaDataGrid.GetSelectedColumns
         Dim lstColumns As New List(Of String)
         Dim clsGridRangePosition As RangePosition = grdData.CurrentWorksheet.SelectionRange

instat/dlgBoxPlot.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="contextMenuStripOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>