eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 16:19:19 +02:00
Code Issues 123 Wiki Activity

Logowanie eventów addvalues, updatevalues i warunkowych niezależnie od debugmode. Logowanie stanu komórki i warunku dla spełnionych warunków.

Browse Source
This commit is contained in:
antonisauren
2016-06-10 23:41:43 +02:00
parent c570578507
commit a3e35f50db
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Ground.cpp
View File

@@ -3785,13 +3785,13 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node)
Event->Params[5].asMemCell->PutCommand( Event->Params[5].asMemCell->PutCommand(
Event->Params[6].asTrack->Dynamics[i]->Mechanik, Event->Params[6].asTrack->Dynamics[i]->Mechanik,
&Event->Params[4].nGroundNode->pCenter); &Event->Params[4].nGroundNode->pCenter);
if (DebugModeFlag) //if (DebugModeFlag)
WriteLog("EVENT EXECUTED: AddValues & Track command - " + WriteLog("EVENT EXECUTED: AddValues & Track command - " +
AnsiString(Event->Params[0].asText) + " " + AnsiString(Event->Params[0].asText) + " " +
AnsiString(Event->Params[1].asdouble) + " " + AnsiString(Event->Params[1].asdouble) + " " +
AnsiString(Event->Params[2].asdouble)); AnsiString(Event->Params[2].asdouble));
} }
else if (DebugModeFlag) //else if (DebugModeFlag)
WriteLog("EVENT EXECUTED: AddValues - " + WriteLog("EVENT EXECUTED: AddValues - " +
AnsiString(Event->Params[0].asText) + " " + AnsiString(Event->Params[0].asText) + " " +
AnsiString(Event->Params[1].asdouble) + " " + AnsiString(Event->Params[1].asdouble) + " " +
@@ -3842,8 +3842,28 @@ bool TGround::EventConditon(TEvent *e)
{ // porównanie wartoœci { // porównanie wartoœci
if (tmpEvent->Params[9].asMemCell->Compare(e->Params[10].asText, e->Params[11].asdouble, if (tmpEvent->Params[9].asMemCell->Compare(e->Params[10].asText, e->Params[11].asdouble,
e->Params[12].asdouble, e->iFlags)) e->Params[12].asdouble, e->iFlags))
{ //logowanie spe³nionych warunków
LogComment = e->Params[9].asMemCell->Text() + AnsiString(" ") +
FloatToStrF(e->Params[9].asMemCell->Value1(), ffFixed, 8, 2) + " " +
FloatToStrF(tmpEvent->Params[9].asMemCell->Value2(), ffFixed, 8, 2) +
" = ";
if (TestFlag(e->iFlags, conditional_memstring))
LogComment += AnsiString(tmpEvent->Params[10].asText);
else
LogComment += "*";
if (TestFlag(tmpEvent->iFlags, conditional_memval1))
LogComment += " " + FloatToStrF(tmpEvent->Params[11].asdouble, ffFixed, 8, 2);
else
LogComment += " *";
if (TestFlag(tmpEvent->iFlags, conditional_memval2))
LogComment += " " + FloatToStrF(tmpEvent->Params[12].asdouble, ffFixed, 8, 2);
else
LogComment += " *";
WriteLog(LogComment.c_str());
return true; return true;
else if (Global::iWriteLogEnabled && DebugModeFlag) }
//else if (Global::iWriteLogEnabled && DebugModeFlag) //zawsze bo to bardzo istotne w debugowaniu scenariuszy
else
{ // nie zgadza siê, wiêc sprawdzmy, co { // nie zgadza siê, wiêc sprawdzmy, co
LogComment = e->Params[9].asMemCell->Text() + AnsiString(" ") + LogComment = e->Params[9].asMemCell->Text() + AnsiString(" ") +
FloatToStrF(e->Params[9].asMemCell->Value1(), ffFixed, 8, 2) + " " + FloatToStrF(e->Params[9].asMemCell->Value1(), ffFixed, 8, 2) + " " +
@@ -3957,13 +3977,13 @@ bool TGround::CheckQuery()
tmpEvent->Params[5].asMemCell->PutCommand( tmpEvent->Params[5].asMemCell->PutCommand(
tmpEvent->Params[6].asTrack->Dynamics[i]->Mechanik, tmpEvent->Params[6].asTrack->Dynamics[i]->Mechanik,
&tmpEvent->Params[4].nGroundNode->pCenter); &tmpEvent->Params[4].nGroundNode->pCenter);
if (DebugModeFlag) //if (DebugModeFlag)
WriteLog("Type: UpdateValues & Track command - " + WriteLog("Type: UpdateValues & Track command - " +
AnsiString(tmpEvent->Params[0].asText) + " " + AnsiString(tmpEvent->Params[0].asText) + " " +
AnsiString(tmpEvent->Params[1].asdouble) + " " + AnsiString(tmpEvent->Params[1].asdouble) + " " +
AnsiString(tmpEvent->Params[2].asdouble)); AnsiString(tmpEvent->Params[2].asdouble));
} }
else if (DebugModeFlag) else //if (DebugModeFlag)
WriteLog("Type: UpdateValues - " + AnsiString(tmpEvent->Params[0].asText) + WriteLog("Type: UpdateValues - " + AnsiString(tmpEvent->Params[0].asText) +
" " + AnsiString(tmpEvent->Params[1].asdouble) + " " + " " + AnsiString(tmpEvent->Params[1].asdouble) + " " +
AnsiString(tmpEvent->Params[2].asdouble)); AnsiString(tmpEvent->Params[2].asdouble));