Skip to content

Commit

Permalink
Merge branch 'IDEMSInternational:master' into bar.chart
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fidel365
Fidel365 authored Feb 29, 2024
2 parents 5c426fd + 3f4aef0 commit e140cce
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 16 deletions.
29 changes: 19 additions & 10 deletions instat/sdgCalculationsSummmary.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ Public Class sdgCalculationsSummmary

ucrManipulations.lstAvailableData.View = View.List

ucrCalcSummary.ucrReceiverForCalculation.bAttachedToPrimaryDataFrame = False

'temp until working
ucrCalcSummary.ucrSaveResultInto.Visible = False
'ucrCalcSummary.ucrTryModelling.Visible = False
Expand Down Expand Up @@ -345,16 +343,18 @@ Public Class sdgCalculationsSummmary

Private Sub ucrCalcSummary_SelectionChanged() Handles ucrCalcSummary.SelectionChanged
If {"Calculation", "Summary"}.Contains(ucrInputType.GetText()) Then
Dim strExpression As String = ucrCalcSummary.ucrReceiverForCalculation.GetText()
If Not ucrCalcSummary.ucrReceiverForCalculation.IsEmpty Then
clsCalculationFunction.AddParameter("function_exp", Chr(34) & ucrCalcSummary.ucrReceiverForCalculation.GetText() & Chr(34))
clsCalculationFunction.AddParameter("function_exp", Chr(34) & strExpression & Chr(34))
Else
clsCalculationFunction.RemoveParameterByName("function_exp")
End If

If Not ucrCalcSummary.ucrSelectorForCalculations.CurrentReceiver.IsEmpty Then
clsCalculationFunction.AddParameter("calculated_from", CreateCalcFromList(
ucrCalcSummary.ucrSelectorForCalculations.CurrentReceiver.GetVariableNamesList(bWithQuotes:=False),
ucrCalcSummary.ucrSelectorForCalculations))
If ucrCalcSummary.ucrSelectorForCalculations.lstAvailableVariable.Items.Count > 0 AndAlso
Not ucrCalcSummary.ucrReceiverForCalculation.IsEmpty Then
Dim lstItems As String() = ucrCalcSummary.ucrSelectorForCalculations.lstAvailableVariable.Items.Cast(Of ListViewItem)().Select(Function(item) item.Text).ToArray()
Dim strSelectedVariables As String() = lstItems.Where(Function(variable) strExpression.Contains(variable)).ToArray()
clsCalculationFunction.AddParameter("calculated_from", CreateCalcFromList(strSelectedVariables, ucrCalcSummary.ucrSelectorForCalculations))
Else
clsCalculationFunction.RemoveParameterByName("calculated_from")
End If
Expand All @@ -374,14 +374,23 @@ Public Class sdgCalculationsSummmary

'Need to do this instead of with RFunctions because the calculated_from list can have multiple items with the same label
Private Function CreateCalcFromList(lstVariables As String(), ucrCurrentSelector As ucrSelectorByDataFrame) As String

If lstVariables Is Nothing Then
Return ""
End If

Dim strCalcFromList As String

strCalcFromList = "list("
For i = 0 To lstVariables.Count - 1
If i > 0 Then
strCalcFromList = strCalcFromList & ","
Dim strDataName As String = lstVariables(i)
If Not String.IsNullOrEmpty(strDataName) Then
If i > 0 Then
strCalcFromList = strCalcFromList & ","
End If

strCalcFromList = strCalcFromList & ucrCurrentSelector.strCurrentDataFrame & " = " & Chr(34) & strDataName & Chr(34)
End If
strCalcFromList = strCalcFromList & ucrCurrentSelector.strCurrentDataFrame & " = " & Chr(34) & lstVariables(i) & Chr(34)
Next
strCalcFromList = strCalcFromList & ")"
Return strCalcFromList
Expand Down
10 changes: 5 additions & 5 deletions instat/ucrGeom.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Public Class ucrGeom
Public bPauseChanges As Boolean = False
Dim strLineType As String() = {Chr(34) & "blank" & Chr(34), Chr(34) & "solid" & Chr(34), Chr(34) & "dashed" & Chr(34), Chr(34) & "dotted" & Chr(34), Chr(34) & "dotdash" & Chr(34), Chr(34) & "longdash" & Chr(34), Chr(34) & "twodash" & Chr(34)}
Dim strShapePoint As String() = {Chr(34) & "circle" & Chr(34), Chr(34) & "circle open" & Chr(34), Chr(34) & "circle filled" & Chr(34), Chr(34) & "circle cross" & Chr(34), Chr(34) & "circle plus" & Chr(34), Chr(34) & "circle small" & Chr(34), Chr(34) & "bullet" & Chr(34), Chr(34) & "square" & Chr(34), Chr(34) & "square open" & Chr(34), Chr(34) & "square filled" & Chr(34), Chr(34) & "square cross" & Chr(34), Chr(34) & "square plus" & Chr(34), Chr(34) & "square triangle" & Chr(34), Chr(34) & "diamond" & Chr(34), Chr(34) & "diamond open" & Chr(34), Chr(34) & "diamond filled" & Chr(34), Chr(34) & "diamond plus" & Chr(34), Chr(34) & "triangle" & Chr(34), Chr(34) & "triangle open" & Chr(34), Chr(34) & "triangle filled" & Chr(34), Chr(34) & "triangle square" & Chr(34), Chr(34) & "triangle down open" & Chr(34), Chr(34) & "triangle down filled" & Chr(34), Chr(34) & "plus" & Chr(34), Chr(34) & "cross" & Chr(34), Chr(34) & "asterisk" & Chr(34)}
Dim strBoxShapePoint As String() = {Chr(34) & "NA" & Chr(34), Chr(34) & "circle" & Chr(34), Chr(34) & "circle open" & Chr(34), Chr(34) & "circle filled" & Chr(34), Chr(34) & "circle cross" & Chr(34), Chr(34) & "circle plus" & Chr(34), Chr(34) & "circle small" & Chr(34), Chr(34) & "bullet" & Chr(34), Chr(34) & "square" & Chr(34), Chr(34) & "square open" & Chr(34), Chr(34) & "square filled" & Chr(34), Chr(34) & "square cross" & Chr(34), Chr(34) & "square plus" & Chr(34), Chr(34) & "square triangle" & Chr(34), Chr(34) & "diamond" & Chr(34), Chr(34) & "diamond open" & Chr(34), Chr(34) & "diamond filled" & Chr(34), Chr(34) & "diamond plus" & Chr(34), Chr(34) & "triangle" & Chr(34), Chr(34) & "triangle open" & Chr(34), Chr(34) & "triangle filled" & Chr(34), Chr(34) & "triangle square" & Chr(34), Chr(34) & "triangle down open" & Chr(34), Chr(34) & "triangle down filled" & Chr(34), Chr(34) & "plus" & Chr(34), Chr(34) & "cross" & Chr(34), Chr(34) & "asterisk" & Chr(34)}
Dim strBoxShapePoint As String() = {"NA", Chr(34) & "circle" & Chr(34), Chr(34) & "circle open" & Chr(34), Chr(34) & "circle filled" & Chr(34), Chr(34) & "circle cross" & Chr(34), Chr(34) & "circle plus" & Chr(34), Chr(34) & "circle small" & Chr(34), Chr(34) & "bullet" & Chr(34), Chr(34) & "square" & Chr(34), Chr(34) & "square open" & Chr(34), Chr(34) & "square filled" & Chr(34), Chr(34) & "square cross" & Chr(34), Chr(34) & "square plus" & Chr(34), Chr(34) & "square triangle" & Chr(34), Chr(34) & "diamond" & Chr(34), Chr(34) & "diamond open" & Chr(34), Chr(34) & "diamond filled" & Chr(34), Chr(34) & "diamond plus" & Chr(34), Chr(34) & "triangle" & Chr(34), Chr(34) & "triangle open" & Chr(34), Chr(34) & "triangle filled" & Chr(34), Chr(34) & "triangle square" & Chr(34), Chr(34) & "triangle down open" & Chr(34), Chr(34) & "triangle down filled" & Chr(34), Chr(34) & "plus" & Chr(34), Chr(34) & "cross" & Chr(34), Chr(34) & "asterisk" & Chr(34)}
Private bResetGlobal As Boolean = False
Public Sub New()

Expand Down Expand Up @@ -334,8 +334,8 @@ Public Class ucrGeom
clsgeom_statcor.AddLayerParameter("label.sep", "editablelist", Chr(34) & ", " & Chr(34), lstParameterStrings:={Chr(34) & ", " & Chr(34)})
clsgeom_statcor.AddLayerParameter("label.x.npc", "list", Chr(34) & "left" & Chr(34), lstParameterStrings:={Chr(34) & "left" & Chr(34), Chr(34) & "right" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)})
clsgeom_statcor.AddLayerParameter("label.y.npc", "list", Chr(34) & "top" & Chr(34), lstParameterStrings:={Chr(34) & "top" & Chr(34), Chr(34) & "bottom" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)})
clsgeom_statcor.AddLayerParameter("label.x", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)})
clsgeom_statcor.AddLayerParameter("label.y", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)})
clsgeom_statcor.AddLayerParameter("label.x", "text", 0, lstParameterStrings:={0, -1000, 1000})
clsgeom_statcor.AddLayerParameter("label.y", "text", 0, lstParameterStrings:={0, -1000, 1000})
clsgeom_statcor.AddLayerParameter("output.type", "list", Chr(34) & "expression" & Chr(34), lstParameterStrings:={Chr(34) & "expression" & Chr(34), Chr(34) & "latex" & Chr(34), Chr(34) & "tex" & Chr(34), Chr(34) & "text" & Chr(34)})
clsgeom_statcor.AddLayerParameter("digits", "numeric", "2", lstParameterStrings:={0, 1, 5})
clsgeom_statcor.AddLayerParameter("r.digits", "numeric", "2", lstParameterStrings:={0, 1, 5})
Expand Down Expand Up @@ -363,8 +363,8 @@ Public Class ucrGeom
clsgeom_statReglineEquation.AddLayerParameter("formula", "editablelist", Chr(34) & "y~x" & Chr(34), lstParameterStrings:={Chr(34) & "y~x" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("label.x.npc", "list", Chr(34) & "left" & Chr(34), lstParameterStrings:={Chr(34) & "left" & Chr(34), Chr(34) & "right" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("label.y.npc", "list", Chr(34) & "top" & Chr(34), lstParameterStrings:={Chr(34) & "top" & Chr(34), Chr(34) & "bottom" & Chr(34), Chr(34) & "center" & Chr(34), Chr(34) & "centre" & Chr(34), Chr(34) & "middle" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("label.x", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("label.y", "editablelist", Chr(34) & "NULL" & Chr(34), lstParameterStrings:={Chr(34) & "NULL" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("label.x", "text", "0", lstParameterStrings:={0, -1000, 1000})
clsgeom_statReglineEquation.AddLayerParameter("label.y", "text", "0", lstParameterStrings:={0, -1000, 1000})
clsgeom_statReglineEquation.AddLayerParameter("output.type", "list", Chr(34) & "expression" & Chr(34), lstParameterStrings:={Chr(34) & "expression" & Chr(34), Chr(34) & "latex" & Chr(34), Chr(34) & "text" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("geom", "editablelist", Chr(34) & "text" & Chr(34), lstParameterStrings:={Chr(34) & "text" & Chr(34)})
clsgeom_statReglineEquation.AddLayerParameter("position", "editablelist", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34)})
Expand Down
5 changes: 4 additions & 1 deletion instat/ucrReceiverMetadataProperty.Designer.vb
View file

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

0 comments on commit e140cce

Please sign in to comment.