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

Updateget row names #1472

Merged
merged 4 commits into from
Jul 1, 2016
Merged

Updateget row names #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c870f1
Merge pull request #3 from africanmathsinitiative/master
duutabib Jun 8, 2016
0207ebb
Fixed the get_row_names method, and the data Object file and updated…
Jun 16, 2016
f068f02
Deleted some commented lines and restructured the layout of the code.
Jun 17, 2016
8e7d225
Corrected some errors.
Jun 27, 2016
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
43 changes: 27 additions & 16 deletions instat/dlgRownamesOrNumbers.Designer.vb
View file
Open in desktop

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

43 changes: 14 additions & 29 deletions instat/dlgRownamesOrNumbers.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Public Class dlgRowNamesOrNumbers

ucrReceiverSingleRownamesOrNumbers.Selector = ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers
ucrReceiverSingleRownamesOrNumbers.SetMeAsReceiver()
ucrNewColumnNameforRownamesOrNumbers.Visible = False
txtNewColumnforRowNameOrNumber.Visible = False

End Sub

Expand All @@ -46,8 +46,9 @@ Public Class dlgRowNamesOrNumbers
rdoCopytoFirstColumn.Enabled = True
rdoResetintoPositiveIntegers.Enabled = True
chkDecreasingforRownamesOrNumbers.Visible = False
ucrNewColumnNameforRownamesOrNumbers.Visible = False
txtNewColumnforRowNameOrNumber.Visible = False
chkDecreasingforRownamesOrNumbers.Checked = False

End Sub

Private Sub ucrBaseRownamesOrNumbers_clickReset(sender As Object, e As EventArgs) Handles ucrBaseRownamesorNumbers.ClickReset
Expand All @@ -58,12 +59,9 @@ Public Class dlgRowNamesOrNumbers

Private Sub rdoCopytoFirstColumn_CheckedChanged(sender As Object, e As EventArgs) Handles rdoCopytoFirstColumn.CheckedChanged, rdoCopyfromColumn.CheckedChanged, rdoResetintoPositiveIntegers.CheckedChanged, rdoSortbyRowNamesorNumbers.CheckedChanged

If rdoCopyfromColumn.Checked Then ' done

ucrBaseRownamesorNumbers.clsRsyntax.SetAssignTo("")
ucrBaseRownamesorNumbers.clsRsyntax.ClearParameters()

If rdoCopyfromColumn.Checked Then
ucrNewColumnNameforRownamesOrNumbers.Visible = False
txtNewColumnforRowNameOrNumber.Visible = False
ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.Enabled = True
ucrReceiverSingleRownamesOrNumbers.Enabled = True
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_row_names")
Expand All @@ -73,30 +71,27 @@ Public Class dlgRowNamesOrNumbers

ElseIf rdoCopytoFirstColumn.Checked Then

ucrNewColumnNameforRownamesOrNumbers.Visible = False
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_row_names")
'ucrBaseRownamesorNumbers.clsRsyntax.SetAssignTo("rownamesfromtextbox_temp", ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.strCurrentDataFrame, "rownamesfromtextbox")
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("row_names", clsRFunctionParameter:=ucrReceiverSingleRownamesOrNumbers.GetVariables())
ucrBaseRownamesorNumbers.clsRsyntax.ClearParameters()
txtNewColumnforRowNameOrNumber.Visible = True
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$get_row_names")
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("data_name", Chr(34) & ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.strCurrentDataFrame & Chr(34))

'set prefix parameter

ElseIf rdoCopytoColumnsforRownamesOrNumbers.Checked Then

ucrNewColumnNameforRownamesOrNumbers.Visible = True
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_row_names")
ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.Enabled = False
txtNewColumnforRowNameOrNumber.Visible = True
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$get_row_names")
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("data_name", Chr(34) & ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.strCurrentDataFrame & Chr(34))
ucrBaseRownamesorNumbers.clsRsyntax.SetAssignTo("rownamesfromtextbox_temp", ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.strCurrentDataFrame, "rownamesfromtextbox")
ucrBaseRownamesorNumbers.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnNameforRownamesOrNumbers.strCurrNewColumnText, strTempDataframe:=ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.strCurrentDataFrame, strTempColumn:=ucrNewColumnNameforRownamesOrNumbers.strCurrNewColumnText)
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("row_names", clsRFunctionParameter:=ucrReceiverSingleRownamesOrNumbers.GetVariables())

ElseIf rdoResetintoPositiveIntegers.Checked Then
ElseIf rdoResetintoPositiveIntegers.Checked Then ' done
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_row_names")
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("data_name", Chr(34) & ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.strCurrentDataFrame & Chr(34))
'set parameters

ElseIf rdoSortbyRowNamesorNumbers.Checked Then

ucrNewColumnNameforRownamesOrNumbers.Visible = False
txtNewColumnforRowNameOrNumber.Visible = False
ucrBaseRownamesorNumbers.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$set_row_names")
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter(frmMain.clsRLink.strInstatDataObject & "$sort_dataframe")
chkDecreasingforRownamesOrNumbers.Visible = True
Expand All @@ -105,25 +100,15 @@ Public Class dlgRowNamesOrNumbers

ucrReceiverSingleRownamesOrNumbers.Enabled = False
ucrSelectorByDataFrameAddRemoveforRownamesOrNumbers.Enabled = False


End If


End Sub

Private Sub chkDecreasingforRownamesOrNumbers_CheckedChanged(sender As Object, e As EventArgs) Handles chkDecreasingforRownamesOrNumbers.CheckedChanged

If chkDecreasingforRownamesOrNumbers.Checked Then
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("decreasing", "TRUE")
Else
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("decreasing", "FALSE")
End If

End Sub

Private Sub ucrReceiverSingleRownamesOrNumbers_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverSingleRownamesOrNumbers.SelectionChanged
ucrBaseRownamesorNumbers.clsRsyntax.AddParameter("row_names", clsRFunctionParameter:=ucrReceiverSingleRownamesOrNumbers.GetVariables())

End Sub
End Class
22 changes: 22 additions & 0 deletions instat/static/InstatObject/R/data_object_R6.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,9 +909,31 @@ data_object$set("public", "set_row_names", function(row_names) {
}
)

data_object$set("public", "set_col_names", function(row_names) {
if(missing(col_names)) col_names = 1:ncol(private$data)
if(length(col_names) != ncol(private$data)) stop("col_names must be a vector of same length as the data")
if(anyDuplicated(col_names) != 0) stop("col_names must be unique")
rownames(private$data) <- col_names
self$data_changed <- TRUE
}

)

data_object$set("public", "get_row_names", function() {
return(rownames(private$data))
}

)

data_object$set("public", "get_col_names", function() {
return(names(private$data))
}

)
data_object$set("public", "get_dim_dataframe", function() {
return(dim(private$data))
}

)

data_object$set("public", "set_protected_columns", function(col_names) {
Expand Down