tempo-plotter Changeset - cc65dd8fc5fc · protofusion repositories

Changeset - cc65dd8fc5fc

Parent rev.

Child rev.

[Not reviewed]

default

0 7 2

Hasan Yavuz ÖZDERYA - 10 years ago 2016-02-28 09:21:55
hy@ozderya.net

added command name widget

9 files changed with 83 insertions and 2 deletions:

CMakeLists.txt

commandpanel.cpp

commandpanel.h

commandwidget.cpp

commandwidget.h

commandwidget.ui

serialplot.pro

sneakylineedit.cpp

sneakylineedit.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -43,96 +43,97 @@ set(QWT_STATIC_INCLUDE "" CACHE PATH "Pa @@
 if (QWT_USE_STATIC)
   set(QWT_LIBRARY ${QWT_STATIC_LIBRARY})
   set(QWT_INCLUDE_DIR ${QWT_STATIC_INCLUDE})
 else (QWT_USE_STATIC)
   find_package(Qwt 6.1 REQUIRED)
 endif (QWT_USE_STATIC)
 # includes
 include_directories(${QWT_INCLUDE_DIR})
 # wrap UI and resource files
 qt5_wrap_ui(UI_FILES
   mainwindow.ui
   portcontrol.ui
   about_dialog.ui
   snapshotview.ui
   commandpanel.ui
   commandwidget.ui
   dataformatpanel.ui
+  )
 if (WIN32)
   qt5_add_resources(RES_FILES misc/icons.qrc misc/winicons.qrc)
 else (WIN32)
   qt5_add_resources(RES_FILES misc/icons.qrc)
 endif (WIN32)
 add_executable(${PROGRAM_NAME} WIN32
   main.cpp
   mainwindow.cpp
   portcontrol.cpp
   plot.cpp
   zoomer.cpp
   hidabletabwidget.cpp
   framebuffer.cpp
   scalepicker.cpp
   scalezoomer.cpp
   portlist.cpp
   snapshot.cpp
   snapshotview.cpp
   snapshotmanager.cpp
   plotsnapshotoverlay.cpp
   commandpanel.cpp
   commandwidget.cpp
   commandedit.cpp
   dataformatpanel.cpp
   tooltipfilter.cpp
   sneakylineedit.cpp
   ${UI_FILES}
   ${RES_FILES}
   misc/windows_icon.rc
+  )
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
 # set compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 # Enable C++11 support, fail if not supported
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 if(COMPILER_SUPPORTS_CXX11)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif(COMPILER_SUPPORTS_CXX0X)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 else()
   message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif()
 # version number
 set(MAJOR_VERSION 0 CACHE INT "Program major version number.")
 set(MINOR_VERSION 6 CACHE INT "Program minor version number.")
 set(PATCH_VERSION 0 CACHE INT "Program patch version number.")
 set(VERSION_STRING "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
 # get revision number from mercurial
 find_program(MERCURIAL hg)
 if (MERCURIAL)
   execute_process(COMMAND ${MERCURIAL} id -i
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     RESULT_VARIABLE MERCURIAL_RESULT
     OUTPUT_VARIABLE VERSION_REVISION
     OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(NOT MERCURIAL_RESULT EQUAL 0)
     set(VERSION_SCM_REVISION false)
   endif(NOT MERCURIAL_RESULT EQUAL 0)
 endif (MERCURIAL)
 if (NOT VERSION_REVISION)
   set(VERSION_REVISION "0")
 endif (NOT VERSION_REVISION)

commandpanel.cpp

➞

Show inline comments

 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot 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.
   serialplot 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 serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "commandpanel.h"
 #include "ui_commandpanel.h"
 #include <QByteArray>
 #include <QtDebug>
 CommandPanel::CommandPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CommandPanel)
+{
     serialPort = port;
     ui->setupUi(this);
     ui->scrollAreaWidgetContents->setLayout(new QVBoxLayout);
 #ifdef Q_OS_WIN
     ui->pbNew->setIcon(QIcon(":/icons/list-add"));
 #endif // Q_OS_WIN
     connect(ui->pbNew, &QPushButton::clicked, this, &CommandPanel::newCommand);
     command_name_counter = 0;
     newCommand(); // add an empty slot by default
+}
 CommandPanel::~CommandPanel()
+{
     delete ui;
+}
 void CommandPanel::newCommand()
+{
     auto command = new CommandWidget();
     command_name_counter++;
     command->setName(trUtf8("Command ") + QString::number(command_name_counter));
     ui->scrollAreaWidgetContents->layout()->addWidget(command);
     connect(command, &CommandWidget::sendCommand, this, &CommandPanel::sendCommand);
+}
 void CommandPanel::sendCommand(QByteArray command)
+{
     if (!serialPort->isOpen())
+    {
         qCritical() << "Port is not open!";
         return;
+    }
     if (serialPort->write(command) < 0)
+    {
         qCritical() << "Send command failed!";
+    }
+}

commandpanel.h

➞

Show inline comments

 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot 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.
   serialplot 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 serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef COMMANDPANEL_H
 #define COMMANDPANEL_H
 #include <QWidget>
 #include <QSerialPort>
 #include <QByteArray>
 #include "commandwidget.h"
 namespace Ui {
 class CommandPanel;
+}
 class CommandPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit CommandPanel(QSerialPort* port, QWidget *parent = 0);
     ~CommandPanel();
 private:
     Ui::CommandPanel *ui;
     QSerialPort* serialPort;
     unsigned command_name_counter;
 private slots:
     void newCommand();
     void sendCommand(QByteArray command);
 };
 #endif // COMMANDPANEL_H

commandwidget.cpp

➞

Show inline comments

@@ @@ -48,48 +48,58 @@ CommandWidget::~CommandWidget() @@
 void CommandWidget::onDeleteClicked()
+{
     this->deleteLater();
+}
 void CommandWidget::onSendClicked()
+{
     auto command = ui->leCommand->text();
     if (command.isEmpty())
+    {
         qWarning() << "Enter a command to send!";
         ui->leCommand->setFocus(Qt::OtherFocusReason);
         return;
+    }
     if (isASCIIMode())
+    {
         qDebug() << "Sending:" << command;
         emit sendCommand(ui->leCommand->unEscapedText().toLatin1());
+    }
     else // hex mode
+    {
         command = command.remove(' ');
         // check if nibbles are missing
         if (command.size() % 2 == 1)
+        {
             qWarning() << "HEX command is missing a nibble at the end!";
             ui->leCommand->setFocus(Qt::OtherFocusReason);
             // highlight the byte that is missing a nibble (last byte obviously)
             int textSize = ui->leCommand->text().size();
             ui->leCommand->setSelection(textSize-1, textSize);
             return;
+        }
         qDebug() << "Sending HEX:" << command;
         emit sendCommand(QByteArray::fromHex(command.toLatin1()));
+    }
+}
 void CommandWidget::onASCIIToggled(bool checked)
+{
     ui->leCommand->setMode(checked);
+}
 bool CommandWidget::isASCIIMode()
+{
     return ui->pbASCII->isChecked();
+}
 void CommandWidget::setName(QString name)
+{
     ui->leName->setText(name);
+}
 QString CommandWidget::name()
+{
     return ui->leName->text();
+}

commandwidget.h

➞

Show inline comments

 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot 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.
   serialplot 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 serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef COMMANDWIDGET_H
 #define COMMANDWIDGET_H
 #include <QWidget>
 #include <QByteArray>
 namespace Ui {
 class CommandWidget;
+}
 class CommandWidget : public QWidget
+{
     Q_OBJECT
 public:
     explicit CommandWidget(QWidget *parent = 0);
     ~CommandWidget();
     void setName(QString name);
     QString name();
 signals:
     void deleteRequested(CommandWidget* thisWidget); // emitted when delete button is clicked
     // emitted when send button is clicked
     //
     // in case of hex mode, command text should be a hexadecimal
     // string containing hexadecimal characters only (not even spaces)
     void sendCommand(QByteArray command);
 private:
     Ui::CommandWidget *ui;
     bool isASCIIMode(); // true: ascii mode, false hex mode
 private slots:
     void onDeleteClicked();
     void onSendClicked();
     void onASCIIToggled(bool checked);
 };
 #endif // COMMANDWIDGET_H

commandwidget.ui

➞

Show inline comments

@@ @@ -3,96 +3,99 @@ @@
  <class>CommandWidget</class>
  <widget class="QWidget" name="CommandWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>433</width>
     <height>34</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QToolButton" name="pbDelete">
      <property name="minimumSize">
       <size>
        <width>30</width>
        <height>0</height>
       </size>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="icon">
       <iconset theme="list-remove">
        <normaloff/>
       </iconset>
      </property>
      <property name="autoRaise">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="SneakyLineEdit" name="leName"/>
    </item>
    <item>
     <widget class="CommandEdit" name="leCommand">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter your command here.&lt;/p&gt;&lt;p&gt;In ASCII mode you can use backslash '\' to send some special characters. These are:&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;\n&lt;/span&gt; : Line Feed (new line)&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;\r&lt;/span&gt; : Carriage Return&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;\t&lt;/span&gt; : Tab&lt;/p&gt;&lt;p&gt;Be careful though, you cannot escape the backslash character itself!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="clearButtonEnabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
        <number>0</number>
       </property>
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QPushButton" name="pbASCII">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
@@ @@ -122,52 +125,57 @@ @@
        <widget class="QPushButton" name="pbHEX">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>40</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>HEX</string>
         </property>
         <property name="checkable">
          <bool>true</bool>
         </property>
         <property name="autoExclusive">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="pbSend">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Send</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>CommandEdit</class>
    <extends>QLineEdit</extends>
    <header>commandedit.h</header>
   </customwidget>
   <customwidget>
    <class>SneakyLineEdit</class>
    <extends>QLineEdit</extends>
    <header>sneakylineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>

serialplot.pro

➞

Show inline comments

@@ @@ -6,88 +6,90 @@ @@
 # serialplot 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.
+#
 # serialplot 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 serialplot.  If not, see <http://www.gnu.org/licenses/>.
+#
 #-------------------------------------------------
+#
 # Project created by QtCreator 2015-03-04T08:20:06
+#
 #-------------------------------------------------
 QT       += core gui serialport
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = serialplot
 TEMPLATE = app
 CONFIG += qwt
 SOURCES += main.cpp\
         mainwindow.cpp \
     portcontrol.cpp \
     plot.cpp \
     zoomer.cpp \
     hidabletabwidget.cpp \
     framebuffer.cpp \
     scalepicker.cpp \
     scalezoomer.cpp \
     portlist.cpp \
     snapshotview.cpp \
     snapshotmanager.cpp \
     snapshot.cpp \
     plotsnapshotoverlay.cpp \
     commandpanel.cpp \
     commandwidget.cpp \
     commandedit.cpp \
     dataformatpanel.cpp \
     tooltipfilter.cpp
     tooltipfilter.cpp \
     sneakylineedit.cpp
 HEADERS  += mainwindow.h \
     utils.h \
     portcontrol.h \
     floatswap.h \
     plot.h \
     zoomer.h \
     hidabletabwidget.h \
     framebuffer.h \
     scalepicker.h \
     scalezoomer.h \
     portlist.h \
     snapshotview.h \
     snapshotmanager.h \
     snapshot.h \
     plotsnapshotoverlay.h \
     commandpanel.h \
     commandwidget.h \
     commandedit.h \
     dataformatpanel.h \
     tooltipfilter.h
     tooltipfilter.h \
     sneakylineedit.h
 FORMS    += mainwindow.ui \
     about_dialog.ui \
     portcontrol.ui \
     snapshotview.ui \
     commandpanel.ui \
     commandwidget.ui \
     dataformatpanel.ui
 INCLUDEPATH += qmake/
 CONFIG += c++11
 RESOURCES += misc/icons.qrc
 win32 {
     RESOURCES += misc/winicons.qrc
+}

sneakylineedit.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include "sneakylineedit.h"
 #include <QFont>
 SneakyLineEdit::SneakyLineEdit(QWidget *parent) :
     QLineEdit(parent)
+{
     setFrame(false);
     setStyleSheet("QLineEdit{background-color: rgba(0,0,0,0);}");
     setToolTip(trUtf8("Click to edit"));
     setBold(true);
+}
 void SneakyLineEdit::focusInEvent(QFocusEvent *event)
+{
     setFrame(true);
     setBold(false);
     QLineEdit::focusInEvent(event);
+}
 void SneakyLineEdit::focusOutEvent(QFocusEvent *event)
+{
     setFrame(false);
     setBold(true);
     QLineEdit::focusOutEvent(event);
+}
 void SneakyLineEdit::setBold(bool bold)
+{
     QFont f(font());
     f.setBold(bold);
     setFont(f);
+}

sneakylineedit.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef SNEAKYLINEEDIT_H
 #define SNEAKYLINEEDIT_H
 #include <QLineEdit>
 #include <QFocusEvent>
 class SneakyLineEdit : public QLineEdit
+{
     Q_OBJECT
 public:
     explicit SneakyLineEdit(QWidget *parent = 0);
 private:
     void focusInEvent(QFocusEvent * event);
     void focusOutEvent(QFocusEvent * event);
     void setBold(bool bold);
 };
 #endif // SNEAKYLINEEDIT_H

0 comments (0 inline, 0 general)