Skip to content

Commit 68b4df9

Browse files
committed
cellsheet appvar: fix displayEquEvalInPreview and add test file.
1 parent 28bf5a8 commit 68b4df9

5 files changed

Lines changed: 17 additions & 6 deletions

File tree

schemas/cellsheet-appvar.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"displayHelp": {
3131
"type": "boolean"
3232
},
33-
"displayEquationPreview": {
33+
"displayEquEvalInPreview": {
3434
"type": "boolean"
3535
},
3636
"number": {

schemas/cellsheet-state-appvar.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"displayHelp": {
3131
"type": "boolean"
3232
},
33-
"displayEquationPreview": {
33+
"displayEquEvalInPreview": {
3434
"type": "boolean"
3535
},
3636
"number": {

src/TypeHandlers/TH_StructuredAppVar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ namespace tivars::TypeHandlers
500500
if (!j.contains("flags"))
501501
{
502502
flags |= j.value("displayHelp", true) ? 0 : 0x04;
503-
flags |= j.value("displayEquationPreview", true) ? 0 : 0x08;
503+
flags |= j.value("displayEquEvalInPreview", false) ? 0x08 : 0;
504504
}
505505
payload.push_back(static_cast<uint8_t>(flags & 0xFF));
506506
payload.push_back(static_cast<uint8_t>(j.value("number", 0) & 0xFF));
@@ -873,7 +873,7 @@ namespace tivars::TypeHandlers
873873
{"name", name},
874874
{"flags", flags},
875875
{"displayHelp", (flags & 0x04) == 0},
876-
{"displayEquationPreview", (flags & 0x08) == 0},
876+
{"displayEquEvalInPreview", (flags & 0x08) != 0},
877877
{"number", number},
878878
{"payloadHex", to_hex_string(data_t(payload.begin() + static_cast<ptrdiff_t>(pos), payload.end()))},
879879
{"rawDataHex", to_hex_string(payload)}

testData/TICSfile.8xv

90 Bytes
Binary file not shown.

tests.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,19 +1022,30 @@ End)";
10221022
"typeName": "CellSheetAppVar",
10231023
"name": "CELLS",
10241024
"displayHelp": false,
1025-
"displayEquationPreview": true,
1025+
"displayEquEvalInPreview": true,
10261026
"number": 7,
10271027
"payloadHex": "AABBCCDD"
10281028
})");
10291029
const json cellSheetJSON = json::parse(cellSheet.getReadableContent());
10301030
assert(cellSheetJSON["typeName"] == "CellSheetAppVar");
10311031
assert(cellSheetJSON["name"] == "CELLS");
10321032
assert(cellSheetJSON["displayHelp"] == false);
1033-
assert(cellSheetJSON["displayEquationPreview"] == true);
1033+
assert(cellSheetJSON["displayEquEvalInPreview"] == true);
10341034
assert(cellSheetJSON["number"] == 7);
10351035
assert(cellSheetJSON["payloadHex"] == "AABBCCDD");
10361036
}
10371037

1038+
{
1039+
TIVarFile cellSheet = TIVarFile::loadFromFile("testData/TICSfile.8xv");
1040+
const json cellSheetJSON = json::parse(cellSheet.getReadableContent());
1041+
assert(cellSheetJSON["typeName"] == "CellSheetStateAppVar");
1042+
assert(cellSheetJSON["name"] == "S01");
1043+
assert(cellSheetJSON["displayHelp"] == true);
1044+
assert(cellSheetJSON["displayEquEvalInPreview"] == false);
1045+
assert(cellSheetJSON["number"] == 0);
1046+
assert(cellSheetJSON["payloadHex"] == "");
1047+
}
1048+
10381049
{
10391050
TIVarFile cabriFile = TIVarFile::createNew("CabriJrAppVar", "CABF", "83PCE");
10401051
cabriFile.setContentFromString(R"({

0 commit comments

Comments
 (0)