Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do DasherMouseInput.cpp/h adds trap mouse inputs? #182

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do DasherMouseInput.cpp/h adds trap mouse inputs? #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions CppProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"configurations": [
{
"inheritEnvironments": [
"msvc_x64"
],
"name": "x64-Release",
"includePath": [
"${env.INCLUDE}",
"${workspaceRoot}\\**"
],
"defines": [
"WIN32",
"NDEBUG",
"UNICODE",
"_UNICODE"
],
"intelliSenseMode": "windows-msvc-x64"
}
]
}
6 changes: 3 additions & 3 deletions Data/Help/Manual.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{C356A954-2E47-4F1E-AE4A-E22B598514F9}</ProjectGuid>
<RootNamespace>Manual</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
6 changes: 3 additions & 3 deletions Src/Common/Common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
<ProjectName>Common</ProjectName>
<ProjectGuid>{4A4CEB83-FBC8-4E93-831E-009875E54794}</ProjectGuid>
<RootNamespace>Common</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions Src/DasherCore/DasherCore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
<ProjectName>DasherCore</ProjectName>
<ProjectGuid>{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}</ProjectGuid>
<RootNamespace>DasherCore</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions Src/Win32/Dasher.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
<ProjectName>Dasher</ProjectName>
<ProjectGuid>{752501D3-5B04-4F3C-A141-DE426E354D23}</ProjectGuid>
<RootNamespace>Dasher</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions Src/Win32/DasherControl.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<ProjectGuid>{3998D966-9B9E-4214-ACEA-B777985AF4DD}</ProjectGuid>
<RootNamespace>DasherControl</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
83 changes: 83 additions & 0 deletions Src/Win32/DasherMouseInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

#include ".\dashermouseinput.h"

//yo

#include <cmath>
#include <iostream>
#include <string>
#include <time.h>
#include "../DasherCore/TimeSpan.h"

//fin de yo


using namespace Dasher;

// Track memory leaks on Windows to the line that new'd the memory
Expand Down Expand Up @@ -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;
}
15 changes: 15 additions & 0 deletions Src/Win32/DasherMouseInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

};