--- a/nbproject/configurations.xml Thu Mar 07 17:03:43 2019 +0100
+++ b/nbproject/configurations.xml Thu Mar 07 17:56:38 2019 +0100
@@ -72,6 +72,8 @@
</df>
</df>
<df name="src">
+ <in>SpacenavWindow.cpp</in>
+ <in>SpacenavWrapper.cpp</in>
<in>spacenav-demo-qt.cpp</in>
</df>
</df>
@@ -79,6 +81,13 @@
displayName="spacenav-demo-qt_autogen"
projectFiles="true"
root="build/Debug/src/spacenav-demo-qt_autogen">
+ <logicalFolder name="EWIEGA46WW" displayName="EWIEGA46WW" projectFiles="true">
+ <itemPath>build/Debug/src/spacenav-demo-qt_autogen/EWIEGA46WW/moc_SpacenavReceiver.cpp</itemPath>
+ <itemPath>build/Debug/src/spacenav-demo-qt_autogen/EWIEGA46WW/moc_SpacenavWindow.cpp</itemPath>
+ </logicalFolder>
+ <logicalFolder name="include" displayName="include" projectFiles="true">
+ <itemPath>build/Debug/src/spacenav-demo-qt_autogen/include/ui_SpacenavWindow.h</itemPath>
+ </logicalFolder>
<itemPath>build/Debug/src/spacenav-demo-qt_autogen/mocs_compilation.cpp</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
@@ -117,6 +126,23 @@
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/Debug/src/spacenav-demo-qt</executablePath>
+ <ccTool flags="1">
+ <incDir>
+ <pElem>build/Debug/src</pElem>
+ <pElem>src</pElem>
+ <pElem>build/Debug/src/spacenav-demo-qt_autogen/include</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
+ <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
+ </incDir>
+ <preprocessorList>
+ <Elem>QT_CORE_LIB</Elem>
+ <Elem>QT_GUI_LIB</Elem>
+ <Elem>QT_WIDGETS_LIB</Elem>
+ </preprocessorList>
+ </ccTool>
</makeTool>
<preBuild>
<preBuildCommandWorkingDir>build/Debug</preBuildCommandWorkingDir>
@@ -129,6 +155,16 @@
tool="1"
flavor2="11">
</item>
+ <item path="build/Debug/src/spacenav-demo-qt_autogen/EWIEGA46WW/moc_SpacenavReceiver.cpp"
+ ex="true"
+ tool="3"
+ flavor2="0">
+ </item>
+ <item path="build/Debug/src/spacenav-demo-qt_autogen/EWIEGA46WW/moc_SpacenavWindow.cpp"
+ ex="true"
+ tool="3"
+ flavor2="0">
+ </item>
<item path="build/Debug/src/spacenav-demo-qt_autogen/mocs_compilation.cpp"
ex="false"
tool="1"
@@ -160,8 +196,6 @@
<folder path="0/build/Debug">
<ccTool>
<incDir>
- <pElem>build/Debug/src</pElem>
- <pElem>src</pElem>
<pElem>build/Debug/src/xxx_autogen/include</pElem>
</incDir>
<preprocessorList>
@@ -169,94 +203,20 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/src">
- <ccTool>
- <incDir>
- <pElem>build/Debug/src</pElem>
- <pElem>src</pElem>
- <pElem>build/Debug/src/spacenav-demo-qt_autogen/include</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
- <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
- </incDir>
- <preprocessorList>
- <Elem>QT_CORE_LIB</Elem>
- <Elem>QT_GUI_LIB</Elem>
- <Elem>QT_WIDGETS_LIB</Elem>
- </preprocessorList>
- </ccTool>
- </folder>
<folder path="Modules">
<ccTool>
<incDir>
- <pElem>build/Debug/src</pElem>
- <pElem>src</pElem>
- <pElem>build/Debug/src/spacenav-demo-qt_autogen/include</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
- <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
<pElem>/usr/include</pElem>
</incDir>
- <preprocessorList>
- <Elem>QT_CORE_LIB</Elem>
- <Elem>QT_GUI_LIB</Elem>
- <Elem>QT_WIDGETS_LIB</Elem>
- </preprocessorList>
</ccTool>
</folder>
- <folder path="spacenav-demo-qt_autogen">
- <ccTool>
- <incDir>
- <pElem>build/Debug/src</pElem>
- <pElem>src</pElem>
- <pElem>build/Debug/src/spacenav-demo-qt_autogen/include</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
- <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
- </incDir>
- <preprocessorList>
- <Elem>QT_CORE_LIB</Elem>
- <Elem>QT_GUI_LIB</Elem>
- <Elem>QT_WIDGETS_LIB</Elem>
- </preprocessorList>
- </ccTool>
- </folder>
- <item path="src/SpacenavReceiver.cpp" ex="false" tool="1" flavor2="8">
+ <item path="src/SpacenavWindow.cpp" ex="false" tool="1" flavor2="8">
<ccTool flags="1">
- <incDir>
- <pElem>build/Debug/src</pElem>
- <pElem>src</pElem>
- <pElem>build/Debug/src/spacenav-demo-qt_autogen/include</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
- <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
- </incDir>
- <preprocessorList>
- <Elem>QT_CORE_LIB</Elem>
- <Elem>QT_GUI_LIB</Elem>
- <Elem>QT_WIDGETS_LIB</Elem>
- </preprocessorList>
</ccTool>
</item>
- <item path="src/SpacenavWindow.cpp" ex="false" tool="1" flavor2="0">
- </item>
- <item path="src/SpacenavWindow.h" ex="false" tool="3" flavor2="0">
- </item>
- <item path="src/SpacenavWindow.ui" ex="false" tool="3" flavor2="0">
- </item>
- <item path="src/SpacenavWindow_.h" ex="false" tool="3" flavor2="0">
- </item>
- <item path="src/SpacenavWrapper.cpp" ex="false" tool="1" flavor2="0">
- </item>
- <item path="src/SpacenavWrapper.h" ex="false" tool="3" flavor2="0">
+ <item path="src/SpacenavWrapper.cpp" ex="false" tool="1" flavor2="8">
+ <ccTool flags="1">
+ </ccTool>
</item>
<item path="src/spacenav-demo-qt.cpp" ex="false" tool="1" flavor2="8">
<ccTool flags="1">
@@ -331,26 +291,12 @@
</incDir>
</ccTool>
</folder>
- <item path="src/SpacenavReceiver.cpp" ex="false" tool="1" flavor2="0">
- </item>
- <item path="src/SpacenavWindow.cpp" ex="false" tool="1" flavor2="0">
- </item>
- <item path="src/SpacenavWindow.h" ex="false" tool="3" flavor2="0">
- </item>
<item path="src/SpacenavWindow.ui" ex="false" tool="3" flavor2="0">
</item>
- <item path="src/SpacenavWindow_.h" ex="false" tool="3" flavor2="0">
- </item>
- <item path="src/SpacenavWrapper.cpp" ex="false" tool="1" flavor2="0">
- </item>
- <item path="src/SpacenavWrapper.h" ex="false" tool="3" flavor2="0">
- </item>
<item path="src/spacenav-demo-qt.cpp" ex="false" tool="1" flavor2="8">
<ccTool flags="0">
</ccTool>
</item>
- <item path="src/spnav-wrapper.h" ex="false" tool="3" flavor2="0">
- </item>
</conf>
</confs>
</configurationDescriptor>
--- a/src/SpacenavWindow.cpp Thu Mar 07 17:03:43 2019 +0100
+++ b/src/SpacenavWindow.cpp Thu Mar 07 17:56:38 2019 +0100
@@ -37,19 +37,28 @@
m->setValue(0);
m->setFormat("%v");
}
+
+ widget.period->setMinimum(0);
+ widget.period->setMaximum(100);
+ widget.period->setValue(0);
+ widget.period->setFormat("%v ms");
+ widget.period->setToolTip("duration in milliseconds from the last change");
}
SpacenavWindow::~SpacenavWindow() {
}
void SpacenavWindow::spacenavMotionEvent(SpacenavWrapper::Event::MotionEvent e) {
- setWindowTitle("m event!");
widget.motionX->setValue(e.x);
widget.motionY->setValue(e.y);
widget.motionZ->setValue(e.z);
+
widget.rotationX->setValue(e.rx);
widget.rotationY->setValue(e.ry);
widget.rotationZ->setValue(e.rz);
+
+ widget.period->setValue(e.period);
+ // std::wcerr << L"period: " << e.period << std::endl;
}
void SpacenavWindow::spacenavButtonEvent(SpacenavWrapper::Event::ButtonEvent e) {
--- a/src/SpacenavWindow.ui Thu Mar 07 17:03:43 2019 +0100
+++ b/src/SpacenavWindow.ui Thu Mar 07 17:56:38 2019 +0100
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>579</width>
- <height>346</height>
+ <width>601</width>
+ <height>435</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,128 +15,156 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="button0label">
<property name="text">
- <string>Button</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="button0">
- <property name="text">
- <string>left</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="button1label">
- <property name="text">
- <string>Button</string>
+ <string>0</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QCheckBox" name="button1">
+ <widget class="QCheckBox" name="button0">
<property name="text">
- <string>right</string>
+ <string/>
</property>
</widget>
</item>
<item row="2" column="0">
+ <widget class="QLabel" name="button1label">
+ <property name="text">
+ <string>1</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="button1">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
<widget class="QLabel" name="motionLabel">
<property name="text">
<string>Motion:</string>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="4" column="0">
<widget class="QLabel" name="motionXlabel">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="4" column="1">
<widget class="QProgressBar" name="motionX"/>
</item>
- <item row="4" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="motionYlabel">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="6" column="0">
<widget class="QLabel" name="motionZlabel">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
- <item row="8" column="0">
+ <item row="9" column="0">
<widget class="QLabel" name="RotationLabel">
<property name="text">
<string>Rotation:</string>
</property>
</widget>
</item>
- <item row="11" column="0">
+ <item row="12" column="0">
<widget class="QLabel" name="rotationYlabel">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
- <item row="12" column="0">
+ <item row="13" column="0">
<widget class="QLabel" name="rotationZlabel">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="5" column="1">
<widget class="QProgressBar" name="motionY">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="6" column="1">
<widget class="QProgressBar" name="motionZ">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
- <item row="11" column="1">
+ <item row="12" column="1">
<widget class="QProgressBar" name="rotationY">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
- <item row="10" column="1">
+ <item row="11" column="1">
<widget class="QProgressBar" name="rotationX">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
- <item row="10" column="0">
+ <item row="11" column="0">
<widget class="QLabel" name="rotationXlabel">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
- <item row="12" column="1">
+ <item row="13" column="1">
<widget class="QProgressBar" name="rotationZ">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="buttonLabel">
+ <property name="text">
+ <string>Button:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="14" column="0">
+ <widget class="QLabel" name="infoLabel">
+ <property name="text">
+ <string>Info:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="0">
+ <widget class="QLabel" name="periodLabel">
+ <property name="text">
+ <string>period</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="1">
+ <widget class="QProgressBar" name="period">
+ <property name="value">
+ <number>24</number>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar">
@@ -144,7 +172,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>579</width>
+ <width>601</width>
<height>23</height>
</rect>
</property>