Skip to content

Commit 8fda523

Browse files
committed
[CLI] Add Command.setStringData(String^), DataRequest.setNameOrCode(String^) and DataRequest.setUnitName(String^) convenience methods; Add new Command struct constructors.
1 parent 53906dc commit 8fda523

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

src/WASimClient_CLI/Structs.h

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,17 @@ namespace WASimCommander::CLI::Structs
145145
char_array<STRSZ_CMD> sData;
146146

147147
Command() {}
148-
explicit Command(CommandId id, uint32_t uData, String ^sData, double fData, int32_t token) :
149-
token(token), uData(uData), fData(fData), commandId(id), sData{sData} { }
148+
explicit Command(CommandId id) : commandId(id) { }
149+
explicit Command(CommandId id, uint32_t uData) : uData(uData), commandId(id) { }
150+
explicit Command(CommandId id, uint32_t uData, double fData) : uData(uData), fData(fData), commandId(id) { }
151+
explicit Command(CommandId id, uint32_t uData, String ^sData) : uData(uData), fData(0.0), commandId(id), sData{sData} { }
152+
explicit Command(CommandId id, uint32_t uData, String ^sData, double fData) : uData(uData), fData(fData), commandId(id), sData{sData} { }
153+
explicit Command(CommandId id, uint32_t uData, String ^sData, double fData, int32_t token) : token(token), uData(uData), fData(fData), commandId(id), sData{sData} { }
154+
155+
void setStringData(String ^sData)
156+
{
157+
this->sData = char_array<STRSZ_CMD>(sData);
158+
}
150159

151160
String ^ToString() override {
152161
return String::Format("Command {{{0}; token: {1}; uData: {2}; fData: {3:F6}; sData: \"{4}\"}}", commandId, token, uData, fData, sData);
@@ -241,6 +250,16 @@ namespace WASimCommander::CLI::Structs
241250
requestType(RequestType::Calculated), calcResultType(resultType), nameOrCode(calculatorCode)
242251
{ }
243252

253+
void setNameOrCode(String ^nameOrCode)
254+
{
255+
this->nameOrCode = char_array<STRSZ_REQ>(nameOrCode);
256+
}
257+
258+
void setUnitName(String ^unitName)
259+
{
260+
this->unitName = char_array<STRSZ_UNIT>(unitName);
261+
}
262+
244263
String ^ToString() override
245264
{
246265
String ^str = String::Format(

0 commit comments

Comments
 (0)