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

Release 0.8.13

This commit is contained in:
Matthias Toussaint 2014-04-12 09:56:49 +01:00 committed by Joel Holdsworth
parent dbbbe04b20
commit 7db7608108
149 changed files with 547 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,3 +1,9 @@
11/07/2009 0.8.13
- One hour recording crash bug
- Metex M-4650C settings (Samuel Hildebrandt)
- Tenma 72-1016 settings (simon morris)
- Metex M-3870D settings (Zdeněk Šigut)
25/12/2007 0.8.12
- Added PeakTech 4015A (Jochen Puchalla)
- Added Tenma 72-7745 (Laurent Perez)

BIN
src/.dmm.cpp.swp Normal file
View File

Binary file not shown.

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.6
PROJECT_NUMBER = 0.8.13
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.

0
src/colorbutton.cpp Normal file → Executable file
View File

0
src/colorbutton.h Normal file → Executable file
View File

5
src/configdlg.cpp Normal file → Executable file
View File

@ -696,6 +696,11 @@ ConfigDlg::parity() const
return m_dmm->parity();
}
bool ConfigDlg::externalSetup() const
{
return m_dmm->externalSetup();
}
int
ConfigDlg::bits() const
{

1
src/configdlg.h Normal file → Executable file
View File

@ -72,6 +72,7 @@ public:
bool showBar() const;
ReadEvent::DataFormat format() const;
int parity() const;
bool externalSetup() const;
int display() const;
int bits() const;
int stopBits() const;

0
src/configdlg.old.cpp Normal file → Executable file
View File

0
src/configdlg.old.h Normal file → Executable file
View File

0
src/configitem.cpp Normal file → Executable file
View File

0
src/configitem.h Normal file → Executable file
View File

0
src/displayprefs.cpp Normal file → Executable file
View File

0
src/displayprefs.h Normal file → Executable file
View File

0
src/displaywid.cpp Normal file → Executable file
View File

0
src/displaywid.h Normal file → Executable file
View File

236
src/dmm.cpp Normal file → Executable file
View File

@ -38,7 +38,8 @@ DMM::DMM( QObject *parent, const char *name ) :
m_parity( 0 ),
m_device( "/dev/ttyS0" ),
m_oldStatus( ReaderThread::NotConnected ),
m_consoleLogging( false )
m_consoleLogging( false ),
m_externalSetup( false )
{
m_readerThread = new ReaderThread( this );
m_readerThread->start();
@ -51,8 +52,9 @@ DMM::~DMM()
}
void
DMM::setPortSettings( int bits, int stopBits, int parity )
DMM::setPortSettings( int bits, int stopBits, int parity, bool externalSetup )
{
m_externalSetup = externalSetup;
m_parity = parity;
m_c_cflag = CREAD | CLOCAL;
@ -151,112 +153,115 @@ DMM::open()
return false;
}
fcntl( m_handle, F_SETFL, 0 );
tcgetattr( m_handle, &m_oldSettings );
attr.c_oflag = 0;
attr.c_lflag = 0;
//attr.c_iflag = IGNBRK;
attr.c_cflag = m_c_cflag;
// According to Thomas Hoffman flags should be like this
//
if (0 == m_parity) // Ignore parity errors
if (!m_externalSetup)
{
attr.c_iflag = IGNBRK | IGNPAR ;
}
else
{
attr.c_iflag = IGNBRK | INPCK | ISTRIP;
}
/*
if (0 == m_parity) // Ignore parity errors
{
attr.c_iflag = IGNBRK | IGNPAR | INPCK;
}
else
{
attr.c_iflag = IGNBRK | IGNPAR;
}
*/
//attr.c_cflag = CS7 | CSTOPB | CREAD | CLOCAL;
attr.c_cc[VTIME]= 0;
attr.c_cc[VMIN]= 1;
if (600 == m_speed)
{
cfsetospeed( &attr, B600 );
cfsetispeed( &attr, B600 );
}
else if (1200 == m_speed)
{
cfsetospeed( &attr, B1200 );
cfsetispeed( &attr, B1200 );
}
else if (1800 == m_speed)
{
cfsetospeed( &attr, B1800 );
cfsetispeed( &attr, B1800 );
}
else if (2400 == m_speed)
{
cfsetospeed( &attr, B2400 );
cfsetispeed( &attr, B2400 );
}
else if (4800 == m_speed)
{
cfsetospeed( &attr, B4800 );
cfsetispeed( &attr, B4800 );
}
else if (9600 == m_speed)
{
cfsetospeed( &attr, B9600 );
cfsetispeed( &attr, B9600 );
}
else if (19200 == m_speed)
{
cfsetospeed( &attr, B19200 );
cfsetispeed( &attr, B19200 );
}
m_error = tr( "Error configuring serial port." );
m_error += " ";
m_error += m_device;
m_error += ". ";
if (-1 == tcsetattr( m_handle, TCSANOW, &attr ))
{
::close(m_handle);
m_handle = -1;
fcntl( m_handle, F_SETFL, 0 );
tcgetattr( m_handle, &m_oldSettings );
emit error( m_error );
attr.c_oflag = 0;
attr.c_lflag = 0;
//attr.c_iflag = IGNBRK;
attr.c_cflag = m_c_cflag;
return false;
}
// According to Thomas Hoffman flags should be like this
//
if (0 == m_parity) // Ignore parity errors
{
attr.c_iflag = IGNBRK | IGNPAR ;
}
else
{
attr.c_iflag = IGNBRK | INPCK | ISTRIP;
}
/*
if (0 == m_parity) // Ignore parity errors
{
attr.c_iflag = IGNBRK | IGNPAR | INPCK;
}
else
{
attr.c_iflag = IGNBRK | IGNPAR;
}
*/
//attr.c_cflag = CS7 | CSTOPB | CREAD | CLOCAL;
attr.c_cc[VTIME]= 0;
attr.c_cc[VMIN]= 1;
if (600 == m_speed)
{
cfsetospeed( &attr, B600 );
cfsetispeed( &attr, B600 );
}
else if (1200 == m_speed)
{
cfsetospeed( &attr, B1200 );
cfsetispeed( &attr, B1200 );
}
else if (1800 == m_speed)
{
cfsetospeed( &attr, B1800 );
cfsetispeed( &attr, B1800 );
}
else if (2400 == m_speed)
{
cfsetospeed( &attr, B2400 );
cfsetispeed( &attr, B2400 );
}
else if (4800 == m_speed)
{
cfsetospeed( &attr, B4800 );
cfsetispeed( &attr, B4800 );
}
else if (9600 == m_speed)
{
cfsetospeed( &attr, B9600 );
cfsetispeed( &attr, B9600 );
}
else if (19200 == m_speed)
{
cfsetospeed( &attr, B19200 );
cfsetispeed( &attr, B19200 );
}
m_error = tr( "Error configuring serial port." );
m_error += " ";
m_error += m_device;
m_error += ". ";
if (-1 == tcsetattr( m_handle, TCSANOW, &attr ))
{
::close(m_handle);
m_handle = -1;
emit error( m_error );
return false;
}
mdlns = 0;
if (-1 == ioctl( m_handle, TIOCMGET, &mdlns ))
{
::close(m_handle);
m_handle = -1;
emit error( m_error );
return false;
}
mdlns = 0;
if (-1 == ioctl( m_handle, TIOCMGET, &mdlns ))
{
::close(m_handle);
m_handle = -1;
mdlns &= ~TIOCM_RTS;
if (-1 == ioctl( m_handle, TIOCMSET, &mdlns ))
{
::close(m_handle);
m_handle = -1;
emit error( m_error );
return false;
}
emit error( m_error );
return false;
tcsetattr( m_handle, TCSAFLUSH, &attr );
}
mdlns &= ~TIOCM_RTS;
if (-1 == ioctl( m_handle, TIOCMSET, &mdlns ))
{
::close(m_handle);
m_handle = -1;
emit error( m_error );
return false;
}
tcsetattr( m_handle, TCSAFLUSH, &attr );
m_error = tr( "Connecting ..." );
emit error( m_error );
@ -283,9 +288,11 @@ DMM::close()
if (-1 != m_handle)
{
// restore
::tcsetattr( m_handle, TCSANOW, &m_oldSettings );
if (!m_externalSetup)
{
// restore
::tcsetattr( m_handle, TCSANOW, &m_oldSettings );
}
::close( m_handle );
m_handle = -1;
}
@ -721,10 +728,10 @@ void DMM::readRS22812Continuous( ReadEvent *re )
m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
}
char *DMM::RS22812Digit( int byte )
const char *DMM::RS22812Digit( int byte )
{
int digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
int digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
byte &= 0x0f7;
@ -1497,6 +1504,7 @@ void DMM::readVC820Continuous( ReadEvent *re )
unit = "%";
special = "PC";
}
/* Can't find the reason for this any more
else if (in[13] & 0x04)
{
unit = "C";
@ -1507,6 +1515,12 @@ void DMM::readVC820Continuous( ReadEvent *re )
unit = "F";
special = "TE";
}
*/
else if (in[13] & 0x01)
{
unit = "C";
special = "TE";
}
else
{
std::cerr << "Unknown unit!" << std::endl;
@ -1545,10 +1559,10 @@ void DMM::readVC820Continuous( ReadEvent *re )
m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
}
char *DMM::vc820Digit( int byte )
const char *DMM::vc820Digit( int byte )
{
int digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
int digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
byte &= 0x7f;

9
src/dmm.h Normal file → Executable file
View File

@ -44,7 +44,7 @@ public:
bool isOpen() const { return m_handle >= 0; }
void setFormat( ReadEvent::DataFormat );
void setName( const QString & );
void setPortSettings( int bits, int stopBits, int parity );
void setPortSettings( int bits, int stopBits, int parity, bool externalSetup );
void setNumValues( int );
void setConsoleLogging( bool on ) { m_consoleLogging = on; }
@ -69,7 +69,8 @@ protected:
QString m_name;
struct termios m_oldSettings;
bool m_consoleLogging;
bool m_externalSetup;
void timerEvent( QTimerEvent * );
void customEvent( QCustomEvent * );
QString insertComma( const QString &, int );
@ -82,8 +83,8 @@ protected:
void readVC940Continuous( ReadEvent * );
void readQM1537Continuous( ReadEvent * );
void readRS22812Continuous( ReadEvent * );
char *vc820Digit( int );
char *RS22812Digit( int );
const char *vc820Digit( int );
const char *RS22812Digit( int );
};

0
src/dmmbar.cpp Normal file → Executable file
View File

0
src/dmmbar.h Normal file → Executable file
View File

4
src/dmmgraph.cpp Normal file → Executable file
View File

@ -15,7 +15,7 @@
// thereof. In no event will the author be liable for any lost revenue
// or profits or other special, indirect and consequential damages.
//----------------------------------------------------------------------
// (c) 2001-2007 Matthias Toussaint
// (c) 2001-2009 Matthias Toussaint
//======================================================================
#include <qapplication.h>
@ -587,6 +587,8 @@ DMMGraph::setGraphSize( int size, int length )
m_pointer = m_length-1;
}
m_drawArray.resize( m_length );
emitInfo();
resizeEvent( 0 );

0
src/dmmgraph.h Normal file → Executable file
View File

152
src/dmmprefs.cpp Normal file → Executable file
View File

@ -20,6 +20,7 @@
#include <qbuttongroup.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qspinbox.h>
#include <qtoolbutton.h>
@ -55,78 +56,86 @@
// [don't ask for any logic behind the digits, changing would break configs]
// display digits (0,1,2,3 - 2000, 4000, 20000, 50000, 100000, 200000, 400000,
// 1000000, 6000, 40000)
// External device setup 0, 1
//- Added
struct DMMInfo dmm_info[] = {
{"Digitek DT-9062", 3, 5, 8, 1, 1, 0, 1},
{"Digitek INO2513", 3, 5, 8, 1, 1, 0, 1}, // no image
{"Digitek DT-9062", 3, 5, 8, 1, 1, 0, 1, 0},
{"Digitek INO2513", 3, 5, 8, 1, 1, 0, 1, 0}, // no image
{"Digitech QM1350", 0, 0, 7, 2, 1, 0, 1}, // no image
{"Digitech QM1462", 3, 5, 8, 1, 1, 0, 1}, // no image
{"Digitech QM1538", 3, 5, 8, 1, 1, 0, 1}, // no image
{"Digitech QM1537", 3, 8, 8, 1, 1, 0, 1}, // no image
{"Digitech QM1350", 0, 0, 7, 2, 1, 0, 1, 0}, // no image
{"Digitech QM1462", 3, 5, 8, 1, 1, 0, 1, 0}, // no image
{"Digitech QM1538", 3, 5, 8, 1, 1, 0, 1, 0}, // no image
{"Digitech QM1537", 3, 8, 8, 1, 1, 0, 1, 0}, // no image
{"ELV M9803R", 5, 4, 7, 1, 1, 1, 1}, // no image
{"ELV M9803R", 5, 4, 7, 1, 1, 1, 1, 0}, // no image
{"Iso-Tech IDM 73", 6, 6, 7, 1, 1, 2, 8}, // no image
{"Iso-Tech IDM 73", 6, 6, 7, 1, 1, 2, 8, 0}, // no image
{"MASTECH MAS-343", 0, 0, 7, 2, 1, 0, 1},
{"MASTECH MAS-345", 0, 0, 7, 2, 1, 0, 1},
{"MASTECH M9803R", 5, 4, 7, 1, 1, 1, 1},
{"MASTECH MAS-343", 0, 0, 7, 2, 1, 0, 1, 0},
{"MASTECH MAS-345", 0, 0, 7, 2, 1, 0, 1, 0},
{"MASTECH M9803R", 5, 4, 7, 1, 1, 1, 1, 0},
{"McVoice M-345pro", 0, 0, 7, 2, 1, 0, 1},
{"McVoice M-980T", 5, 4, 7, 1, 1, 0, 1},
{"McVoice M-345pro", 0, 0, 7, 2, 1, 0, 1, 0},
{"McVoice M-980T", 5, 4, 7, 1, 1, 0, 1, 0},
{"Metex M-3660D", 1, 0, 7, 2, 1, 0, 1},
{"Metex M-3830D", 1, 0, 7, 2, 4, 0, 1}, // no image
{"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},
{"Metex M-3660D", 1, 0, 7, 2, 1, 0, 1, 0},
{"Metex M-3830D", 1, 0, 7, 2, 4, 0, 1, 0}, // no image
{"Metex M-3850D", 1, 0, 7, 2, 4, 0, 1, 0},
{"Metex M-3850M", 5, 0, 7, 2, 4, 0, 1, 0},
{"Metex M-3870D", 1, 0, 7, 1, 1, 0, 1, 0},
{"Metex M-4650C", 1, 0, 7, 2, 4, 0, 2, 0},
{"Metex ME-11", 0, 0, 7, 2, 1, 0, 1, 0},
{"Metex ME-22", 3, 0, 7, 2, 1, 0, 1, 0},
{"Metex ME-32", 0, 0, 7, 2, 1, 0, 1, 0},
{"Metex ME-42", 0, 0, 7, 2, 1, 0, 1, 0},
{"Metex universal system 9160", 1, 0, 7, 2, 4, 0, 1, 0},
{"PeakTech 3330", 3, 5, 8, 1, 1, 0, 1},
{"PeakTech 4010", 5, 0, 7, 2, 1, 0, 1},
{"PeakTech 4015A", 5, 0, 7, 2, 4, 0, 4},
{"PeakTech 4360", 0, 0, 7, 2, 1, 0, 1},
{"PeakTech 4390", 5, 0, 7, 2, 4, 0, 1},
{"PeakTech 451", 0, 1, 7, 2, 1, 0, 1}, // no image
{"PeakTech 3330", 3, 5, 8, 1, 1, 0, 1, 0},
{"PeakTech 4010", 5, 0, 7, 2, 1, 0, 1, 0},
{"PeakTech 4015A", 5, 0, 7, 2, 4, 0, 4, 0},
{"PeakTech 4360", 0, 0, 7, 2, 1, 0, 1, 0},
{"PeakTech 4390", 5, 0, 7, 2, 4, 0, 1, 0},
{"PeakTech 451", 0, 1, 7, 2, 1, 0, 1, 0}, // no image
{"Radioshack 22-805 DMM", 0, 0, 7, 2, 1, 0, 1},
{"Radioshack RS22-168A", 1, 0, 7, 2, 1, 0, 1}, // no image
{"Radioshack 22-812", 4, 9, 8, 1, 1, 0, 1},
{"Radioshack 22-805 DMM", 0, 0, 7, 2, 1, 0, 1, 0},
{"Radioshack RS22-168A", 1, 0, 7, 2, 1, 0, 1, 0}, // no image
{"Radioshack 22-812", 4, 9, 8, 1, 1, 0, 1, 0},
{"Tenma 72-7745", 3, 5, 8, 1, 1, 0, 1},
{"Tenma 72-7745", 3, 5, 8, 1, 1, 0, 1, 0},
{"Tenma 72-1016", 6, 6, 7, 1, 2, 2, 8, 0},
{"Sinometer MAS-343", 0, 0, 7, 2, 1, 0, 1},
{"Sinometer MAS-343", 0, 0, 7, 2, 1, 0, 1, 0},
{"Uni-Trend UT30A", 3, 5, 8, 1, 1, 0, 1},
{"Uni-Trend UT30E", 3, 5, 8, 1, 1, 0, 1}, // no image
{"Uni-Trend UT30A", 3, 5, 8, 1, 1, 0, 1, 0},
{"Uni-Trend UT30E", 3, 5, 8, 1, 1, 0, 1, 0}, // no image
{"Voltcraft M-3610D", 1, 0, 7, 2, 1, 0, 1}, // no image
{"Voltcraft M-3650D", 1, 0, 7, 2, 1, 0, 1},
{"Voltcraft M-3860", 5, 0, 7, 2, 4, 0, 2}, // no image
{"Voltcraft M-4650CR", 1, 2, 7, 2, 1, 0, 2 }, // no image
{"Voltcraft M-4660", 1, 0, 7, 2, 4, 0, 3},
{"Voltcraft ME-11", 0, 0, 7, 2, 1, 0, 1},
{"Voltcraft ME-22T", 3, 0, 7, 2, 1, 0, 1},
{"Voltcraft ME-32", 0, 0, 7, 2, 1, 0, 1},
{"Voltcraft VC 670", 4, 2, 7, 1, 1, 0, 3},
{"Voltcraft VC 820", 3, 5, 8, 1, 1, 0, 1},
{"Voltcraft VC 840", 3, 5, 8, 1, 1, 0, 1},
{"Voltcraft VC 940", 3, 7, 8, 1, 1, 2, 9},
{"Voltcraft M-3610D", 1, 0, 7, 2, 1, 0, 1, 0}, // no image
{"Voltcraft M-3650D", 1, 0, 7, 2, 1, 0, 1, 0},
{"Voltcraft M-3860", 5, 0, 7, 2, 4, 0, 2, 0}, // no image
{"Voltcraft M-4650CR", 1, 2, 7, 2, 1, 0, 2, 0 }, // no image
{"Voltcraft M-4660", 1, 0, 7, 2, 4, 0, 3, 0},
{"Voltcraft ME-11", 0, 0, 7, 2, 1, 0, 1, 0},
{"Voltcraft ME-22T", 3, 0, 7, 2, 1, 0, 1, 0},
{"Voltcraft ME-32", 0, 0, 7, 2, 1, 0, 1, 0},
{"Voltcraft VC 670", 4, 2, 7, 1, 1, 0, 3, 0},
{"Voltcraft VC 820", 3, 5, 8, 1, 1, 0, 1, 0},
{"Voltcraft VC 840", 3, 5, 8, 1, 1, 0, 1, 0},
{"Voltcraft VC 940", 3, 7, 8, 1, 1, 2, 9, 0},
{"*Voltcraft ME-42", 0, 0, 7, 2, 1, 0, 1},
{"*Voltcraft M-4660A", 5, 0, 7, 2, 4, 0, 3},
{"*Voltcraft M-4660M", 5, 0, 7, 2, 4, 0, 3},
{"*Voltcraft MXD-4660A", 5, 0, 7, 2, 4, 0, 3},
{"*Voltcraft VC 630", 4, 2, 7, 1, 1, 0, 3},
{"*Voltcraft VC 650", 4, 2, 7, 1, 1, 0, 3},
{"*Voltcraft VC 635", 3, 3, 7, 1, 1, 0, 3},
{"*Voltcraft VC 655", 3, 3, 7, 1, 1, 0, 3},
{"*Voltcraft ME-42", 0, 0, 7, 2, 1, 0, 1, 0},
{"*Voltcraft M-4660A", 5, 0, 7, 2, 4, 0, 3, 0},
{"*Voltcraft M-4660M", 5, 0, 7, 2, 4, 0, 3, 0},
{"*Voltcraft MXD-4660A", 5, 0, 7, 2, 4, 0, 3, 0},
{"*Voltcraft VC 630", 4, 2, 7, 1, 1, 0, 3, 0},
{"*Voltcraft VC 650", 4, 2, 7, 1, 1, 0, 3, 0},
{"*Voltcraft VC 635", 3, 3, 7, 1, 1, 0, 3, 0},
{"*Voltcraft VC 655", 3, 3, 7, 1, 1, 0, 3, 0},
{"",0,0,0,0,0,0,0} // End Of List
{"",0,0,0,0,0,0,0,0} // End Of List
};
DmmPrefs::DmmPrefs( QWidget *parent, const char *name ) :
@ -151,6 +160,8 @@ DmmPrefs::DmmPrefs( QWidget *parent, const char *name ) :
connect( ui_model, SIGNAL( activated( int ) ),
this, SLOT( modelSLOT( int )));
connect( ui_externalSetup, SIGNAL( toggled( bool ) ),
this, SLOT( externalSetupSLOT()));
connect( ui_load, SIGNAL( clicked() ),
this, SLOT( loadSLOT()));
connect( ui_save, SIGNAL( clicked() ),
@ -243,6 +254,7 @@ DmmPrefs::defaultsSLOT()
stopBitsCombo->setCurrentItem( m_cfg->getInt( "Port settings", "stop-bits", 2 )-1);
parityCombo->setCurrentItem( m_cfg->getInt( "Port settings", "parity", 0 ) );
displayCombo->setCurrentItem( m_cfg->getInt( "DMM", "display", 1 ) );
ui_externalSetup->setChecked( m_cfg->getInt( "DMM", "exterrnal-setup", 0 ) == 1 );
protocolCombo->setCurrentItem( m_cfg->getInt( "DMM", "data-format", 0 ));
ui_numValues->setValue( m_cfg->getInt( "DMM", "number-of-values", 1 ));
@ -273,6 +285,7 @@ DmmPrefs::factoryDefaultsSLOT()
stopBitsCombo->setCurrentItem( 1 );
parityCombo->setCurrentItem( 0 );
displayCombo->setCurrentItem( 1 );
ui_externalSetup->setChecked( false );
protocolCombo->setCurrentItem( 0 );
ui_numValues->setValue( 1 );
@ -292,6 +305,7 @@ DmmPrefs::applySLOT()
m_cfg->setInt( "Port settings", "parity", parityCombo->currentItem() );
m_cfg->setInt( "DMM", "display", displayCombo->currentItem() );
m_cfg->setBool( "DMM", "external-setup", ui_externalSetup->isChecked() );
m_cfg->setInt( "DMM", "data-format", protocolCombo->currentItem() );
m_cfg->setInt( "DMM", "number-of-values", ui_numValues->value() );
@ -299,6 +313,17 @@ DmmPrefs::applySLOT()
(ui_model->currentItem() == 0 ? "Manual" : dmm_info[ui_model->currentItem()-1].name ));
}
void DmmPrefs::externalSetupSLOT()
{
if (ui_model->currentItem() == 0)
{
baudRate->setDisabled( ui_externalSetup->isChecked() );
bitsCombo->setDisabled( ui_externalSetup->isChecked() );
stopBitsCombo->setDisabled( ui_externalSetup->isChecked() );
parityCombo->setDisabled( ui_externalSetup->isChecked() );
}
}
void
DmmPrefs::modelSLOT( int id )
{
@ -318,6 +343,8 @@ DmmPrefs::modelSLOT( int id )
stopBitsCombo->setDisabled( id != 0 );
parityCombo->setDisabled( id != 0 );
ui_numValues->setDisabled( id != 0 );
ui_externalSetup->setDisabled( id != 0 );
if (id != 0) message->hide();
else message->show();
if (ui_model->text(id)[0] == '*')
@ -338,6 +365,7 @@ DmmPrefs::modelSLOT( int id )
parityCombo->setCurrentItem( dmm_info[id-1].parity );
displayCombo->setCurrentItem( dmm_info[id-1].display );
ui_numValues->setValue( dmm_info[id-1].numValues );
ui_externalSetup->setChecked( dmm_info[id-1].externalSetup );
ui_filename->setText( "" );
}
@ -385,8 +413,12 @@ DmmPrefs::speed() const
return 600;
}
int
DmmPrefs::numValues() const
bool DmmPrefs::externalSetup() const
{
return ui_externalSetup->isChecked();
}
int DmmPrefs::numValues() const
{
return ui_numValues->value();
}
@ -447,7 +479,7 @@ DmmPrefs::loadSLOT()
stopBitsCombo->setCurrentItem( cfg.getInt( "Port settings", "stop-bits", 2 )-1);
parityCombo->setCurrentItem( cfg.getInt( "Port settings", "parity", 0 ) );
displayCombo->setCurrentItem( cfg.getInt( "DMM", "display", 1 ) );
ui_externalSetup->setChecked( cfg.getBool( "DMM", "external-setup", false ) );
protocolCombo->setCurrentItem( cfg.getInt( "DMM", "data-format", 0 ));
ui_numValues->setValue( cfg.getInt( "DMM", "number-of-values", 1 ));
}
@ -487,7 +519,7 @@ DmmPrefs::saveSLOT()
cfg.setInt( "Port settings", "parity", parityCombo->currentItem() );
cfg.setInt( "DMM", "display", displayCombo->currentItem() );
cfg.setBool( "DMM", "external-setup", ui_externalSetup->isChecked() );
cfg.setInt( "DMM", "data-format", protocolCombo->currentItem() );
cfg.setInt( "DMM", "number-of-values", ui_numValues->value() );

7
src/dmmprefs.h Normal file → Executable file
View File

@ -26,7 +26,7 @@
struct DMMInfo
{
char *name;
const char *name;
int baud;
int protocol;
int bits;
@ -34,6 +34,7 @@ struct DMMInfo
int numValues;
int parity;
int display;
bool externalSetup;
};
class DmmPrefs : public UIDmmPrefs
@ -48,6 +49,7 @@ public:
int stopBits() const;
int speed() const;
int numValues() const;
bool externalSetup() const;
ReadEvent::DataFormat format() const;
int display() const;
QString dmmName() const;
@ -64,8 +66,9 @@ protected slots:
void modelSLOT( int );
void loadSLOT();
void saveSLOT();
// empty finction as damn moc doesn't know about defines
// empty function as damn moc doesn't know about defines
void scanDevicesSLOT();
void externalSetupSLOT();
protected:
QString m_path;

0
src/engnumbervalidator.cpp Normal file → Executable file
View File

0
src/engnumbervalidator.h Normal file → Executable file
View File

0
src/executeprefs.cpp Normal file → Executable file
View File

0
src/executeprefs.h Normal file → Executable file
View File

0
src/graphprefs.cpp Normal file → Executable file
View File

0
src/graphprefs.h Normal file → Executable file
View File

0
src/guiprefs.cpp Normal file → Executable file
View File

0
src/guiprefs.h Normal file → Executable file
View File

0
src/integrationprefs.cpp Normal file → Executable file
View File

0
src/integrationprefs.h Normal file → Executable file
View File

0
src/main.cpp Normal file → Executable file
View File

2
src/mainwid.cpp Normal file → Executable file
View File

@ -397,7 +397,7 @@ MainWid::readConfig()
m_dmm->setSpeed( m_configDlg->speed() );
m_dmm->setFormat( m_configDlg->format() );
m_dmm->setPortSettings( m_configDlg->bits(), m_configDlg->stopBits(),
m_configDlg->parity() );
m_configDlg->parity(), m_configDlg->externalSetup() );
ui_graph->setGraphSize( m_configDlg->windowSeconds(),
m_configDlg->totalSeconds() );

0
src/mainwid.h Normal file → Executable file
View File

2
src/mainwin.cpp Normal file → Executable file
View File

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

0
src/mainwin.h Normal file → Executable file
View File

0
src/prefwidget.cpp Normal file → Executable file
View File

0
src/prefwidget.h Normal file → Executable file
View File

0
src/printdlg.cpp Normal file → Executable file
View File

0
src/printdlg.h Normal file → Executable file
View File

0
src/qcleanuphandler.h Normal file → Executable file
View File

0
src/readerthread.cpp Normal file → Executable file
View File

0
src/readerthread.h Normal file → Executable file
View File

0
src/readevent.cpp Normal file → Executable file
View File

0
src/readevent.h Normal file → Executable file
View File

0
src/recorderprefs.cpp Normal file → Executable file
View File

0
src/recorderprefs.h Normal file → Executable file
View File

0
src/scaleprefs.cpp Normal file → Executable file
View File

0
src/scaleprefs.h Normal file → Executable file
View File

0
src/simplecfg.cpp Normal file → Executable file
View File

0
src/simplecfg.h Normal file → Executable file
View File

2
src/src.pro Normal file → Executable file
View File

@ -78,6 +78,6 @@ macx {
RC_FILE = QtDMMIcon.icns
}
TARGET = qtdmm
VERSION = 0.8.12
VERSION = 0.8.13
DESTDIR = ../bin

0
src/tipdlg.cpp Normal file → Executable file
View File

0
src/tipdlg.h Normal file → Executable file
View File

410
src/uidmmprefs.ui Normal file → Executable file
View File

@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>610</width>
<height>640</height>
<height>682</height>
</rect>
</property>
<property name="caption">
@ -143,7 +143,187 @@
<property name="spacing">
<number>5</number>
</property>
<widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<widget class="QLabel" row="3" column="0">
<property name="name">
<cstring>ui_parityLabel</cstring>
</property>
<property name="text">
<string>Parit&amp;y</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>stopBitsCombo</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QComboBox" row="3" column="1">
<item>
<property name="text">
<string>None</string>
</property>
</item>
<item>
<property name="text">
<string>Even</string>
</property>
</item>
<item>
<property name="text">
<string>Odd</string>
</property>
</item>
<property name="name">
<cstring>parityCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Parity for serial communication. May be None, Odd or Even.</string>
</property>
</widget>
<widget class="QComboBox" row="3" column="3">
<item>
<property name="text">
<string>2000</string>
</property>
</item>
<item>
<property name="text">
<string>4000</string>
</property>
</item>
<item>
<property name="text">
<string>20000</string>
</property>
</item>
<item>
<property name="text">
<string>50000</string>
</property>
</item>
<item>
<property name="text">
<string>100000</string>
</property>
</item>
<item>
<property name="text">
<string>200000</string>
</property>
</item>
<item>
<property name="text">
<string>400000</string>
</property>
</item>
<item>
<property name="text">
<string>1000000</string>
</property>
</item>
<item>
<property name="text">
<string>6000</string>
</property>
</item>
<item>
<property name="text">
<string>40000</string>
</property>
</item>
<property name="name">
<cstring>displayCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Number of display digits.
&lt;ul&gt;&lt;li&gt;3 1/2 - 2000 Counts&lt;/li&gt;
&lt;li&gt;3 3/4 - 4000 Counts&lt;/li&gt;
&lt;li&gt;4 1/2 - 20000 Counts&lt;/li&gt;
&lt;li&gt;4 3/4 - 40000 Counts&lt;/li&gt;
&lt;/ul&gt;</string>
</property>
</widget>
<widget class="QComboBox" row="2" column="1">
<item>
<property name="text">
<string>5 bits</string>
</property>
</item>
<item>
<property name="text">
<string>6 bits</string>
</property>
</item>
<item>
<property name="text">
<string>7 bits</string>
</property>
</item>
<item>
<property name="text">
<string>8 bits</string>
</property>
</item>
<property name="name">
<cstring>bitsCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Number of bits for serial communication.</string>
</property>
</widget>
<widget class="QLabel" row="2" column="0">
<property name="name">
<cstring>ui_bitsLabel</cstring>
</property>
<property name="text">
<string>&amp;Bits:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>bitsCombo</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QComboBox" row="2" column="3">
<item>
<property name="text">
<string>1 Stop bit</string>
</property>
</item>
<item>
<property name="text">
<string>2 Stop bits</string>
</property>
</item>
<property name="name">
<cstring>stopBitsCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Number of stop bits for serial communication.</string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel2</cstring>
</property>
<property name="text">
<string>&amp;Port:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>port</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QLayoutWidget" row="1" column="1">
<property name="name">
<cstring>layout2</cstring>
</property>
@ -217,136 +397,7 @@
</widget>
</hbox>
</widget>
<widget class="QLabel" row="2" column="0">
<property name="name">
<cstring>ui_bitsLabel</cstring>
</property>
<property name="text">
<string>&amp;Bits:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>bitsCombo</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QLabel" row="3" column="0">
<property name="name">
<cstring>ui_parityLabel</cstring>
</property>
<property name="text">
<string>Parit&amp;y</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>stopBitsCombo</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QComboBox" row="1" column="3" rowspan="2" colspan="1">
<item>
<property name="text">
<string>1 Stop bit</string>
</property>
</item>
<item>
<property name="text">
<string>2 Stop bits</string>
</property>
</item>
<property name="name">
<cstring>stopBitsCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Number of stop bits for serial communication.</string>
</property>
</widget>
<widget class="QComboBox" row="3" column="3">
<item>
<property name="text">
<string>2000</string>
</property>
</item>
<item>
<property name="text">
<string>4000</string>
</property>
</item>
<item>
<property name="text">
<string>20000</string>
</property>
</item>
<item>
<property name="text">
<string>50000</string>
</property>
</item>
<item>
<property name="text">
<string>100000</string>
</property>
</item>
<item>
<property name="text">
<string>200000</string>
</property>
</item>
<item>
<property name="text">
<string>400000</string>
</property>
</item>
<item>
<property name="text">
<string>1000000</string>
</property>
</item>
<item>
<property name="text">
<string>6000</string>
</property>
</item>
<item>
<property name="text">
<string>40000</string>
</property>
</item>
<property name="name">
<cstring>displayCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Number of display digits.
&lt;ul&gt;&lt;li&gt;3 1/2 - 2000 Counts&lt;/li&gt;
&lt;li&gt;3 3/4 - 4000 Counts&lt;/li&gt;
&lt;li&gt;4 1/2 - 20000 Counts&lt;/li&gt;
&lt;li&gt;4 3/4 - 40000 Counts&lt;/li&gt;
&lt;/ul&gt;</string>
</property>
</widget>
<widget class="QLabel" row="1" column="2" rowspan="2" colspan="1">
<property name="name">
<cstring>ui_stopLabel</cstring>
</property>
<property name="text">
<string>&amp;Stop bits:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>stopBitsCombo</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QComboBox" row="0" column="3">
<widget class="QComboBox" row="1" column="3">
<item>
<property name="text">
<string>600 baud</string>
@ -392,6 +443,14 @@
<string>Select the baud rate for the DMM here. If you encounter problems connecting to your DMM try lowering the baud rate. I had some problems with my &lt;b&gt;Metex ME-32&lt;/b&gt;. The Documentation said 1200 baud but it only worked at 600.</string>
</property>
</widget>
<widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>ui_externalSetup</cstring>
</property>
<property name="text">
<string>External device setup</string>
</property>
</widget>
<widget class="QLabel" row="3" column="2">
<property name="name">
<cstring>ui_displayLabel</cstring>
@ -408,7 +467,23 @@
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QLabel" row="0" column="2">
<widget class="QLabel" row="2" column="2">
<property name="name">
<cstring>ui_stopLabel</cstring>
</property>
<property name="text">
<string>&amp;Stop bits:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>stopBitsCombo</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QLabel" row="1" column="2">
<property name="name">
<cstring>ui_baudLabel</cstring>
</property>
@ -424,73 +499,6 @@
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel2</cstring>
</property>
<property name="text">
<string>&amp;Port:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
<cstring>port</cstring>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
<widget class="QComboBox" row="2" column="1">
<item>
<property name="text">
<string>5 bits</string>
</property>
</item>
<item>
<property name="text">
<string>6 bits</string>
</property>
</item>
<item>
<property name="text">
<string>7 bits</string>
</property>
</item>
<item>
<property name="text">
<string>8 bits</string>
</property>
</item>
<property name="name">
<cstring>bitsCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Number of bits for serial communication.</string>
</property>
</widget>
<widget class="QComboBox" row="3" column="1">
<item>
<property name="text">
<string>None</string>
</property>
</item>
<item>
<property name="text">
<string>Even</string>
</property>
</item>
<item>
<property name="text">
<string>Odd</string>
</property>
</item>
<property name="name">
<cstring>parityCombo</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>Parity for serial communication. May be None, Odd or Even.</string>
</property>
</widget>
</grid>
</widget>
<widget class="QButtonGroup">
@ -629,7 +637,7 @@
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
<height>60</height>
</size>
</property>
</spacer>

0
src/uitipdlg.ui Normal file → Executable file
View File

2
src/xpm/A.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * A_xpm[] = {
static const char * A_xpm[] = {
"10 16 2 1",
" c None",
". c #000000",

2
src/xpm/A_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * A_small_xpm[] = {
static const char * A_small_xpm[] = {
"6 8 2 1",
" c None",
". c #000000",

2
src/xpm/DBM.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * DBM_xpm[] = {
static const char * DBM_xpm[] = {
"15 16 2 1",
" c None",
". c #000000",

2
src/xpm/DBM_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * DBM_small_xpm[] = {
static const char * DBM_small_xpm[] = {
"9 8 2 1",
" c None",
". c #000000",

2
src/xpm/F.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * F_xpm[] = {
static const char * F_xpm[] = {
"12 16 2 1",
" c None",
". c #000000",

2
src/xpm/F_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * F_small_xpm[] = {
static const char * F_small_xpm[] = {
"5 8 2 1",
" c None",
". c #000000",

2
src/xpm/G.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * G_xpm[] = {
static const char * G_xpm[] = {
"11 16 2 1",
" c None",
". c #000000",

2
src/xpm/G_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * G_small_xpm[] = {
static const char * G_small_xpm[] = {
"5 8 2 1",
" c None",
". c #000000",

2
src/xpm/H.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * H_xpm[] = {
static const char * H_xpm[] = {
"12 16 2 1",
" c None",
". c #000000",

2
src/xpm/H_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * H_small_xpm[] = {
static const char * H_small_xpm[] = {
"5 8 2 1",
" c None",
". c #000000",

2
src/xpm/Hz.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * Hz_xpm[] = {
static const char * Hz_xpm[] = {
"18 16 2 1",
" c None",
". c #000000",

2
src/xpm/Hz_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * Hz_small_xpm[] = {
static const char * Hz_small_xpm[] = {
"10 8 2 1",
" c None",
". c #000000",

2
src/xpm/Ohm.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * Ohm_xpm[] = {
static const char * Ohm_xpm[] = {
"12 16 2 1",
" c None",
". c #000000",

2
src/xpm/Ohm_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * Ohm_small_xpm[] = {
static const char * Ohm_small_xpm[] = {
"6 8 2 1",
" c None",
". c #000000",

2
src/xpm/V.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * V_xpm[] = {
static const char * V_xpm[] = {
"10 16 2 1",
" c None",
". c #000000",

2
src/xpm/V_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * V_small_xpm[] = {
static const char * V_small_xpm[] = {
"6 8 2 1",
" c None",
". c #000000",

2
src/xpm/W.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * W_xpm[] = {
static const char * W_xpm[] = {
"12 16 2 1",
" c None",
". c #000000",

2
src/xpm/W_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * W_small_xpm[] = {
static const char * W_small_xpm[] = {
"5 8 2 1",
" c None",
". c #000000",

2
src/xpm/ac.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * ac_xpm[] = {
const char * ac_xpm[] = {
"18 14 2 1",
" c None",
". c #000000",

2
src/xpm/all_digits.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * all_digits_xpm[] = {
static const char * all_digits_xpm[] = {
"38 64 2 1",
" c None",
". c #000000",

2
src/xpm/auto.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * auto_xpm[] = {
static const char * auto_xpm[] = {
"14 14 2 1",
" c None",
". c #000000",

2
src/xpm/bar.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * bar_xpm[] = {
static const char * bar_xpm[] = {
"5 9 2 1",
" c None",
". c #000000",

2
src/xpm/clear.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * clear_xpm[] = {
static const char * clear_xpm[] = {
"22 22 108 2",
" g None",
". g #000000",

2
src/xpm/cm.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * M_xpm[] = {
static const char * M_xpm[] = {
"12 16 2 1",
" c None",
". c #000000",

2
src/xpm/cm_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * M_small_xpm[] = {
static const char * M_small_xpm[] = {
"7 8 2 1",
" c None",
". c #000000",

2
src/xpm/conf.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * conf_xpm[] = {
static const char * conf_xpm[] = {
"22 22 20 1",
" c None",
". c #000000",

2
src/xpm/config.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * config_xpm[] = {
static const char * config_xpm[] = {
"22 22 20 1",
" c None",
". c #000000",

2
src/xpm/connect_icon.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * connect_icon_xpm[] = {
static const char * connect_icon_xpm[] = {
"32 32 188 2",
" c None",
". c #FFFF00",

2
src/xpm/connect_off.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * connect_off_xpm[] = {
static const char * connect_off_xpm[] = {
"22 22 18 1",
" c None",
". c #FFFF00",

2
src/xpm/connect_on.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * connect_on_xpm[] = {
static const char * connect_on_xpm[] = {
"22 22 16 1",
" c None",
". c #000000",

2
src/xpm/connection.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * connection_xpm[] = {
static const char * connection_xpm[] = {
"32 32 67 1",
" c None",
". c #FDFD00",

2
src/xpm/dc.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * dc_xpm[] = {
static const char * dc_xpm[] = {
"18 14 2 1",
" c None",
". c #000000",

2
src/xpm/decimal.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * decimal_xpm[] = {
static const char * decimal_xpm[] = {
"11 64 2 1",
" c None",
". c #000000",

2
src/xpm/decimal_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * decimal_small_xpm[] = {
static const char * decimal_small_xpm[] = {
"4 21 2 1",
" c None",
". c #000000",

2
src/xpm/deg.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * deg_xpm[] = {
static const char * deg_xpm[] = {
"18 16 2 1",
" c None",
". c #000000",

2
src/xpm/deg_small.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * deg_small_xpm[] = {
static const char * deg_small_xpm[] = {
"10 8 2 1",
" c None",
". c #000000",

2
src/xpm/diode.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * diode_xpm[] = {
static const char * diode_xpm[] = {
"17 14 2 1",
" c None",
". c #000000",

2
src/xpm/display.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * display_xpm[] = {
static const char * display_xpm[] = {
"32 32 4 1",
" c None",
". c #00B506",

2
src/xpm/dmm.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * dmm_xpm[] = {
static const char * dmm_xpm[] = {
"32 32 14 1",
" c None",
". c #000000",

2
src/xpm/dmm_big.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * dmm_big_xpm[] = {
static const char * dmm_big_xpm[] = {
"64 64 14 1",
" c None",
". c #000000",

2
src/xpm/ee.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * ee_xpm[] = {
static const char * ee_xpm[] = {
"38 64 2 1",
" c None",
". c #000000",

2
src/xpm/execute.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char * execute_xpm[] = {
static const char * execute_xpm[] = {
"32 32 9 1",
" c None",
". c #050505",

Some files were not shown because too many files have changed in this diff Show More