From a3e35f50db0372f5716cddb0c36f35f5ab1eb86f Mon Sep 17 00:00:00 2001
From: antonisauren <antoni.sauren@gmail.com>
Date: Fri, 10 Jun 2016 23:41:43 +0200
Subject: [PATCH] =?UTF-8?q?Logowanie=20event=C3=B3w=20addvalues,=20updatev?=
 =?UTF-8?q?alues=20i=20warunkowych=20niezale=C5=BCnie=20od=20debugmode.=20?=
 =?UTF-8?q?Logowanie=20stanu=20kom=C3=B3rki=20i=20warunku=20dla=20spe?=
 =?UTF-8?q?=C5=82nionych=20warunk=C3=B3w.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ground.cpp | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/Ground.cpp b/Ground.cpp
index a99a79fc..052dd988 100644
--- a/Ground.cpp
+++ b/Ground.cpp
@@ -3785,13 +3785,13 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node)
                             Event->Params[5].asMemCell->PutCommand(
                                 Event->Params[6].asTrack->Dynamics[i]->Mechanik,
                                 &Event->Params[4].nGroundNode->pCenter);
-                        if (DebugModeFlag)
+                        //if (DebugModeFlag)
                             WriteLog("EVENT EXECUTED: AddValues & Track command - " +
                                      AnsiString(Event->Params[0].asText) + " " +
                                      AnsiString(Event->Params[1].asdouble) + " " +
                                      AnsiString(Event->Params[2].asdouble));
                     }
-                    else if (DebugModeFlag)
+                    //else if (DebugModeFlag)
                         WriteLog("EVENT EXECUTED: AddValues - " +
                                  AnsiString(Event->Params[0].asText) + " " +
                                  AnsiString(Event->Params[1].asdouble) + " " +
@@ -3842,8 +3842,28 @@ bool TGround::EventConditon(TEvent *e)
     { // porównanie wartości
         if (tmpEvent->Params[9].asMemCell->Compare(e->Params[10].asText, e->Params[11].asdouble,
                                                    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;
-        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
             LogComment = e->Params[9].asMemCell->Text() + AnsiString(" ") +
                          FloatToStrF(e->Params[9].asMemCell->Value1(), ffFixed, 8, 2) + " " +
@@ -3957,13 +3977,13 @@ bool TGround::CheckQuery()
                             tmpEvent->Params[5].asMemCell->PutCommand(
                                 tmpEvent->Params[6].asTrack->Dynamics[i]->Mechanik,
                                 &tmpEvent->Params[4].nGroundNode->pCenter);
-                        if (DebugModeFlag)
+                        //if (DebugModeFlag)
                             WriteLog("Type: UpdateValues & Track command - " +
                                      AnsiString(tmpEvent->Params[0].asText) + " " +
                                      AnsiString(tmpEvent->Params[1].asdouble) + " " +
                                      AnsiString(tmpEvent->Params[2].asdouble));
                     }
-                    else if (DebugModeFlag)
+                    else //if (DebugModeFlag)
                         WriteLog("Type: UpdateValues - " + AnsiString(tmpEvent->Params[0].asText) +
                                  " " + AnsiString(tmpEvent->Params[1].asdouble) + " " +
                                  AnsiString(tmpEvent->Params[2].asdouble));