Skip to content

Commit afa8369

Browse files
psarraspsarras
committed
Revert "feat: converted fields to properties with public get modifier"
This reverts commit 1796913.
1 parent 2413d13 commit afa8369

13 files changed

+179
-165
lines changed

‎GH_UnitNumber/Components/ConvertUnitNumber.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -122,28 +122,28 @@ public override bool Read(GH_IReader reader) {
122122
if (Params.Output.Count == 1) {
123123
Params.RegisterOutputParam(param);
124124
}
125-
125+
126126
return flag;
127127
}
128128

129129
public override void SetSelected(int i, int j) {
130130
if (_unitDictionary != null) {
131-
SelectedItems[i] = DropDownItems[i][j];
132-
DropDownItems[0] = _unitDictionary.Keys.ToList();
131+
_selectedItems[i] = _dropDownItems[i][j];
132+
_dropDownItems[0] = _unitDictionary.Keys.ToList();
133133
}
134134
base.UpdateUI();
135135
}
136136

137137
protected override void InitialiseDropdowns() {
138-
SpacerDescriptions = new List<string>(new string[] { "Select output unit" });
138+
_spacerDescriptions = new List<string>(new string[] { "Select output unit" });
139139

140-
DropDownItems = new List<List<string>>();
141-
SelectedItems = new List<string>();
140+
_dropDownItems = new List<List<string>>();
141+
_selectedItems = new List<string>();
142142

143-
DropDownItems.Add(new List<string>(new string[] { " " }));
144-
SelectedItems.Add(" ");
143+
_dropDownItems.Add(new List<string>(new string[] { " " }));
144+
_selectedItems.Add(" ");
145145

146-
IsInitialised = true;
146+
_isInitialised = true;
147147
}
148148

149149
protected override void RegisterInputParams(GH_InputParamManager pManager) {
@@ -176,11 +176,11 @@ protected override void SolveInternal(IGH_DataAccess DA) {
176176
_unitDictionary.Add(abbr, unit.Value);
177177
}
178178

179-
DropDownItems[0] = _unitDictionary.Keys.ToList();
179+
_dropDownItems[0] = _unitDictionary.Keys.ToList();
180180
if (!_comingFromSave) {
181181
IQuantity quantity = Quantity.From(0, inUnitNumber.Value.Unit);
182182
string abbr = quantity.ToString().Replace("0", string.Empty).Trim();
183-
SelectedItems[0] = abbr;
183+
_selectedItems[0] = abbr;
184184
} else
185185
_comingFromSave = false;
186186
}
@@ -202,14 +202,14 @@ protected override void SolveInternal(IGH_DataAccess DA) {
202202
_selectedUnit = quantity.Unit;
203203
IQuantity quantity2 = Quantity.From(0, _selectedUnit);
204204
string abbr = quantity2.ToString().Replace("0", string.Empty).Trim();
205-
SelectedItems[0] = abbr;
205+
_selectedItems[0] = abbr;
206206
} else {
207207
AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "Unable to parse input parameter u to a recognisable unit");
208208
return;
209209
}
210210
} else {
211211
// update selected unit from dropdown
212-
_selectedUnit = _unitDictionary[SelectedItems.Last()];
212+
_selectedUnit = _unitDictionary[_selectedItems.Last()];
213213
}
214214

215215
// convert unit to selected output

‎GH_UnitNumber/Components/CreateUnitNumber.cs

+18-18
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ public CreateUnitNumber() : base("Create UnitNumber", "CreateUnit",
3030
}
3131

3232
public override void SetSelected(int i, int j) {
33-
SelectedItems[i] = DropDownItems[i][j];
33+
_selectedItems[i] = _dropDownItems[i][j];
3434

3535
// if change is made to first (unit type) list we have to update lists
3636
if (i == 0) {
37-
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), SelectedItems[0]);
37+
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), _selectedItems[0]);
3838
UpdateQuantityUnitTypeFromUnitString(unit);
3939
UpdateMeasureDictionary();
40-
SelectedItems[1] = _selectedMeasure.ToString();
40+
_selectedItems[1] = _selectedMeasure.ToString();
4141
} else // if change is made to the measure of a unit
4242
{
43-
_selectedMeasure = _measureDictionary[SelectedItems.Last()];
43+
_selectedMeasure = _measureDictionary[_selectedItems.Last()];
4444
UpdateUnitMeasureAndAbbreviation();
4545
}
4646

4747
base.UpdateUI();
4848
}
4949

5050
public override void VariableParameterMaintenance() {
51-
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), SelectedItems[0]);
51+
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), _selectedItems[0]);
5252
string unitAbbreviation;
5353
switch (unit) {
5454
case EngineeringUnits.Angle:
@@ -164,16 +164,16 @@ public override void VariableParameterMaintenance() {
164164
}
165165

166166
protected override void InitialiseDropdowns() {
167-
SpacerDescriptions = new List<string>(new string[] { "Unit type", "Measure" });
167+
_spacerDescriptions = new List<string>(new string[] { "Unit type", "Measure" });
168168

169-
DropDownItems = new List<List<string>>();
170-
SelectedItems = new List<string>();
169+
_dropDownItems = new List<List<string>>();
170+
_selectedItems = new List<string>();
171171

172-
DropDownItems.Add(Enum.GetNames(typeof(EngineeringUnits)).ToList());
173-
SelectedItems.Add(DropDownItems[0][1]);
172+
_dropDownItems.Add(Enum.GetNames(typeof(EngineeringUnits)).ToList());
173+
_selectedItems.Add(_dropDownItems[0][1]);
174174

175-
DropDownItems.Add(Enum.GetNames(typeof(LengthUnit)).ToList());
176-
SelectedItems.Add(DefaultUnits.LengthUnitGeometry.ToString());
175+
_dropDownItems.Add(Enum.GetNames(typeof(LengthUnit)).ToList());
176+
_selectedItems.Add(DefaultUnits.LengthUnitGeometry.ToString());
177177

178178
_quantity = new Length(0, DefaultUnits.LengthUnitGeometry);
179179
_selectedMeasure = _quantity.Unit;
@@ -182,7 +182,7 @@ protected override void InitialiseDropdowns() {
182182
foreach (UnitInfo unit in _quantity.QuantityInfo.UnitInfos)
183183
_measureDictionary.Add(unit.Name, unit.Value);
184184

185-
IsInitialised = true;
185+
_isInitialised = true;
186186
}
187187

188188
protected override void RegisterInputParams(GH_InputParamManager pManager) {
@@ -195,7 +195,7 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager) {
195195

196196
protected override void SolveInternal(IGH_DataAccess DA) {
197197
if (DA.GetData(0, ref _value)) {
198-
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), SelectedItems[0]);
198+
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), _selectedItems[0]);
199199

200200
switch (unit) {
201201
case EngineeringUnits.Angle:
@@ -314,19 +314,19 @@ protected override void SolveInternal(IGH_DataAccess DA) {
314314
}
315315

316316
protected override void UpdateUIFromSelectedItems() {
317-
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), SelectedItems[0]);
317+
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), _selectedItems[0]);
318318
UpdateQuantityUnitTypeFromUnitString(unit);
319319
UpdateMeasureDictionary();
320320
UpdateUnitMeasureAndAbbreviation();
321-
_selectedMeasure = _measureDictionary[SelectedItems.Last()];
321+
_selectedMeasure = _measureDictionary[_selectedItems.Last()];
322322
base.UpdateUIFromSelectedItems();
323323
}
324324

325325
private void UpdateMeasureDictionary() {
326326
_measureDictionary = new Dictionary<string, Enum>();
327327
foreach (UnitInfo unitype in _quantity.QuantityInfo.UnitInfos)
328328
_measureDictionary.Add(unitype.Name, unitype.Value);
329-
DropDownItems[1] = _measureDictionary.Keys.ToList();
329+
_dropDownItems[1] = _measureDictionary.Keys.ToList();
330330
}
331331

332332
private void UpdateQuantityUnitTypeFromUnitString(EngineeringUnits unit) {
@@ -443,7 +443,7 @@ private void UpdateQuantityUnitTypeFromUnitString(EngineeringUnits unit) {
443443
}
444444

445445
private void UpdateUnitMeasureAndAbbreviation() {
446-
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), SelectedItems[0]);
446+
var unit = (EngineeringUnits)Enum.Parse(typeof(EngineeringUnits), _selectedItems[0]);
447447

448448
switch (unit) {
449449
case EngineeringUnits.Angle:

‎GH_UnitNumberTests/Helpers/Dropdown.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ namespace GH_UnitNumberTests.Helpers {
55
internal class Dropdown {
66
internal static void ChangeDropDownDeserializeTest(
77
GH_OasysDropDownComponent comp) {
8-
Assert.True(comp.IsInitialised);
9-
Assert.Equal(comp.DropDownItems.Count, comp.SpacerDescriptions.Count);
8+
Assert.True(comp._isInitialised);
9+
Assert.Equal(comp._dropDownItems.Count, comp._spacerDescriptions.Count);
1010

11-
Assert.Equal(comp.DropDownItems.Count, comp.SelectedItems.Count);
11+
Assert.Equal(comp._dropDownItems.Count, comp._selectedItems.Count);
1212

13-
for (int i = 0; i < comp.DropDownItems.Count; i++) {
13+
for (int i = 0; i < comp._dropDownItems.Count; i++) {
1414
comp.SetSelected(i, 0);
1515

16-
for (int j = 0; j < comp.DropDownItems[i].Count; j++) {
16+
for (int j = 0; j < comp._dropDownItems[i].Count; j++) {
1717
comp.SetSelected(i, j);
1818
Deserialize.TestDeserialize(comp);
19-
Assert.Equal(comp.SelectedItems[i], comp.DropDownItems[i][j]);
19+
Assert.Equal(comp._selectedItems[i], comp._dropDownItems[i][j]);
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)