Skip to content

Commit 6161c5a

Browse files
committed
Bumped version number to 0.1.2
README now has a toc. Use Wextra compiler flag for all build types. Add tooltips to toolbar actions in history tab
1 parent bcd1bd4 commit 6161c5a

5 files changed

Lines changed: 38 additions & 18 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(labpowerqt)
88
#The version number
99
set (labpowerqt_VERSION_MAJOR 0)
1010
set (labpowerqt_VERSION_MINOR 1)
11-
set (labpowerqt_VERSION_PATCH 1)
11+
set (labpowerqt_VERSION_PATCH 2)
1212

1313
option (EALOGGER_EXTERNAL "Download and build ealogger" ON)
1414
option (SANITIZER "Use AddressSanitizer (ASan) compiler flags" OFF)

‎README.md‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
# LabPowerQt
22

33
[![Build Status](https://travis-ci.org/crapp/labpowerqt.svg?branch=master)](https://travis-ci.org/crapp/labpowerqt)
4+
[![LabPowerQt license GPL](https://img.shields.io/github/license/crapp/labpowerqt.svg)](#license)
5+
[![Latest release](https://img.shields.io/github/release/crapp/labpowerqt.svg)](https://github.com/crapp/labpowerqt/releases/latest)
6+
7+
8+
9+
10+
11+
- [Features](#features)
12+
- [Setting up LabPowerQt](#setting-up-labpowerqt)
13+
- [Using the Application](#using-the-application)
14+
- [Screenshots](#screenshots)
15+
- [Development](#development)
16+
- [ToDo](#todo)
17+
- [Bugs, feature requests, ideas](#bugs-feature-requests-ideas)
18+
- [Known issues](#known-issues)
19+
- [License](#license)
20+
21+
422

523
LabPowerQt is an application to control laboratory power supplies and to record
624
and visualize the data.
@@ -9,19 +27,19 @@ The software is written using the Qt Framework and therefor works on Linux,
927
Windows and OS X. Although it works cross platform the main target platforms for
1028
this project are Linux and osx.
1129

12-
The application is in an early stage of development make sure to read the **known
13-
issues** section.
30+
The application is in an early stage of development make sure to read the [known
31+
issues](#known-issues) section.
1432

1533
![LabPowerQt main screen](https://crapp.github.io/labpowerqt/labpowerqt.png)
1634
*LabPowerQt running on archlinux and Gnome 3.20*
1735

1836
## Features
1937

20-
* Cross plattform written in Qt
38+
* Cross platform written in Qt
2139
* Support for polling frequencies higher than 1Hz
2240
* Full support of the Korad SCPI Interface
2341
* Device Wizard for simple device setup
24-
* Visualize Data in a fully customizeable plot with image export functionality
42+
* Visualize Data in a fully customizable plot with image export functionality
2543
* Store data in a SQLite Database
2644
* Manage recorded sessions
2745
* Export data to csv files
@@ -36,9 +54,9 @@ The following dependencies are required to run this software:
3654
* gcc >= 4.9
3755
* clang >= 3.4
3856
* MSVC >= 14 (Visual Studio 2015)
39-
* MinGW
57+
* MinGW >= 4.9
4058
* Qt >= 5.2 (Qt5Widgets, Qt5Gui, Qt5Core, Qt5SerialPort, Qt5Sql, Qt5PrintSupport, Qt5Quick)
41-
* [ealogger](https://github.com/crapp/ealogger) >= 0.8 (Included as external project)
59+
* [ealogger](https://github.com/crapp/ealogger) >= 0.8.1 (Included as external project)
4260

4361
### Installation
4462

@@ -70,7 +88,7 @@ sudo make install
7088

7189
There are packages for the following Linux distributions:
7290

73-
* [Archlinux (AUR)](https://aur.archlinux.org/packages/labpowerqt)
91+
* Archlinux [![Archlinux AUR Version](https://img.shields.io/aur/version/labpowerqt.svg)](https://aur.archlinux.org/packages/labpowerqt)
7492

7593
#### Windows
7694

@@ -90,8 +108,8 @@ You may now open the solution file with visual studio and compile the applicatio
90108

91109
Other possibilities are cmake's NMake Generator or mingw.
92110

93-
I am providing an InnoSetup based installer for x86 and amd64 containing all
94-
dependencies. It is downloadable from [github.com](https://github.com/crapp/labpowerqt/releases)
111+
I am providing an [InnoSetup](http://www.jrsoftware.org/isinfo.php) based installer
112+
for x86 and amd64 containing all dependencies. It is downloadable from [github.com](https://github.com/crapp/labpowerqt/releases)
95113

96114
### Supported Hardware
97115

@@ -116,7 +134,7 @@ and you can use the orange elements to control the device (by double-clicking th
116134
The data of the device is stored in memory. You can also persist the data in a SQLite
117135
database by turning on a Recording.
118136

119-
The data is not displayed in the control but can also be visualized in a Plot on
137+
The data is not displayed in the control but can also be visualized in a Plot on
120138
the right side of the main window. Have a look at the buttons above the Plot to
121139
discover all the possibilities you have (e.g. change graph color or line style,
122140
export plot as image, discard data and many more).
@@ -200,7 +218,7 @@ to submit bugs or feature requests
200218
can do about it as I believe it is because of a bug in their code.
201219

202220
* Polling frequencies higher than 1Hz seem to work unreliable on OSX and Windows.
203-
I have no idea if this is a problem with QtSerialport or the underlying driver
221+
I have no idea if this is a problem with QSerialPort, the underlying driver
204222
implementation or system layer.
205223

206224
## License

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Initialize CXXFLAGS for Linux, OS X and MinGW on Windows
22
if (NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
3-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
3+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11")
44
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
55
# No reorder warnings because these pop up frequently if you are using the Q_OBJECT macro
6-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wextra -Wno-reorder")
6+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-reorder")
77
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
88
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
99
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

‎src/floatingvaluesdialog.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ void FloatingValuesDialog::setCurrentValue(double value)
6363

6464
void FloatingValuesDialog::setCurrentValue(ATTR_UNUSED int trackingMode) {}
6565
// FIXME: The number of channels was used in a previous version of this Dialog
66-
// and is no longer needed afair.
66+
// and is no longer needed AFAIR
6767
void FloatingValuesDialog::updateDeviceSpecs(
6868
double voltageMin, double voltageMax, uint voltagePrecision,
6969
double currentMin, double currentMax, uint currentPrecision,
70-
uint noOfChannels)
70+
ATTR_UNUSED uint noOfChannels)
7171
{
7272
voltageSpinBox->setMinimum(voltageMin);
7373
voltageSpinBox->setMaximum(voltageMax);

‎src/tabhistory.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ void TabHistory::updateModel()
4646
this->tblView->resizeColumnsToContents();
4747
}
4848

49-
void TabHistory::indexChanged(const QModelIndex ¤t,
50-
const QModelIndex &previous)
49+
void TabHistory::indexChanged(ATTR_UNUSED const QModelIndex ¤t,
50+
ATTR_UNUSED const QModelIndex &previous)
5151
{
5252
}
5353

@@ -71,8 +71,10 @@ void TabHistory::setupUI()
7171
this->lay->addWidget(this->tbar, 0, 0);
7272
this->actionDelete = this->tbar->addAction("Delete");
7373
this->actionDelete->setIcon(QPixmap(":/icons/trash32.png"));
74+
this->actionDelete->setToolTip("Delete selected recordings");
7475
this->actionExport = this->tbar->addAction("Export");
7576
this->actionExport->setIcon(QPixmap(":/icons/csv32.png"));
77+
this->actionExport->setToolTip("Export selected recordings to CSV");
7678

7779
this->tblModel = std::unique_ptr(new RecordSqlModel());
7880
this->tblModel->setTable(dbcon::TBL_RECORDING);

0 commit comments

Comments
 (0)