Skip to content

Commit

Permalink
Merge pull request #850 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history 
merge from main
  • Loading branch information
@dannyparsons
dannyparsons authored Jan 30, 2018
2 parents 7789a8d + 513fb8b commit 23a7ee9
Show file tree
Hide file tree
Showing 6 changed files with 178 additions and 82 deletions.
41 changes: 25 additions & 16 deletions instat/dlgColumnStats.Designer.vb
View file

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

64 changes: 50 additions & 14 deletions instat/dlgColumnStats.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@
<data name="lblSelectedVariables.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lblSelectedVariables.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblSelectedVariables.Location" type="System.Drawing.Point, System.Drawing">
<value>265, 45</value>
Expand Down Expand Up @@ -149,6 +153,9 @@
<data name="lblByFactors.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblByFactors.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblByFactors.Location" type="System.Drawing.Point, System.Drawing">
<value>265, 168</value>
</data>
Expand All @@ -173,6 +180,27 @@
<data name="&gt;&gt;lblByFactors.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="ucrChkOriginalLevel.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 42</value>
</data>
<data name="ucrChkOriginalLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 20</value>
</data>
<data name="ucrChkOriginalLevel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.Name" xml:space="preserve">
<value>ucrChkOriginalLevel</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.Type" xml:space="preserve">
<value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.Parent" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ucrChkStoreResults.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 17</value>
</data>
Expand All @@ -192,16 +220,16 @@
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkStoreResults.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="ucrChkOmitMissing.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 92</value>
<value>6, 119</value>
</data>
<data name="ucrChkOmitMissing.Size" type="System.Drawing.Size, System.Drawing">
<value>148, 20</value>
</data>
<data name="ucrChkOmitMissing.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>4</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.Name" xml:space="preserve">
<value>ucrChkOmitMissing</value>
Expand All @@ -213,16 +241,16 @@
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="ucrChkPrintOutput.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 42</value>
<value>6, 69</value>
</data>
<data name="ucrChkPrintOutput.Size" type="System.Drawing.Size, System.Drawing">
<value>148, 20</value>
</data>
<data name="ucrChkPrintOutput.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>2</value>
</data>
<data name="&gt;&gt;ucrChkPrintOutput.Name" xml:space="preserve">
<value>ucrChkPrintOutput</value>
Expand All @@ -234,16 +262,16 @@
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkPrintOutput.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="ucrChkDropUnusedLevels.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 67</value>
<value>6, 94</value>
</data>
<data name="ucrChkDropUnusedLevels.Size" type="System.Drawing.Size, System.Drawing">
<value>148, 20</value>
</data>
<data name="ucrChkDropUnusedLevels.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>3</value>
</data>
<data name="&gt;&gt;ucrChkDropUnusedLevels.Name" xml:space="preserve">
<value>ucrChkDropUnusedLevels</value>
Expand All @@ -255,13 +283,13 @@
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkDropUnusedLevels.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="grpOptions.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 196</value>
</data>
<data name="grpOptions.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 121</value>
<value>160, 145</value>
</data>
<data name="grpOptions.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand All @@ -281,14 +309,17 @@
<data name="&gt;&gt;grpOptions.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="cmdSummaries.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cmdSummaries.Location" type="System.Drawing.Point, System.Drawing">
<value>247, 289</value>
</data>
<data name="cmdSummaries.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 23</value>
</data>
<data name="cmdSummaries.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
<value>6</value>
</data>
<data name="cmdSummaries.Text" xml:space="preserve">
<value>Summaries...</value>
Expand All @@ -305,14 +336,17 @@
<data name="&gt;&gt;cmdSummaries.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="cmdProportionsPercentages.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cmdProportionsPercentages.Location" type="System.Drawing.Point, System.Drawing">
<value>247, 318</value>
</data>
<data name="cmdProportionsPercentages.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 23</value>
</data>
<data name="cmdProportionsPercentages.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>7</value>
</data>
<data name="cmdProportionsPercentages.Text" xml:space="preserve">
<value>Proportions/Percentages...</value>
Expand Down Expand Up @@ -341,7 +375,6 @@
<data name="ucrReceiverSelectedVariables.Location" type="System.Drawing.Point, System.Drawing">
<value>265, 60</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ucrReceiverSelectedVariables.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
Expand Down Expand Up @@ -408,6 +441,9 @@
<data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
Expand Down
10 changes: 9 additions & 1 deletion instat/dlgColumnStats.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,15 @@ Public Class dlgColumnStats
ucrReceiverByFactor.SetParameterIsString()

ucrChkStoreResults.SetParameter(New RParameter("store_results", 3))
ucrChkStoreResults.SetText("Store Results in Data Frame")
ucrChkStoreResults.SetText("Store Results")
ucrChkStoreResults.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
ucrChkStoreResults.SetRDefault("TRUE")

ucrChkOriginalLevel.SetParameter(New RParameter("original_level", 7))
ucrChkOriginalLevel.SetText("Original Level")
ucrChkOriginalLevel.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
ucrChkOriginalLevel.SetRDefault("FALSE")

ucrChkPrintOutput.SetParameter(New RParameter("return_output", 4))
ucrChkPrintOutput.SetText("Print Results to Output Window")
ucrChkPrintOutput.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
Expand All @@ -81,6 +86,9 @@ Public Class dlgColumnStats
ucrChkOmitMissing.SetText("Omit Missing Values")
ucrChkOmitMissing.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
ucrChkOmitMissing.SetRDefault("FALSE")

'linking
ucrChkStoreResults.AddToLinkedControls(ucrChkOriginalLevel, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
End Sub

Private Sub SetDefaults()
Expand Down
49 changes: 29 additions & 20 deletions instat/ucrCalculator.Designer.vb
View file

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

Loading

0 comments on commit 23a7ee9

Please sign in to comment.