Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to Qt6.4.2 and QcustomPlot 2.1.1 #20

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
72 changes: 70 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,71 @@
/build
# Created by https://www.toptal.com/developers/gitignore/api/qtcreator,c++
# Edit at https://www.toptal.com/developers/gitignore?templates=qtcreator,c++

*.user
### C++ ###
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

### QtCreator ###
# gitignore for Qt Creator like IDE for pure C/C++ project without Qt
#
# Reference: http://doc.qt.io/qtcreator/creator-project-generic.html



# Qt Creator autogenerated files


# A listing of all the files included in the project
*.files

# Include directories
*.includes

# Project configuration settings like predefined Macros
*.config

# Qt Creator settings
*.creator

# User project settings
*.creator.user*

# Qt Creator backups
*.autosave

# Flags for Clang Code Model
*.cxxflags
*.cflags


# End of https://www.toptal.com/developers/gitignore/api/qtcreator,c++
27 changes: 27 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,33 @@ Source and .pro file of the Qt Project are available. A standalone .exe is inclu
All notable changes to this project will be documented below this line.
This project adheres to [Semantic Versioning](http://semver.org/).


## [1.3.2] - 2019-11-20

### Info

- Load settings at startup
- Save settings at close event : port, baud, data, parity, stop, spinPoints, spinYStep, spinAxesMin, spinAxesMax

### Bugfix

- Solve issue #10 : Save and load settings

## [1.3.1] - 2019-11-20

### Info

- Built with QT 5.7.
- Change #includes (Qwidget is a separate module)
- Remove QApplication::UnicodeUTF8 in QApplication::translate method (read [Qt forum](https://forum.qt.io/topic/28054/unicodeutf8-not-member-qapplication-generated-with-qt5-designer/2))
- add QDir::homePath() + in file name string in mainwindow.cpp in order to be able to save csv and png in home directory
- add coordonateX(0) and spinPoints->value() in PNG name in order to be able to save multiple PNG from the same dataset with different zoom or drag
- remove PNG export disable in order to allow export PNG after stop or pause

### Bugfix

- Solve issue #9 : Now export work on linux (maybe on mac too)

## [1.3.0] - 2018-08-01

### Info
Expand Down
31 changes: 28 additions & 3 deletions SerialPortPlotter.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ QT += core gui
QT += serialport
CONFIG += c++11

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
#greaterThan(QT_MAJOR_VERSION, 5): QT += widgets printsupport

TARGET = serial_port_plotter
QT += widgets printsupport

TARGET = serialportplotter
TEMPLATE = app

SOURCES += main.cpp\
Expand All @@ -28,7 +30,7 @@ FORMS += mainwindow.ui \

RESOURCES += \
res/serial_port_plotter.qrc \
res/qdark_stylesheet/qdarkstyle/style.qrc
#res/qdark_stylesheet/qdarkstyle/style.qrc # don't exist

# The following line compiles on Release but not on Debug, so this workaroung is used:
RC_FILE = res/serial_port_plotter.rc
Expand All @@ -38,3 +40,26 @@ RC_FILE = res/serial_port_plotter.rc
#win32:QMAKE_EXTRA_TARGETS += mkver_rc
#win32:PRE_TARGETDEPS += serial_port_plotter_res.o
#win32:LIBS += serial_port_plotter_res.o

unix:configfiles.extra = chmod +x scripts/*; make clean;
binfile.files += serial_port_plotter
binfile.path = /usr/bin/
#configfiles.files += data/config/*
configfiles.path = /usr/share/
docfiles.files += data/doc/*
docfiles.path = /usr/share/doc/
manfiles.files += data/man/*
manfiles.path = /usr/share/man/man1/
shortcutfiles.files += data/serialportplotter.desktop
shortcutfiles.path = /usr/share/applications/
INSTALLS += configfiles
INSTALLS += docfiles
INSTALLS += manfiles
INSTALLS += shortcutfiles
INSTALLS += binfile






262 changes: 262 additions & 0 deletions SerialPortPlotter.pro.user

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion helpwindow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#ifndef HELPWINDOW_HPP
#define HELPWINDOW_HPP

#include <QDialog>
#include <QtWidgets/QDialog>

namespace Ui {
class HelpWindow;
Expand Down
6 changes: 5 additions & 1 deletion main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,16 @@
****************************************************************************/

#include "mainwindow.hpp"
#include <QApplication>
#include <QtWidgets/QApplication>

int main(int argc, char *argv[])
{
QApplication a(argc, argv);

a.setOrganizationName("SerialPortPlotter"); // give the folder name to store settings in local home
a.setApplicationName("SerialPortPlotter"); // give file config name (.conf)


/* Apply style sheet */
QFile file(":/serial_port_plotter/styles/style.qss");
if(file.open(QIODevice::ReadOnly | QIODevice::Text))
Expand Down
Loading