tempo-plotter Changeset - 8cac6c6afb36 · protofusion repositories

Changeset - 8cac6c6afb36

Parent rev.

Child rev.

[Not reviewed]

default

0 3 1

Hasan Yavuz ÖZDERYA - 10 years ago 2015-06-04 09:40:35
hy@ozderya.net

added endianness selection

4 files changed with 168 insertions and 69 deletions:

floatswap.h

mainwindow.cpp

mainwindow.ui

140

serialplot.pro

0 comments (0 inline, 0 general)

floatswap.h

➞

Show inline comments

@@ new file 100644 @@
 #include <byteswap.h>
 #include <QtGlobal>
 template <> inline float qbswap<float>(float source)
+{
     float result;
     char* s = (char*) &source;
     char* t = (char*) &result;
     t[0] = s[3];
     t[1] = s[2];
     t[2] = s[1];
     t[3] = s[0];
     return result;
+}

mainwindow.cpp

➞

Show inline comments

@@ @@ -25,6 +25,7 @@ @@
 #include <QFile>
 #include <QTextStream>
 #include <QtDebug>
 #include <QtEndian>
 #include <qwt_plot.h>
 #include <limits.h>
 #include <cmath>
@@ @@ -32,6 +33,7 @@ @@
 #include "utils.h"
 #include "version.h"
 #include "floatswap.h"
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ @@ -519,6 +521,16 @@ template<typename T> double MainWindow:: @@
+{
     T data;
     this->serialPort.read((char*) &data, sizeof(data));
     if (ui->rbLittleE->isChecked())
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}

mainwindow.ui

➞

Show inline comments

@@ @@ -94,75 +94,147 @@ @@
          </widget>
         </item>
         <item>
          <widget class="QGroupBox" name="groupBox">
           <property name="title">
            <string>Number Format:</string>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
            <item row="0" column="0">
             <widget class="QRadioButton" name="rbUint8">
              <property name="text">
               <string>uint8</string>
              </property>
              <property name="checked">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item row="2" column="0">
             <widget class="QRadioButton" name="rbUint32">
              <property name="text">
               <string>uint32</string>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
             <widget class="QRadioButton" name="rbUint16">
              <property name="text">
               <string>uint16</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
             <widget class="QRadioButton" name="rbInt16">
              <property name="text">
               <string>int16</string>
              </property>
             </widget>
            </item>
            <item row="2" column="1">
             <widget class="QRadioButton" name="rbInt32">
              <property name="text">
               <string>int32</string>
              </property>
             </widget>
            </item>
            <item row="3" column="0">
             <widget class="QRadioButton" name="rbFloat">
              <property name="text">
               <string>float</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
             <widget class="QRadioButton" name="rbInt8">
              <property name="text">
               <string>int8</string>
              </property>
             </widget>
            </item>
            <item row="3" column="1">
             <widget class="QRadioButton" name="rbASCII">
              <property name="toolTip">
               <string>Comma Separated Values</string>
              </property>
              <property name="text">
               <string>ASCII(CSV)</string>
              </property>
             </widget>
            </item>
           </layout>
          </widget>
           <item>
            <widget class="QGroupBox" name="groupBox">
             <property name="title">
              <string>Number Format:</string>
             </property>
             <layout class="QGridLayout" name="gridLayout_2">
              <item row="2" column="0">
               <widget class="QRadioButton" name="rbUint32">
                <property name="text">
                 <string>uint32</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QRadioButton" name="rbInt8">
                <property name="text">
                 <string>int8</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QRadioButton" name="rbUint8">
                <property name="text">
                 <string>uint8</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="1">
               <widget class="QRadioButton" name="rbASCII">
                <property name="toolTip">
                 <string>Comma Separated Values</string>
                </property>
                <property name="text">
                 <string>ASCII(CSV)</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QRadioButton" name="rbInt16">
                <property name="text">
                 <string>int16</string>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
               <widget class="QRadioButton" name="rbInt32">
                <property name="text">
                 <string>int32</string>
                </property>
               </widget>
              </item>
              <item row="3" column="0">
               <widget class="QRadioButton" name="rbFloat">
                <property name="text">
                 <string>float</string>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QRadioButton" name="rbUint16">
                <property name="text">
                 <string>uint16</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>1</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QGroupBox" name="groupBox_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="title">
              <string>Byte Order:</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout">
              <item>
               <widget class="QRadioButton" name="rbLittleE">
                <property name="text">
                 <string>Little Endian</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QRadioButton" name="rbBigE">
                <property name="text">
                 <string>Big Endian</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>1</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
         <item>
          <spacer name="horizontalSpacer_3">

serialplot.pro

➞

Show inline comments

@@ @@ -41,7 +41,8 @@ SOURCES += main.cpp\ @@
 HEADERS  += mainwindow.h \
     utils.h \
     customcheckablebutton.h \
     portcontrol.h
     portcontrol.h \
     floatswap.h
 FORMS    += mainwindow.ui \
     about_dialog.ui \

0 comments (0 inline, 0 general)