diff --git a/CppProperties.json b/CppProperties.json new file mode 100644 index 000000000..343a18752 --- /dev/null +++ b/CppProperties.json @@ -0,0 +1,21 @@ + { + "configurations": [ + { + "inheritEnvironments": [ + "msvc_x64" + ], + "name": "x64-Release", + "includePath": [ + "${env.INCLUDE}", + "${workspaceRoot}\\**" + ], + "defines": [ + "WIN32", + "NDEBUG", + "UNICODE", + "_UNICODE" + ], + "intelliSenseMode": "windows-msvc-x64" + } + ] +} \ No newline at end of file diff --git a/Data/Help/Manual.vcxproj b/Data/Help/Manual.vcxproj index 7e2fd4c7f..76af4362e 100644 --- a/Data/Help/Manual.vcxproj +++ b/Data/Help/Manual.vcxproj @@ -13,18 +13,18 @@ {C356A954-2E47-4F1E-AE4A-E22B598514F9} Manual - 10.0.16299.0 + 10.0 Application - v141 + v143 MultiByte true Application - v141 + v143 MultiByte diff --git a/Src/Common/Common.vcxproj b/Src/Common/Common.vcxproj index adae183e3..331ebda7a 100644 --- a/Src/Common/Common.vcxproj +++ b/Src/Common/Common.vcxproj @@ -14,18 +14,18 @@ Common {4A4CEB83-FBC8-4E93-831E-009875E54794} Common - 10.0.16299.0 + 10.0 StaticLibrary - v141 + v143 false Unicode StaticLibrary - v141 + v143 false Unicode diff --git a/Src/DasherCore/DasherCore.vcxproj b/Src/DasherCore/DasherCore.vcxproj index a5ecabfbf..7bbb97f72 100644 --- a/Src/DasherCore/DasherCore.vcxproj +++ b/Src/DasherCore/DasherCore.vcxproj @@ -14,18 +14,18 @@ DasherCore {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8} DasherCore - 10.0.16299.0 + 10.0 StaticLibrary - v141 + v143 false Unicode StaticLibrary - v141 + v143 false Unicode diff --git a/Src/Win32/Dasher.vcxproj b/Src/Win32/Dasher.vcxproj index dd9b94d67..eb7ca8baf 100644 --- a/Src/Win32/Dasher.vcxproj +++ b/Src/Win32/Dasher.vcxproj @@ -14,18 +14,18 @@ Dasher {752501D3-5B04-4F3C-A141-DE426E354D23} Dasher - 10.0.16299.0 + 10.0 Application - v141 + v143 false Unicode Application - v141 + v143 false Unicode diff --git a/Src/Win32/DasherControl.vcxproj b/Src/Win32/DasherControl.vcxproj index b29027338..da1a51a30 100644 --- a/Src/Win32/DasherControl.vcxproj +++ b/Src/Win32/DasherControl.vcxproj @@ -15,17 +15,17 @@ {3998D966-9B9E-4214-ACEA-B777985AF4DD} DasherControl Win32Proj - 10.0.16299.0 + 10.0 StaticLibrary - v141 + v143 Unicode StaticLibrary - v141 + v143 Unicode diff --git a/Src/Win32/DasherMouseInput.cpp b/Src/Win32/DasherMouseInput.cpp index 81cb9eef0..39b0befbb 100644 --- a/Src/Win32/DasherMouseInput.cpp +++ b/Src/Win32/DasherMouseInput.cpp @@ -2,6 +2,17 @@ #include ".\dashermouseinput.h" +//yo + +#include +#include +#include +#include +#include "../DasherCore/TimeSpan.h" + +//fin de yo + + using namespace Dasher; // Track memory leaks on Windows to the line that new'd the memory @@ -31,5 +42,77 @@ bool CDasherMouseInput::GetScreenCoords(screenint &iX, screenint &iY, CDasherVie iX = mousepos.x; iY = mousepos.y; + //yo + + // va, siva counters for (clock?) cycles + va++; + siva++; + // limite pixels? screenunits? mouse movement units + limite = 35; // antes 35, 50, 75. etc- + // yaestuvo = 0; // ?? + + // if (bDidSomething) { // check out + if (siva == 7) { // antes 7 + + + string dePaso9, dePaso1, dePaso2, dePaso3, dePaso4, dePaso5, dePadash; + // dePaso1 = CTimeSpan::GetTimeStamp(); + // dePaso1 = std::to_string(iX); + // dePaso2= std::to_string(iY); + + time_t el_timer; + struct tm y2k = { 0 }; + // double seconds... en el .h private + + y2k.tm_hour = 0; y2k.tm_min = 0; y2k.tm_sec = 0; + y2k.tm_year = 100; y2k.tm_mon = 0; y2k.tm_mday = 1; + + time(&el_timer); /* get current time; same as: timer = time(NULL) */ + + seconds = difftime(el_timer, mktime(&y2k)); + if (va == 5) { // antes 5, 7 etc + iXbis = mousepos.x; + iYbis = mousepos.y; + dePaso1 = std::to_string(iXbis); + dePaso2 = std::to_string(iYbis); + + dnSegundo1 = seconds; + va = 0; + + } + if (siva == 7) { + iXtris = mousepos.x; + iYtris = mousepos.y; + dePaso3 = std::to_string(iXtris); + dePaso4 = std::to_string(iYtris); + dePaso1 = std::to_string(iXbis); + dePaso2 = std::to_string(iYbis); + siva = 0; + } + + dnSegundo2 = seconds; + seconds = dnSegundo2 - dnSegundo1; + + //printf("%.f seconds since January 1, 2000 in the current timezone", seconds); + + dePaso9 = std::to_string(seconds); + + dePadash = " ; "; + + dePaso5 = dePaso9 + dePadash + dePaso1 + dePadash + dePaso2 + dePadash + dePaso3 + dePadash + dePaso4; + wstring temp3 = wstring(dePaso5.begin(), dePaso5.end()); + if ((std::abs(iXtris - iXbis) >= limite) || (std::abs(iXbis - iXtris) >= limite) || (std::abs(iYtris - iYbis) >= limite) || (std::abs(iYbis - iYtris) >= limite)) //{ + MessageBox(nullptr, temp3.c_str(), L"Acortar amplitud...", MB_OK | MB_ICONINFORMATION); + iXbis = iXtris; + iYbis = iYtris; + dePaso1 = std::to_string(iXbis); + dePaso2 = std::to_string(iYbis); + dnSegundo1 = dnSegundo2; + // dnSegundo2 = 0.0; + + } + //fin de yo + + return true; } diff --git a/Src/Win32/DasherMouseInput.h b/Src/Win32/DasherMouseInput.h index 017def959..4c6997f82 100644 --- a/Src/Win32/DasherMouseInput.h +++ b/Src/Win32/DasherMouseInput.h @@ -14,4 +14,19 @@ class Dasher::CDasherMouseInput : public CScreenCoordInput { private: HWND m_hwnd; + +//yo + double seconds = 0.0; + + + //protected: + + screenint iXbis, iXtris, iYbis, iYtris, limite; + int va = 0; + int siva = 0; + double dnSegundo1 = 0.0; + double dnSegundo2 = 0.0; + + //fin de yo + };