From 4c237558dd079133f48789da9e97b541c2e89fa5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 2 Nov 2014 12:05:04 +0100 Subject: rename csv module dir --- CMakeLists.txt | 2 +- csv/csv.cpp | 161 ++++++++++++++++++++++++++ csv/csv.h | 26 +++++ ftnoir_csv/csv.cpp | 161 -------------------------- ftnoir_csv/csv.h | 26 ----- ftnoir_protocol_ft/ftnoir_protocol_ft.cpp | 2 +- ftnoir_protocol_wine/ftnoir_protocol_wine.cpp | 2 +- 7 files changed, 190 insertions(+), 190 deletions(-) create mode 100644 csv/csv.cpp create mode 100644 csv/csv.h delete mode 100644 ftnoir_csv/csv.cpp delete mode 100644 ftnoir_csv/csv.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 5325f673..335eab80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ if(NOT WIN32 AND NOT APPLE) target_link_libraries(opentrack-compat rt) endif() -opentrack_module(opentrack-csv ftnoir_csv) +opentrack_module(opentrack-csv csv) add_library(opentrack-csv STATIC ${opentrack-csv-c}) target_link_libraries(opentrack-csv ${MY_QT_LIBS}) diff --git a/csv/csv.cpp b/csv/csv.cpp new file mode 100644 index 00000000..71db8ecb --- /dev/null +++ b/csv/csv.cpp @@ -0,0 +1,161 @@ +/******************************************************************************** +* FaceTrackNoIR This program is a private project of the some enthusiastic * +* gamers from Holland, who don't like to pay much for * +* head-tracking. * +* * +* Copyright (C) 2013 Wim Vriend (Developing) * +* Ron Hendriks (Researching and Testing) * +* * +* Homepage * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU General Public License as published by the * +* Free Software Foundation; either version 3 of the License, or (at your * +* option) any later version. * +* * +* This program is distributed in the hope that it will be useful, but * +* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * +* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * +* more details. * +* * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, see . * +* * +********************************************************************************/ +#define INSIDE_CSV +#include "csv.h" +#include +#include +#include +#include + +CSV::CSV(QIODevice * device) +{ + m_device = device; + m_codec = QTextCodec::codecForLocale(); + m_pos = 0; + m_rx = QRegExp("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)\\n"); +} +CSV::CSV(QString &string){ + m_device = NULL; + m_codec = QTextCodec::codecForLocale(); + m_string = string; + m_pos = 0; + m_rx = QRegExp("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)\\n"); +} + +void CSV::setCodec(const char* codecName){ + m_codec = QTextCodec::codecForName(codecName); +} + +QString CSV::readLine(){ + QString line; + + if(m_string.isNull()){ + if(m_device && m_device->isReadable()){ + QTextDecoder dec(m_codec); + m_string = dec.toUnicode(m_device->readAll()); + }else{ + return QString(); + } + } + if((m_pos = m_rx.indexIn(m_string,m_pos)) != -1) { + line = m_rx.cap(1); + m_pos += m_rx.matchedLength(); + } + return line; + +} +QStringList CSV::parseLine(){ + return parseLine(readLine()); +} +QStringList CSV::parseLine(QString line){ + QStringList list; + int pos2 = 0; + QRegExp rx2("(?:\"([^\"]*)\";?)|(?:([^;]*);?)"); + if(line.size()<1){ + list << ""; + }else while (line.size()>pos2 && (pos2 = rx2.indexIn(line, pos2)) != -1) { + QString col; + if(rx2.cap(1).size()>0) + col = rx2.cap(1); + else if(rx2.cap(2).size()>0) + col = rx2.cap(2); + + list << col; + + if(col.size()) + pos2 += rx2.matchedLength(); + else + pos2++; + } + return list; +} + +void CSV::getGameData( const int id, unsigned char* table, QString& gamename) +{ + QString gameID = QString::number(id); + + /* zero table first, in case unknown game is connecting */ + memset(table, 0, 8); + QStringList gameLine; + qDebug() << "getGameData, ID = " << gameID; + + QFile file(QCoreApplication::applicationDirPath() + "/settings/facetracknoir supported games.csv"); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){ + return; + } + CSV csv(&file); + gameLine = csv.parseLine(); + + while (gameLine.count() > 2) { + //qDebug() << "Column 0: " << gameLine.at(0); // No. + //qDebug() << "Column 1: " << gameLine.at(1); // Game Name + //qDebug() << "Column 2: " << gameLine.at(2); // Game Protocol + //qDebug() << "Column 3: " << gameLine.at(3); // Supported since version + //qDebug() << "Column 4: " << gameLine.at(4); // Verified + //qDebug() << "Column 5: " << gameLine.at(5); // By + //qDebug() << "Column 6: " << gameLine.at(6); // International ID + //qDebug() << "Column 7: " << gameLine.at(7); // FaceTrackNoIR ID + + if (gameLine.count() > 6) { + if (gameLine.at(6).compare( gameID, Qt::CaseInsensitive ) == 0) { + QByteArray id = gameLine.at(7).toLatin1(); + unsigned int tmp[8]; + unsigned int fuzz[3]; + if (gameLine.at(3) == QString("V160")) + { + qDebug() << "no table"; + } + else if (sscanf(id.constData(), + "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", + fuzz + 2, + fuzz + 0, + tmp + 3, + tmp + 2, + tmp + 1, + tmp + 0, + tmp + 7, + tmp + 6, + tmp + 5, + tmp + 4, + fuzz + 1) != 11) + { + qDebug() << "scanf failed" << fuzz[0] << fuzz[1] << fuzz[2]; + } + else + for (int i = 0; i < 8; i++) + table[i] = tmp[i]; + qDebug() << gameID << "game-id" << gameLine.at(7); + gamename = gameLine.at(1); + file.close(); + return; + } + } + + gameLine = csv.parseLine(); + } + + qDebug() << "Unknown game connected" << gameID; + file.close(); +} diff --git a/csv/csv.h b/csv/csv.h new file mode 100644 index 00000000..e0eac7dd --- /dev/null +++ b/csv/csv.h @@ -0,0 +1,26 @@ +#pragma once +#include +#include +#include +#include +#include +#include + +class CSV +{ +public: + QString readLine(); + QStringList parseLine(); + static QStringList parseLine(QString line); + + void setCodec(const char* codecName); + static void getGameData(const int gameID, unsigned char* table, QString& gamename); +private: + QIODevice *m_device; + QTextCodec *m_codec; + QString m_string; + int m_pos; + QRegExp m_rx; + CSV(QIODevice * device); + CSV(QString &string); +}; diff --git a/ftnoir_csv/csv.cpp b/ftnoir_csv/csv.cpp deleted file mode 100644 index 71db8ecb..00000000 --- a/ftnoir_csv/csv.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************** -* FaceTrackNoIR This program is a private project of the some enthusiastic * -* gamers from Holland, who don't like to pay much for * -* head-tracking. * -* * -* Copyright (C) 2013 Wim Vriend (Developing) * -* Ron Hendriks (Researching and Testing) * -* * -* Homepage * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU General Public License as published by the * -* Free Software Foundation; either version 3 of the License, or (at your * -* option) any later version. * -* * -* This program is distributed in the hope that it will be useful, but * -* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * -* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * -* more details. * -* * -* You should have received a copy of the GNU General Public License along * -* with this program; if not, see . * -* * -********************************************************************************/ -#define INSIDE_CSV -#include "csv.h" -#include -#include -#include -#include - -CSV::CSV(QIODevice * device) -{ - m_device = device; - m_codec = QTextCodec::codecForLocale(); - m_pos = 0; - m_rx = QRegExp("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)\\n"); -} -CSV::CSV(QString &string){ - m_device = NULL; - m_codec = QTextCodec::codecForLocale(); - m_string = string; - m_pos = 0; - m_rx = QRegExp("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)\\n"); -} - -void CSV::setCodec(const char* codecName){ - m_codec = QTextCodec::codecForName(codecName); -} - -QString CSV::readLine(){ - QString line; - - if(m_string.isNull()){ - if(m_device && m_device->isReadable()){ - QTextDecoder dec(m_codec); - m_string = dec.toUnicode(m_device->readAll()); - }else{ - return QString(); - } - } - if((m_pos = m_rx.indexIn(m_string,m_pos)) != -1) { - line = m_rx.cap(1); - m_pos += m_rx.matchedLength(); - } - return line; - -} -QStringList CSV::parseLine(){ - return parseLine(readLine()); -} -QStringList CSV::parseLine(QString line){ - QStringList list; - int pos2 = 0; - QRegExp rx2("(?:\"([^\"]*)\";?)|(?:([^;]*);?)"); - if(line.size()<1){ - list << ""; - }else while (line.size()>pos2 && (pos2 = rx2.indexIn(line, pos2)) != -1) { - QString col; - if(rx2.cap(1).size()>0) - col = rx2.cap(1); - else if(rx2.cap(2).size()>0) - col = rx2.cap(2); - - list << col; - - if(col.size()) - pos2 += rx2.matchedLength(); - else - pos2++; - } - return list; -} - -void CSV::getGameData( const int id, unsigned char* table, QString& gamename) -{ - QString gameID = QString::number(id); - - /* zero table first, in case unknown game is connecting */ - memset(table, 0, 8); - QStringList gameLine; - qDebug() << "getGameData, ID = " << gameID; - - QFile file(QCoreApplication::applicationDirPath() + "/settings/facetracknoir supported games.csv"); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){ - return; - } - CSV csv(&file); - gameLine = csv.parseLine(); - - while (gameLine.count() > 2) { - //qDebug() << "Column 0: " << gameLine.at(0); // No. - //qDebug() << "Column 1: " << gameLine.at(1); // Game Name - //qDebug() << "Column 2: " << gameLine.at(2); // Game Protocol - //qDebug() << "Column 3: " << gameLine.at(3); // Supported since version - //qDebug() << "Column 4: " << gameLine.at(4); // Verified - //qDebug() << "Column 5: " << gameLine.at(5); // By - //qDebug() << "Column 6: " << gameLine.at(6); // International ID - //qDebug() << "Column 7: " << gameLine.at(7); // FaceTrackNoIR ID - - if (gameLine.count() > 6) { - if (gameLine.at(6).compare( gameID, Qt::CaseInsensitive ) == 0) { - QByteArray id = gameLine.at(7).toLatin1(); - unsigned int tmp[8]; - unsigned int fuzz[3]; - if (gameLine.at(3) == QString("V160")) - { - qDebug() << "no table"; - } - else if (sscanf(id.constData(), - "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - fuzz + 2, - fuzz + 0, - tmp + 3, - tmp + 2, - tmp + 1, - tmp + 0, - tmp + 7, - tmp + 6, - tmp + 5, - tmp + 4, - fuzz + 1) != 11) - { - qDebug() << "scanf failed" << fuzz[0] << fuzz[1] << fuzz[2]; - } - else - for (int i = 0; i < 8; i++) - table[i] = tmp[i]; - qDebug() << gameID << "game-id" << gameLine.at(7); - gamename = gameLine.at(1); - file.close(); - return; - } - } - - gameLine = csv.parseLine(); - } - - qDebug() << "Unknown game connected" << gameID; - file.close(); -} diff --git a/ftnoir_csv/csv.h b/ftnoir_csv/csv.h deleted file mode 100644 index e0eac7dd..00000000 --- a/ftnoir_csv/csv.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#include -#include -#include -#include -#include -#include - -class CSV -{ -public: - QString readLine(); - QStringList parseLine(); - static QStringList parseLine(QString line); - - void setCodec(const char* codecName); - static void getGameData(const int gameID, unsigned char* table, QString& gamename); -private: - QIODevice *m_device; - QTextCodec *m_codec; - QString m_string; - int m_pos; - QRegExp m_rx; - CSV(QIODevice * device); - CSV(QString &string); -}; diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp index 2dd10d1d..08d41897 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp @@ -25,7 +25,7 @@ * to games, using the FreeTrackClient.dll. ********************************************************************************/ #include "ftnoir_protocol_ft.h" -#include "ftnoir_csv/csv.h" +#include "csv/csv.h" FTNoIR_Protocol::FTNoIR_Protocol() : shm(FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap)), diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp index db030554..5f80944a 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp @@ -3,7 +3,7 @@ #include #include /* For mode constants */ #include /* For O_* constants */ -#include "ftnoir_csv/csv.h" +#include "csv/csv.h" FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0) { -- cgit v1.2.3