Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update #92

Merged
merged 27 commits into from
Jul 8, 2019
Merged

update #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
605f12b
Merge pull request #30 from africanmathsinitiative/master
Ivanluv Jun 21, 2019
4d3be34
Merge pull request #46 from africanmathsinitiative/master
Ogik99 Jun 24, 2019
a90f30d
Corrected menu names for most dialogs
Wycklife Jul 2, 2019
182dc06
More edit
Wycklife Jul 2, 2019
95246be
More edits
Wycklife Jul 2, 2019
4bca12c
More edit
Wycklife Jul 2, 2019
4352744
Minor edit
Wycklife Jul 2, 2019
076e0ba
minor edits on dlgimportDatasete
Ivanluv Jul 2, 2019
9ac2268
Minor edit
Wycklife Jul 2, 2019
f5bc942
Merge pull request #47 from africanmathsinitiative/master
Ogik99 Jul 2, 2019
830e0d9
Changing the default directory for Import netCDF dialog
Ivanluv Jul 2, 2019
0153c72
Merge pull request #5404 from Ivanluv/NetCDFDirectory
maxwellfundi Jul 2, 2019
013da2c
Added geom_conotur
Ogik99 Jul 2, 2019
e4fc327
Added colour, show.legend, group and na.rm layer parameters
Ogik99 Jul 2, 2019
8e67e68
Correcting names for corruption dialogs
Wycklife Jul 3, 2019
53da025
More edits
Wycklife Jul 3, 2019
24ad5bc
More edits
Wycklife Jul 3, 2019
e427628
More edits
Wycklife Jul 3, 2019
35e2cfb
More edits
Wycklife Jul 3, 2019
19376c0
More edits
Wycklife Jul 3, 2019
20a7825
Minor edit
Wycklife Jul 3, 2019
162216e
Merge pull request #5405 from Ogik99/geom_contour
maxwellfundi Jul 4, 2019
592e030
incresing the size of file textbox
Ivanluv Jul 5, 2019
6b047d6
Merge pull request #5403 from Ivanluv/RightJustify
maxwellfundi Jul 5, 2019
de19969
Merge pull request #5400 from Wycklife/mnuNaming
maxwellfundi Jul 5, 2019
e819021
Merge branch 'master' into dlgcorruption
maxwellfundi Jul 5, 2019
324fafb
Merge pull request #5412 from Wycklife/dlgcorruption
maxwellfundi Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions instat/dlgDefineCRI.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 81 additions & 36 deletions instat/dlgDefineCRI.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,14 @@
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cmdEdit.Location" type="System.Drawing.Point, System.Drawing">
<value>507, 251</value>
<value>676, 309</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cmdEdit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="cmdEdit.Size" type="System.Drawing.Size, System.Drawing">
<value>67, 23</value>
<value>89, 28</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cmdEdit.TabIndex" type="System.Int32, mscorlib">
Expand All @@ -144,10 +148,13 @@
<value>12</value>
</data>
<data name="cmdDelete.Location" type="System.Drawing.Point, System.Drawing">
<value>583, 251</value>
<value>777, 309</value>
</data>
<data name="cmdDelete.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="cmdDelete.Size" type="System.Drawing.Size, System.Drawing">
<value>67, 23</value>
<value>89, 28</value>
</data>
<data name="cmdDelete.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
Expand All @@ -168,10 +175,13 @@
<value>11</value>
</data>
<data name="cmdAddComponent.Location" type="System.Drawing.Point, System.Drawing">
<value>379, 92</value>
<value>505, 113</value>
</data>
<data name="cmdAddComponent.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="cmdAddComponent.Size" type="System.Drawing.Size, System.Drawing">
<value>110, 23</value>
<value>147, 28</value>
</data>
<data name="cmdAddComponent.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
Expand All @@ -195,10 +205,13 @@
<value>True</value>
</data>
<data name="lblReceiverRedFlag.Location" type="System.Drawing.Point, System.Drawing">
<value>224, 44</value>
<value>299, 54</value>
</data>
<data name="lblReceiverRedFlag.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="lblReceiverRedFlag.Size" type="System.Drawing.Size, System.Drawing">
<value>64, 13</value>
<value>84, 17</value>
</data>
<data name="lblReceiverRedFlag.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -222,10 +235,13 @@
<value>True</value>
</data>
<data name="lblWeights.Location" type="System.Drawing.Point, System.Drawing">
<value>224, 98</value>
<value>299, 121</value>
</data>
<data name="lblWeights.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="lblWeights.Size" type="System.Drawing.Size, System.Drawing">
<value>49, 13</value>
<value>63, 17</value>
</data>
<data name="lblWeights.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand All @@ -249,10 +265,13 @@
<value>True</value>
</data>
<data name="lblIndexComponentsList.Location" type="System.Drawing.Point, System.Drawing">
<value>507, 46</value>
<value>676, 57</value>
</data>
<data name="lblIndexComponentsList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="lblIndexComponentsList.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 13</value>
<value>128, 17</value>
</data>
<data name="lblIndexComponentsList.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
Expand All @@ -273,10 +292,13 @@
<value>7</value>
</data>
<data name="lstIndexComponents.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 63</value>
<value>675, 78</value>
</data>
<data name="lstIndexComponents.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="lstIndexComponents.Size" type="System.Drawing.Size, System.Drawing">
<value>171, 182</value>
<value>227, 223</value>
</data>
<data name="lstIndexComponents.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
Expand All @@ -297,10 +319,13 @@
<value>True</value>
</data>
<data name="lblModelPreview.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 332</value>
<value>11, 409</value>
</data>
<data name="lblModelPreview.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="lblModelPreview.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 13</value>
<value>61, 17</value>
</data>
<data name="lblModelPreview.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
Expand All @@ -321,10 +346,13 @@
<value>2</value>
</data>
<data name="ucrSaveCRI.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 380</value>
<value>13, 468</value>
</data>
<data name="ucrSaveCRI.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>7, 6, 7, 6</value>
</data>
<data name="ucrSaveCRI.Size" type="System.Drawing.Size, System.Drawing">
<value>276, 24</value>
<value>368, 30</value>
</data>
<data name="ucrSaveCRI.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
Expand All @@ -342,10 +370,13 @@
<value>0</value>
</data>
<data name="ucrInputCRIPreview.Location" type="System.Drawing.Point, System.Drawing">
<value>64, 329</value>
<value>85, 405</value>
</data>
<data name="ucrInputCRIPreview.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>9, 7, 9, 7</value>
</data>
<data name="ucrInputCRIPreview.Size" type="System.Drawing.Size, System.Drawing">
<value>452, 45</value>
<value>603, 55</value>
</data>
<data name="ucrInputCRIPreview.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
Expand All @@ -363,10 +394,13 @@
<value>1</value>
</data>
<data name="ucrNudWeights.Location" type="System.Drawing.Point, System.Drawing">
<value>279, 95</value>
<value>372, 117</value>
</data>
<data name="ucrNudWeights.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>7, 6, 7, 6</value>
</data>
<data name="ucrNudWeights.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 20</value>
<value>67, 25</value>
</data>
<data name="ucrNudWeights.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
Expand All @@ -387,10 +421,13 @@
<value>True</value>
</data>
<data name="ucrGridWeights.Location" type="System.Drawing.Point, System.Drawing">
<value>226, 121</value>
<value>301, 149</value>
</data>
<data name="ucrGridWeights.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>7, 6, 7, 6</value>
</data>
<data name="ucrGridWeights.Size" type="System.Drawing.Size, System.Drawing">
<value>263, 202</value>
<value>350, 248</value>
</data>
<data name="ucrGridWeights.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand All @@ -411,16 +448,19 @@
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
<value>8, 16</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>682, 463</value>
<value>909, 570</value>
</data>
<data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 409</value>
<value>13, 503</value>
</data>
<data name="ucrBase.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
<value>410, 52</value>
<value>547, 64</value>
</data>
<data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
Expand All @@ -438,14 +478,13 @@
<value>13</value>
</data>
<data name="ucrSelectorCRI.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 10</value>
<value>13, 12</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ucrSelectorCRI.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="ucrSelectorCRI.Size" type="System.Drawing.Size, System.Drawing">
<value>210, 180</value>
<value>280, 222</value>
</data>
<data name="ucrSelectorCRI.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand All @@ -463,10 +502,13 @@
<value>14</value>
</data>
<data name="ucrChkScaleNumeric.Location" type="System.Drawing.Point, System.Drawing">
<value>507, 280</value>
<value>676, 345</value>
</data>
<data name="ucrChkScaleNumeric.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>7, 6, 7, 6</value>
</data>
<data name="ucrChkScaleNumeric.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 20</value>
<value>191, 25</value>
</data>
<data name="ucrChkScaleNumeric.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
Expand All @@ -483,26 +525,29 @@
<data name="&gt;&gt;ucrChkScaleNumeric.ZOrder" xml:space="preserve">
<value>15</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Define CRI</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>dlgDefineCRI</value>
<value>dlgCorruptionDefineCRI</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ucrReceiverRedFlag.Location" type="System.Drawing.Point, System.Drawing">
<value>226, 59</value>
<value>301, 73</value>
</data>
<data name="ucrReceiverRedFlag.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="ucrReceiverRedFlag.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 20</value>
<value>160, 25</value>
</data>
<data name="ucrReceiverRedFlag.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgDefineCRI.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
' along with this program. If not, see <http://www.gnu.org/licenses/>.

Imports instat.Translations
Public Class dlgDefineCRI
Public Class dlgCorruptionDefineCRI
Private bFirstLoad As Boolean = True
Private bReset As Boolean = True
Dim bUseSelectedColumn As Boolean = False
Expand Down
9 changes: 5 additions & 4 deletions instat/dlgDefineCorruption.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading