CP/W' Solver Colors

.. R is in range 0.2 - 1.0 realistically

.gitignore

@@ -11,6 +11,7 @@ Makefile
 .svn
 *.pri
 *.prl
+*.swp
 
 # osx noise
 .DS_Store

.travis.yml

@@ -7,7 +7,6 @@ compiler:
 - gcc
 env:
   matrix:
-## Test 4.8 or 5.4.2
   - BRANCH=master QT=qt4 QT_PATH=qt
   - BRANCH=master QT=qt5 QT_PATH=qt5
   global:
@@ -20,8 +19,8 @@ env:
 before_install:
 - date
 - brew update
-##- sh travis/install-qt.sh
-- brew install $QT
+- sh travis/install-qt.sh
+##- brew install $QT
 - brew install libical
 - brew install libusb libusb-compat
 - brew install srmio
@@ -48,7 +47,7 @@ before_script:
 - sudo cp /Volumes/release/D2XX/Object/10.5-10.7/x86_64/libftd2xx.1.2.2.dylib /usr/local/lib
 - cp /Volumes/release/D2XX/bin/*.h D2XX
 - sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.2.2.dylib|"
-  src/D2XX.cpp
+  src/FileIO/D2XX.cpp
 - cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
 - cp src/gcconfig.pri.in src/gcconfig.pri
 - /usr/local/opt/$QT_PATH/bin/lupdate src/src.pro
@@ -75,7 +74,7 @@ before_script:
 - sed -i "" "s|#\(ICAL_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
 - sed -i "" "s|#\(ICAL_LIBS    =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
 - sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
-- sed -i "" "s|#\(LIBUSB_LIBS    =.*\)|\1 -L/usr/local/lib -lusb|" src/gcconfig.pri
+- sed -i "" "s|#\(LIBUSB_LIBS    =.*\)|\1 -L/usr/local/lib -lusb -lusb-1.0|" src/gcconfig.pri
 - sed -i "" "s|#\(SAMPLERATE_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
 - sed -i "" "s|#\(SAMPLERATE_LIBS =\).*|\1 -L/usr/local/lib -lsamplerate|" src/gcconfig.pri
 - sed -i "" "s|#\(DEFINES += GC_HAVE_LION*\)|\1|" src/gcconfig.pri
@@ -84,11 +83,11 @@ before_script:
 - sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri
 - sed -i "" "s|#\(DEFINES += GC_VIDEO_QUICKTIME.*\)|\1 |" src/gcconfig.pri
 - echo "QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.7 -arch x86_64" >> src/gcconfig.pri
-- sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Secrets.h
-- sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Secrets.h
-- sed -i "" "s/__GC_DROPBOX_CLIENT_SECRET__/"$GC_DROPBOX_CLIENT_SECRET"/" src/Secrets.h
-- sed -i "" "s/__GC_CYCLINGANALYTICS_CLIENT_SECRET__/"$GC_CYCLINGANALYTICS_CLIENT_SECRET"/" src/Secrets.h
-- sed -i "" "s/__GC_TWITTER_CONSUMER_SECRET__/"$GC_TWITTER_CONSUMER_SECRET"/" src/Secrets.h
+- sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_DROPBOX_CLIENT_SECRET__/"$GC_DROPBOX_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_CYCLINGANALYTICS_CLIENT_SECRET__/"$GC_CYCLINGANALYTICS_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_TWITTER_CONSUMER_SECRET__/"$GC_TWITTER_CONSUMER_SECRET"/" src/Core/Secrets.h
 - cat src/gcconfig.pri
 script:
 - CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+=-Wno-unused-private-field

qtsolutions/common.pri

@@ -1,6 +1,4 @@
-exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsoap-uselib
 TEMPLATE += fakelib
 QTSOAP_LIBNAME = $$qtLibraryTarget(QtSolutions_SOAP-2.7)
 TEMPLATE -= fakelib
 QTSOAP_LIBDIR = $$PWD/lib
-unix:qtsoap-uselib:!qtsoap-buildlib:QMAKE_RPATHDIR += $$QTSOAP_LIBDIR

qwt/src/src.pri

@@ -77,7 +77,6 @@ SOURCES += \
     qwt_scale_div.cpp \
     qwt_scale_draw.cpp \
     qwt_scale_map.cpp \
-    qwt_scale_map_table.h \
     qwt_spline.cpp \
     qwt_scale_engine.cpp \
     qwt_symbol.cpp \

qxt/src/qxtspanslider.cpp

@@ -29,6 +29,7 @@
 #include <QApplication>
 #include <QStylePainter>
 #include <QStyleOptionSlider>
+#include <QTime>
 
 QxtSpanSliderPrivate::QxtSpanSliderPrivate() :
         lower(0),
@@ -622,6 +623,16 @@ void QxtSpanSlider::mousePressEvent(QMouseEvent* event)
  */
 void QxtSpanSlider::mouseMoveEvent(QMouseEvent* event)
 {
+    // hack for uncompressed mouse events
+#if defined(Q_OS_LINUX) && (QT_VERSION > 0x050000) && (QT_VERSION < 0x050600)
+    static QTime p;
+    if (p.elapsed() > 0 && p.elapsed() < 100) {
+        event->ignore();
+        return;
+    }
+    p.start();
+#endif
+
     if (qxt_d().lowerPressed != QStyle::SC_SliderHandle && qxt_d().upperPressed != QStyle::SC_SliderHandle)
     {
         event->ignore();

src/.gitignore

@@ -6,6 +6,13 @@ Info.plist
 *.xcodeproj
 gcconfig.pri
 
+# QtCreator
+src.pro.user
+*.autosave
+
+# MSVC2015
+*.opt
+
 # old skool
 .svn
 

src/ANT/ANT.h

@@ -306,6 +306,7 @@ struct setChannelAtom {
 
 // ant+ fitness equipment profile data pages
 #define FITNESS_EQUIPMENT_GENERAL_PAGE              0x10
+#define FITNESS_EQUIPMENT_STATIONARY_SPECIFIC_PAGE  0x15
 #define FITNESS_EQUIPMENT_TRAINER_SPECIFIC_PAGE     0x19
 #define FITNESS_EQUIPMENT_TRAINER_TORQUE_PAGE       0x20
 #define FITNESS_EQUIPMENT_TRAINER_CAPABILITIES_PAGE 0x36

src/ANT/ANTChannel.cpp

@@ -801,6 +801,16 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
                    // Note : fecMaxResistance information available but not used
                    fecCapabilities = antMessage.fecCapabilities;
                    qDebug() << "Capabilities received from ANT FEC Device:" << fecCapabilities;
+               } else if (antMessage.data_page == FITNESS_EQUIPMENT_STATIONARY_SPECIFIC_PAGE)
+               {
+                   if (antMessage.fecInstantPower != 0xFFFF)
+                       is_alt ? parent->setAltWatts(antMessage.fecInstantPower) : parent->setWatts(antMessage.fecInstantPower);
+                   if (antMessage.fecCadence != 0xFF)
+                       parent->setSecondaryCadence(antMessage.fecCadence);
+                   parent->setTrainerStatusAvailable(true);
+
+                   parent->setTrainerReady(antMessage.fecState==FITNESS_EQUIPMENT_READY);
+                   parent->setTrainerRunning(antMessage.fecState==FITNESS_EQUIPMENT_IN_USE);
                }
                break;
            }

src/ANT/ANTMessage.cpp

@@ -549,6 +549,14 @@ ANTMessage::ANTMessage(ANT *parent, const unsigned char *message) {
                      fecState = (message[11] & 0xF0) >> 4;
                      break;
 
+                case FITNESS_EQUIPMENT_STATIONARY_SPECIFIC_PAGE:
+                    //based on "ANT+ Device Profile Fitness Equipment" rev 4.1 p 58: 6.6.3 Data page 0x15 - Specific stationary bike data
+                    fecCadence = message[8];
+                    fecInstantPower = message[9];
+                    fecInstantPower |= message[10] << 8;
+                    fecState = (message[11] & 0xF0) >> 4;
+                    break;
+
                 case FITNESS_EQUIPMENT_TRAINER_TORQUE_PAGE:
                      //based on "ANT+ Device Profile Fitness Equipment" rev 4.1 p 61: 6.6.8 Data page 0x20 - Specific trainer torque data
                      fecPage0x20EventCount = message[5];