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

updating my master #152

Merged
merged 62 commits into from
Jun 29, 2020
Merged

updating my master #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
4df4619
Added additional property to the ucrInput control
Wycklife Apr 29, 2020
43d0351
Added an extra property to the ucrInput
Wycklife Apr 29, 2020
22cccab
Added extra property to ucrInput control
Wycklife Apr 29, 2020
20d790d
More changes on the ucrInput control
Wycklife Apr 29, 2020
92820ed
Merge pull request #98 from africanmathsinitiative/master
Ivanluv Jun 2, 2020
24a65f1
Merge pull request #172 from africanmathsinitiative/master
Wycklife Jun 2, 2020
c0f88af
Control alignment to cumulative distribution dialogue
Jun 3, 2020
8dbc24a
Minor changes
Jun 5, 2020
1c00942
Minor design changes
Jun 8, 2020
06bbeef
Merge pull request #173 from africanmathsinitiative/master
Wycklife Jun 8, 2020
1035475
Implementing include points
Jun 8, 2020
2a1ed82
Merge pull request #146 from Wycklife/ucrInput
conlooptechnologies Jun 9, 2020
a2caa33
Numeric expression validations
conlooptechnologies Jun 9, 2020
5ba4bf0
comment addition
conlooptechnologies Jun 9, 2020
8167d72
minor change
conlooptechnologies Jun 10, 2020
55dfa81
Adding te pad parameter
Jun 10, 2020
d2fd143
Removing unused code
Jun 11, 2020
6c20656
Merge pull request #175 from africanmathsinitiative/master
Wycklife Jun 15, 2020
22b5d75
Merge pull request #176 from africanmathsinitiative/master
Wycklife Jun 18, 2020
8e52cad
Merge pull request #748 from africanmathsinitiative/master
lilyclements Jun 19, 2020
420f52c
Merge pull request #435 from africanmathsinitiative/master
shadrackkibet Jun 20, 2020
dc5c406
Merge pull request #751 from africanmathsinitiative/master
lilyclements Jun 21, 2020
7e28b46
Merge pull request #180 from africanmathsinitiative/master
Wycklife Jun 22, 2020
1ed7421
Design
lilyclements Jun 22, 2020
79cb230
Change size
lilyclements Jun 22, 2020
a483e84
Design changes - depth of dialog
lilyclements Jun 22, 2020
d9893b5
Alignments, colons, width fix
lilyclements Jun 22, 2020
6f16c56
fixing width line
lilyclements Jun 22, 2020
ff6f6bf
Design changes - width of dialog, spacing of buttons
lilyclements Jun 22, 2020
a79c92f
add ellipsis
lilyclements Jun 22, 2020
a7736b5
remove ellipsis
lilyclements Jun 22, 2020
793fddd
Merge pull request #5852 from lilyclements/FitModelDesign
lloyddewit Jun 23, 2020
cbad82f
Merge pull request #5848 from lilyclements/dlgString
lloyddewit Jun 23, 2020
9d2bfe3
Merge pull request #5849 from lilyclements/dlgDepthandwidth
lloyddewit Jun 23, 2020
b63a2ec
Merge pull request #182 from africanmathsinitiative/master
Wycklife Jun 23, 2020
aa9eb61
Added a new menu called Structured to R-instat
Wycklife Jun 23, 2020
e4ffca6
Added sub menus
Wycklife Jun 23, 2020
94ee5b1
Added sub menu
Wycklife Jun 23, 2020
bc7d498
Added sub menu
Wycklife Jun 23, 2020
e8567e6
Added sub menu
Wycklife Jun 23, 2020
8a3e4dc
Added a sub menu
Wycklife Jun 23, 2020
a3b872d
Added a sub menu
Wycklife Jun 23, 2020
2428ef8
Added a sub menu
Wycklife Jun 23, 2020
1700533
Added a sub menu
Wycklife Jun 23, 2020
781a93a
Added a separator
Wycklife Jun 23, 2020
c4b00d2
Added a sub menu
Wycklife Jun 23, 2020
19c72b1
Added a sub menu
Wycklife Jun 23, 2020
32bfdc0
Added a sub menu
Wycklife Jun 23, 2020
f92782c
Minor edit
Wycklife Jun 23, 2020
3a22fb4
Merge pull request #5856 from Wycklife/NewMnuStructure
lloyddewit Jun 24, 2020
b16a28f
Merge pull request #436 from africanmathsinitiative/master
shadrackkibet Jun 24, 2020
24c3975
enabled toolstrip place holder for the verification summary dialog
shadrackkibet Jun 24, 2020
37d093d
showing the dialog on the frmmain
shadrackkibet Jun 24, 2020
8c175e1
moved menu items one level above and added a separator
shadrackkibet Jun 24, 2020
893d705
Merge pull request #5858 from shadrackkibet/frmmain
lloyddewit Jun 25, 2020
389b862
Merge pull request #437 from africanmathsinitiative/master
shadrackkibet Jun 25, 2020
a77f89a
adding new Taylor diagram dialog
shadrackkibet Jun 25, 2020
9739d05
adding taylor diagram dialog into frmmain
shadrackkibet Jun 26, 2020
5b27481
MInor change
Jun 26, 2020
9811362
Merge pull request #5863 from shadrackkibet/TaylorDiagram
lloyddewit Jun 27, 2020
e477231
Merge pull request #5820 from Ivanluv/ExcedenceDesign#5799
lloyddewit Jun 29, 2020
5abe07d
Merge pull request #5826 from Patowhiz/NumericExpressionValidation
lloyddewit Jun 29, 2020
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
292 changes: 146 additions & 146 deletions instat/DlgUseDate.Designer.vb
View file
Open in desktop

Large diffs are not rendered by default.

970 changes: 484 additions & 486 deletions instat/DlgUseDate.resx
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 22 additions & 16 deletions instat/dlgCumulativeDistribution.Designer.vb
View file
Open in desktop

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

187 changes: 95 additions & 92 deletions instat/dlgCumulativeDistribution.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblFactors.Location" type="System.Drawing.Point, System.Drawing">
<value>240, 207</value>
<value>270, 199</value>
</data>
<data name="lblFactors.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 13</value>
Expand Down Expand Up @@ -177,6 +177,72 @@
<data name="&gt;&gt;cmdPlotOptions.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="lblScale.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblScale.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblScale.Location" type="System.Drawing.Point, System.Drawing">
<value>222, 277</value>
</data>
<data name="lblScale.Size" type="System.Drawing.Size, System.Drawing">
<value>51, 13</value>
</data>
<data name="lblScale.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="lblScale.Text" xml:space="preserve">
<value>Scale by:</value>
</data>
<data name="lblScale.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value>
</data>
<data name="&gt;&gt;lblScale.Name" xml:space="preserve">
<value>lblScale</value>
</data>
<data name="&gt;&gt;lblScale.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblScale.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblScale.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="lblNudby.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblNudby.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblNudby.Location" type="System.Drawing.Point, System.Drawing">
<value>224, 304</value>
</data>
<data name="lblNudby.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 13</value>
</data>
<data name="lblNudby.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="lblNudby.Text" xml:space="preserve">
<value>In steps of:</value>
</data>
<data name="lblNudby.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value>
</data>
<data name="&gt;&gt;lblNudby.Name" xml:space="preserve">
<value>lblNudby</value>
</data>
<data name="&gt;&gt;lblNudby.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblNudby.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblNudby.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="rdoCumulative.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
<value>Button</value>
</data>
Expand All @@ -187,13 +253,13 @@
<value>NoControl</value>
</data>
<data name="rdoCumulative.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 13</value>
<value>119, 10</value>
</data>
<data name="rdoCumulative.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 27</value>
<value>86, 27</value>
</data>
<data name="rdoCumulative.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
<value>22</value>
</data>
<data name="rdoCumulative.Text" xml:space="preserve">
<value>Cumulative</value>
Expand All @@ -211,7 +277,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;rdoCumulative.ZOrder" xml:space="preserve">
<value>5</value>
<value>1</value>
</data>
<data name="rdoExceedance.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
<value>Button</value>
Expand All @@ -223,13 +289,13 @@
<value>NoControl</value>
</data>
<data name="rdoExceedance.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 13</value>
<value>205, 10</value>
</data>
<data name="rdoExceedance.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 27</value>
<value>86, 27</value>
</data>
<data name="rdoExceedance.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
<value>23</value>
</data>
<data name="rdoExceedance.Text" xml:space="preserve">
<value>Exceedance</value>
Expand All @@ -247,79 +313,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;rdoExceedance.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="lblScale.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblScale.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblScale.Location" type="System.Drawing.Point, System.Drawing">
<value>188, 294</value>
</data>
<data name="lblScale.Size" type="System.Drawing.Size, System.Drawing">
<value>51, 13</value>
</data>
<data name="lblScale.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="lblScale.Text" xml:space="preserve">
<value>Scale by:</value>
</data>
<data name="lblScale.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value>
</data>
<data name="&gt;&gt;lblScale.Name" xml:space="preserve">
<value>lblScale</value>
</data>
<data name="&gt;&gt;lblScale.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblScale.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblScale.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="lblNudby.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblNudby.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblNudby.Location" type="System.Drawing.Point, System.Drawing">
<value>180, 325</value>
</data>
<data name="lblNudby.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 13</value>
</data>
<data name="lblNudby.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="lblNudby.Text" xml:space="preserve">
<value>In steps of:</value>
</data>
<data name="lblNudby.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value>
</data>
<data name="&gt;&gt;lblNudby.Name" xml:space="preserve">
<value>lblNudby</value>
</data>
<data name="&gt;&gt;lblNudby.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblNudby.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblNudby.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="ucrNudBy.Location" type="System.Drawing.Point, System.Drawing">
<value>243, 325</value>
<value>284, 301</value>
</data>
<data name="ucrNudBy.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 20</value>
<value>56, 20</value>
</data>
<data name="ucrNudBy.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
Expand All @@ -334,13 +334,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrNudBy.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<data name="ucrInputComboScales.Location" type="System.Drawing.Point, System.Drawing">
<value>243, 294</value>
<value>281, 271</value>
</data>
<data name="ucrInputComboScales.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 26</value>
<value>87, 26</value>
</data>
<data name="ucrInputComboScales.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
Expand All @@ -355,13 +355,16 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrInputComboScales.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="ucrPnlOption.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
<data name="ucrPnlOption.Location" type="System.Drawing.Point, System.Drawing">
<value>105, 12</value>
<value>119, 10</value>
</data>
<data name="ucrPnlOption.Size" type="System.Drawing.Size, System.Drawing">
<value>197, 30</value>
<value>172, 27</value>
</data>
<data name="ucrPnlOption.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
Expand All @@ -379,10 +382,10 @@
<value>6</value>
</data>
<data name="ucrChkIncludePoints.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 313</value>
<value>10, 304</value>
</data>
<data name="ucrChkIncludePoints.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 20</value>
<value>152, 19</value>
</data>
<data name="ucrChkIncludePoints.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
Expand All @@ -400,10 +403,10 @@
<value>7</value>
</data>
<data name="ucrChkCountsOnYAxis.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 287</value>
<value>10, 277</value>
</data>
<data name="ucrChkCountsOnYAxis.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 20</value>
<value>152, 19</value>
</data>
<data name="ucrChkCountsOnYAxis.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
Expand All @@ -421,7 +424,7 @@
<value>8</value>
</data>
<data name="ucrSaveCumDist.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 353</value>
<value>10, 331</value>
</data>
<data name="ucrSaveCumDist.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
Expand Down Expand Up @@ -451,10 +454,10 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>418, 441</value>
<value>414, 420</value>
</data>
<data name="ucrFactorReceiver.Location" type="System.Drawing.Point, System.Drawing">
<value>243, 229</value>
<value>270, 214</value>
</data>
<data name="ucrFactorReceiver.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
Expand Down Expand Up @@ -502,7 +505,7 @@
<value>14</value>
</data>
<data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 386</value>
<value>10, 360</value>
</data>
<data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
<value>410, 52</value>
Expand Down Expand Up @@ -535,7 +538,7 @@
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ucrVariablesAsFactorforCumDist.Location" type="System.Drawing.Point, System.Drawing">
<value>243, 50</value>
<value>270, 43</value>
</data>
<data name="ucrVariablesAsFactorforCumDist.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 136</value>
Expand Down
Loading