Ede_Vau
/
qtdmm
mirror of https://github.com/jhol/qtdmm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Release 0.8.6

This commit is contained in:
Matthias Toussaint 2014-04-12 09:56:45 +01:00 committed by Joel Holdsworth
parent 5a600c2a74
commit 7bc96ecfa4
13 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -1,3 +1,4 @@
Matthias Toussaint <qtdmm@mtoussaint.de>
Matthias Toussaint
Dr. Ralf Wieland (PeakTech-451)
Michael Petruzelka (Voltcraft M-4660)
Hubert Mayer (PeakTech-4390, Metex M3850M)

8
CHANGELOG
View File

@ -1,3 +1,11 @@
15/08/2005 0.8.6
- Cleaned up compiler warnings
- Added Metex M-3850M and PeakTech-4390
(Thanks to Hubert Mayer)
- Added Digitech QM 1350 (James Cameron)
- Import/Export issue (Hubert Mayer)
- Configuration problem for large port numbers
(Hubert Mayer)
12/05/2005 0.8.5
- Fixed window save behaviour (nobody noticed yet?)
- Fixed sampling counter

10
INSTALL
View File

@ -1,11 +1,8 @@
Installation QtDMM 0.7 (c) 2001-2002 M.Toussaint
Installation QtDMM 0.8 (c) 2001-2005 M.Toussaint
Requirements:
-------------
- Qt library >= 2.1.0 <http://www.trolltech.com> thread version
- tmake (I think version >= 1.5 , but I'm not shure) <http://www.trolltech.com>
- Additionally you should have Qt-Designer installed (standard for current
Qt version)
- Qt library >= 3.0 <http://www.trolltech.com> developer version
- A supported multimeter or a compatible model
Compilation:
@ -15,7 +12,6 @@ some of the major Linux distributions you have to install a qt-devel package
(or similar package name) in order to get the header files for Qt, wich are
essential for the compilation.
* tmake can be found at ftp://ftp.trollteech.com
* moc and uic are part of the original source tarballs of Qt or might be
hidden in a developer package of Qt for your distribution.
@ -37,7 +33,7 @@ presets and future users can benefit from you help.
If you encounter any problems don't hesitate to contact me
-- 03/03/2002
-- 15/08/2005
Matthias Toussaint
<qtdmm@mtoussaint.de>

22
README
View File

@ -1,4 +1,4 @@
QtDMM 0.8.4 (c) 2001-2005 M.Toussaint
QtDMM 0.8.6 (c) 2001-2005 M.Toussaint
QtDMM is a simple DMM readout software including a configurable transient
recorder. A friend of mine asked me for a DMM readout software for Linux
@ -6,26 +6,38 @@ because he didn't want to use the MS-Windows version which came with the
multimeter. To help him out I wrote this little piece of software.
The transient recorder features manual start, scheduled start (at a given
time) and triggered automatic start when given thresholds are reached.
If you call QtDMM with the commandline option --console it will display
some debug output. This might (or hight not :) help resolve problems.
It was written for Metex (and compatible like VOLTCRAFT) multimeter and
is known to work with the following DMM's:
Digitech QM1350
ELV M9803R
Metex M-3660D
Metex M-3830D
Metex M-3850D
Metex M-3850M
Metex ME-11
Metex ME-22
Metex ME-32
Metex ME-42
Metex Universal system 9160
PeakTech 4010
PeakTech 4390
PeakTech 451
Radioshack DMM 22-805
Radioshack 22-805 DMM
Voltcraft M-3650D
Voltcraft M-4660
Voltcraft ME-11
Voltcraft ME-22T
Voltcraft ME-32
Voltcraft VC 670
The following models should work but need to be confirmed by a user:
Voltcraft ME-42
Voltcraft M-3860
Voltcraft M-4660A
Voltcraft M-4660M
@ -44,12 +56,6 @@ but does it's job quite well.
QtDMM is distributed under the GNU Public License, version 2.
You'll find 3 'official' icon files for QtDMM in this directory:
- qtdmm-16x16.xpm
- qtdmm-32.32.xpm
- qtdmm-48x48.xpm
The tab size of the sourcefiles is 2
-- 24/04/2005

2
src/Doxyfile
View File

@ -23,7 +23,7 @@ PROJECT_NAME = QtDMM
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = 0.8.2
PROJECT_NUMBER = 0.8.6
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.

3
src/configdlg.cpp
View File

@ -414,6 +414,9 @@ ConfigDlg::thresholdChangedSLOT( DMMGraph::CursorMode mode, double value )
case DMMGraph::Integration:
m_integration->setThreshold( value );
break;
default:
std::cerr << "Unexpected CursorMode in configdlg.cpp:418" << std::endl;
break;
}
}

2
src/dmm.cpp
View File

@ -305,7 +305,7 @@ DMM::customEvent( QCustomEvent *ev )
if (m_consoleLogging)
{
for (int i=0; i<tmp.length(); ++i)
for (unsigned i=0; i<tmp.length(); ++i)
{
fprintf( stdout, "%02X ", re->string()[i] );
}

4
src/dmmgraph.cpp
View File

@ -1244,7 +1244,7 @@ DMMGraph::exportDataSLOT()
{
QDateTime dt = m_graphStart.addSecs( i*(int)qRound(m_sampleTime/10.) );
QString line;
line.sprintf( "%02d.%02d.%04d\t%02d:%02d:%02d\t%g\t%s\n",
line.sprintf( "%02d.%02d.%04d\t%02d:%02d:%02d\t%06g\t%s\n",
dt.date().day(), dt.date().month(), dt.date().year(),
dt.time().hour(), dt.time().minute(), dt.time().second(),
(*m_array)[i],
@ -1327,7 +1327,7 @@ DMMGraph::importDataSLOT()
m_graphStart = QDateTime( startDate, startTime );
graphEnd = QDateTime( startDate, startTime );
setUnit( line.mid( 27, 1 ) );
setUnit( line.mid( 27, 3 ) );
cnt++;

5
src/dmmprefs.cpp
View File

@ -41,16 +41,19 @@
// display digits (0,1,2,3 - 3 1/2, 3 3/4, 4 1/1, 4 3/4)
//
struct DMMInfo dmm_info[] = {
{"Digitech QM1350", 0, 0, 7, 2, 1, 0, 1},
{"ELV M9803R", 5, 4, 7, 1, 1, 1, 1},
{"Metex M-3660D", 1, 0, 7, 2, 1, 0, 1},
{"Metex M-3830D", 1, 0, 7, 2, 4, 0, 1},
{"Metex M-3850D", 1, 0, 7, 2, 4, 0, 1},
{"Metex M-3850M", 5, 0, 7, 2, 4, 0, 1},
{"Metex ME-11", 0, 0, 7, 2, 1, 0, 1},
{"Metex ME-22", 3, 0, 7, 2, 1, 0, 1},
{"Metex ME-32", 0, 0, 7, 2, 1, 0, 1},
{"Metex ME-42", 0, 0, 7, 2, 1, 0, 1},
{"Metex universal system 9160", 1, 0, 7, 2, 4, 0, 1},
{"PeakTech-4010", 5, 0, 7, 2, 1, 0, 1},
{"PeakTech-4390", 5, 0, 7, 2, 4, 0, 1},
{"PeakTech-451", 0, 1, 7, 2, 1, 0, 1},
{"Radioshack 22-805 DMM", 0, 0, 7, 2, 1, 0, 1},
{"Voltcraft M-3650D", 1, 0, 7, 2, 1, 0, 1},
@ -105,7 +108,7 @@ void
DmmPrefs::defaultsSLOT()
{
port->setCurrentItem( m_cfg->getInt( "Port settings", "device", 0 ) );
portNumber->setValue( QMIN( 2, m_cfg->getInt( "Port settings", "device-number", 0 )) );
portNumber->setValue( m_cfg->getInt( "Port settings", "device-number", 0 ) );
baudRate->setCurrentItem( m_cfg->getInt( "Port settings", "baud", 0 ) );
bitsCombo->setCurrentItem( m_cfg->getInt( "Port settings", "bits", 7 )-5 );
stopBitsCombo->setCurrentItem( m_cfg->getInt( "Port settings", "stop-bits", 2 )-1);

2
src/mainwin.cpp
View File

@ -44,7 +44,7 @@
#include <help.xpm>
#include <icon.xpm>
#define VERSION_STRING "0.8.5"
#define VERSION_STRING "0.8.4"
#include <iostream>

3
src/readerthread.cpp
View File

@ -240,7 +240,8 @@ ReaderThread::readMetex14()
{
if (m_sendRequest)
{
size_t ret = ::write( m_handle, "D\n", 2 );
/* TODO: Errorhandling */
/*size_t ret = */ ::write( m_handle, "D\n", 2 );
//std::cerr << "WROTE: " << ret << std::endl;
m_sendRequest = false;
}

2
src/src.pro
View File

@ -72,6 +72,6 @@ SOURCES = \
LIBS =
TARGET = qtdmm
VERSION = 0.8.5
VERSION = 0.8.4
DESTDIR = ../bin

4
src/uidmmprefs.ui
View File

@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>492</width>
<width>507</width>
<height>607</height>
</rect>
</property>
@ -52,7 +52,7 @@
<cstring>ui_model</cstring>
</property>
<property name="sizeLimit">
<number>12</number>
<number>20</number>
</property>
<property name="autoCompletion">
<bool>true</bool>