diff -ur QtDMM-0.8.1/configure QtDMM-0.8.1-wavetek/configure --- QtDMM-0.8.1/configure 2002-03-03 23:43:32.000000000 +0100 +++ QtDMM-0.8.1-wavetek/configure 2004-11-12 09:34:28.183396736 +0100 @@ -1,19 +1,18 @@ #! /bin/sh -if [ -z "$TMAKEPATH" ] +if [ -z "$QTDIR" ] then echo "*******************************************************************************" - echo " TMAKEPATH is not set. This package requires a correctly set up" - echo " tmake. To get tmake go to ftp://ftp.troll.no/freebies/tmake" + echo " QTDIR is not set." echo "*******************************************************************************" exit -1 fi -if [ ! -f "$TMAKEPATH/../../bin/tmake" ] +if [ ! -f "$QTDIR/bin/qmake" ] then echo "*******************************************************************************" - echo " The tmake utility was not found. This package requires a correctly" - echo " set up tmake. To get tmake go to ftp://ftp.troll.no/freebies/tmake" + echo " The qmake utility was not found. This package requires a correctly" + echo " set up qmake." echo "*******************************************************************************" exit -1 fi @@ -44,7 +43,7 @@ cd .. -$TMAKEPATH/../../bin/tmake -o Makefile QtDMM.pro +$QTDIR/bin/qmake -o Makefile QtDMM.pro echo "Testing libraries & tools ..." @@ -60,15 +59,15 @@ echo "#include " > qttest.cpp echo "#include " >> qttest.cpp echo "int main(int argc, char **argv) { fprintf( stderr, \"Found QT Version %s: \", QT_VERSION_STR );" >> qttest.cpp -echo "if (QT_VERSION >= 210 && QT_VERSION < 300) return 0; else return -1; }" >> qttest.cpp -gcc -I$QTDIR/include qttest.cpp +echo "if (QT_VERSION >= 210) return 0; else return -1; }" >> qttest.cpp +g++ -I$QTDIR/include qttest.cpp if ./a.out then echo "OK" rm qttest.cpp 2>/dev/null rm a.out 2>/dev/null else -echo "QtDMM needs Qt 2.x" +echo "QtDMM needs at least Qt 2.x" rm qttest.cpp 2>/dev/null rm a.out 2>/dev/null exit -1 Kun i QtDMM-0.8.1-wavetek: Makefile diff -ur QtDMM-0.8.1/src/configdlg.cpp QtDMM-0.8.1-wavetek/src/configdlg.cpp --- QtDMM-0.8.1/src/configdlg.cpp 2002-10-15 17:26:38.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/configdlg.cpp 2004-11-12 10:19:20.077236704 +0100 @@ -38,7 +38,9 @@ #include #include -#include +#include + +using namespace std; #include @@ -84,6 +86,7 @@ {"*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}, + {"Wavetek 235", 3, 5, 7, 1, 1, 2, 3}, {"",0,0,0,0,0,0,0} // End Of List }; diff -ur QtDMM-0.8.1/src/dmm.cpp QtDMM-0.8.1-wavetek/src/dmm.cpp --- QtDMM-0.8.1/src/dmm.cpp 2002-10-13 17:48:41.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/dmm.cpp 2004-11-12 10:25:10.214007824 +0100 @@ -22,7 +22,9 @@ #include #include #include -#include +#include + +using namespace std; #include @@ -286,7 +288,8 @@ { ReadEvent *re = (ReadEvent *)ev; - if (re->format() != ReadEvent::M9803RContinuous) + if (re->format() != ReadEvent::M9803RContinuous && + re->format() != ReadEvent::Wavetek235Continuous) { QString tmp = re->string(); @@ -338,6 +341,105 @@ emit value( d_val, val, unit, special, true, re->id() ); m_error = tr( "Connected (" + m_name + ")" ); + } else if (re->format() == ReadEvent::Wavetek235Continuous) { + QString parseerror; + + // Char 0 is subtype, and will be handled later + + // Char 1-4 is value + val = QString(re->string()).mid(1, 4); + double d_val = val.toDouble(); + + // Char 5 is type + // < voltage, 7 resistance, ? 10A, , = mA, > myA + switch (re->string()[5]) { + case '<': + unit = "V"; + break; + + case '7': + unit = "O"; + break; + + case '?': + unit = "A"; // 10A + break; + + case '=': + unit = "mA"; // mA + break; + + case '>': + unit = "mA"; // myA + break; + + } + + // Char 6-7 is ?? + + // Char 8 is AC/DC, with subtype (range) is set/not set + switch (re->string()[8]) { + case ';': + special = "DC"; + break; + + case '3': + special = "AC"; + break; + + case '=': + special = "DC"; + parseerror = "Range not set"; + break; + + case '5': + special = "AC"; + parseerror = "Range not set"; + break; + + default: + parseerror = "Char 8 not understood!"; + break; + } + + // Char 0 is subtype + if (unit == "V") { + switch (re->string()[0]) { + case '0': + d_val /= 1.0E4; + val = val.left(3) + "." + val[3]; + unit = "mV"; + break; + + case '1': + d_val /= 1.0E3; + break; + + case '2': + d_val /= 1.0E2; + break; + + case '3': + d_val /= 1.0E1; + break; + + case '4': + break; + + default: + parseerror = "Char 0 not understood"; + } + } else { + parseerror = "Scale not correct"; + } + + if (parseerror != "") { + emit error(parseerror); + } else { + m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")"; + } + emit value( d_val, val, unit, special, true, re->id() ); + } else { diff -ur QtDMM-0.8.1/src/dmmgraph.cpp QtDMM-0.8.1-wavetek/src/dmmgraph.cpp --- QtDMM-0.8.1/src/dmmgraph.cpp 2002-10-15 17:26:39.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/dmmgraph.cpp 2004-11-12 10:49:27.270501568 +0100 @@ -39,7 +39,9 @@ #include -#include +#include + +using namespace std; DMMGraph::DMMGraph( QWidget *parent, const char *name ) : QWidget( parent, name ), @@ -68,8 +70,8 @@ m_integrationThreshold( 0.0 ), m_integrationOffset( 0.0 ) { - m_array = new QArray (m_length); - m_arrayInt = new QArray (m_length); + m_array = new QMemArray (m_length); + m_arrayInt = new QMemArray (m_length); m_drawArray.resize( m_length ); diff -ur QtDMM-0.8.1/src/dmmgraph.h QtDMM-0.8.1-wavetek/src/dmmgraph.h --- QtDMM-0.8.1/src/dmmgraph.h 2002-10-15 17:26:39.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/dmmgraph.h 2004-11-12 10:49:19.686654488 +0100 @@ -22,7 +22,7 @@ #define DMMGRAPH_HH #include -#include +#include #include #include @@ -112,8 +112,8 @@ double m_scaleMin; double m_scaleMax; bool m_autoScale; - QArray *m_array; - QArray *m_arrayInt; + QMemArray *m_array; + QMemArray *m_arrayInt; int m_pointer; double m_yfactor; double m_xfactor; diff -ur QtDMM-0.8.1/src/engnumbervalidator.cpp QtDMM-0.8.1-wavetek/src/engnumbervalidator.cpp --- QtDMM-0.8.1/src/engnumbervalidator.cpp 2002-10-13 17:48:42.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/engnumbervalidator.cpp 2004-11-12 09:22:37.152489864 +0100 @@ -20,9 +20,11 @@ #include +#include // RedHat needs it + EngNumberValidator::EngNumberValidator( QWidget *parent, const char *name ) : - QValidator(parent, name ) + QValidator((QObject*) parent, name) { } diff -ur QtDMM-0.8.1/src/mainwin.cpp QtDMM-0.8.1-wavetek/src/mainwin.cpp --- QtDMM-0.8.1/src/mainwin.cpp 2002-10-14 19:19:35.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/mainwin.cpp 2004-11-12 10:20:15.666785808 +0100 @@ -277,6 +277,7 @@ "PeakTech4010 and 451" "VoltcraftM-4660, ME-11, ME-22T and ME-32" "Implemented, but not yet confirmed by a user are:" + "Wavetek235" "VoltcraftME-42, M-3860, M-4660A, M-4660M, MXD-4660A, VC 630, VC 650, VC 670" ", VC 635 and VC 655" "Other compatible models may work also.

" Kun i QtDMM-0.8.1-wavetek/src: Makefile Kun i QtDMM-0.8.1-wavetek/src: moc diff -ur QtDMM-0.8.1/src/qprocess_unix.h QtDMM-0.8.1-wavetek/src/qprocess_unix.h --- QtDMM-0.8.1/src/qprocess_unix.h 2002-10-11 22:08:59.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/qprocess_unix.h 2004-11-12 09:27:11.765742304 +0100 @@ -87,11 +87,11 @@ // happen to match up... perhaps we should use two defines, one // for each yuckyness. #if defined(SIGNAL_HACK) -static void qt_C_sigign() { (*SIG_IGN)(SIGPIPE); } -static void qt_C_sigchldHnd(); +extern void qt_C_sigign() { (*SIG_IGN)(SIGPIPE); } +extern void qt_C_sigchldHnd(); #else #define qt_C_sigign SIG_IGN -static void qt_C_sigchldHnd( int ); +extern void qt_C_sigchldHnd( int ); #endif #if defined(Q_C_CALLBACKS) } diff -ur QtDMM-0.8.1/src/readerthread.cpp QtDMM-0.8.1-wavetek/src/readerthread.cpp --- QtDMM-0.8.1/src/readerthread.cpp 2002-10-13 17:48:42.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/readerthread.cpp 2004-11-12 09:29:01.272094808 +0100 @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include @@ -162,6 +162,8 @@ return 15; case ReadEvent::M9803RContinuous: return 11; + case ReadEvent::Wavetek235Continuous: + return 11; case ReadEvent::PeakTech10: return 12; } @@ -191,6 +193,10 @@ { readM9803RContinuous(); } + else if (m_format == ReadEvent::Wavetek235Continuous) + { + readWavetek235Continuous(); + } else if (m_format == ReadEvent::PeakTech10) { readPeakTech10(); @@ -218,6 +224,11 @@ if (m_fifo[(m_length-1+FIFO_LENGTH)%FIFO_LENGTH] == 0x0d && m_fifo[m_length] == 0x0a) return true; } + else if (m_format == ReadEvent::Wavetek235Continuous && m_length >= 10) + { + if (m_fifo[(m_length-1+FIFO_LENGTH)%FIFO_LENGTH] == 0x0d && + m_fifo[m_length] == 0x0a) return true; + } else if (m_format == ReadEvent::PeakTech10 && m_length >= 11) { if (m_fifo[(m_length-11+FIFO_LENGTH)%FIFO_LENGTH] == '#') return true; @@ -253,6 +264,11 @@ } void +ReaderThread::readWavetek235Continuous() +{ +} + +void ReaderThread::readPeakTech10() { /* char byte; diff -ur QtDMM-0.8.1/src/readerthread.h QtDMM-0.8.1-wavetek/src/readerthread.h --- QtDMM-0.8.1/src/readerthread.h 2002-10-13 17:48:42.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/readerthread.h 2004-11-12 09:22:37.154489560 +0100 @@ -72,6 +72,7 @@ void readVoltcraft14Continuous(); void readVoltcraft15Continuous(); void readM9803RContinuous(); + void readWavetek235Continuous(); void readPeakTech10(); int formatLength() const; diff -ur QtDMM-0.8.1/src/readevent.h QtDMM-0.8.1-wavetek/src/readevent.h --- QtDMM-0.8.1/src/readevent.h 2002-10-11 22:05:39.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/readevent.h 2004-11-12 09:22:37.155489408 +0100 @@ -32,7 +32,8 @@ PeakTech10, Voltcraft14Continuous, Voltcraft15Continuous, - M9803RContinuous + M9803RContinuous, + Wavetek235Continuous }; ReadEvent( char *str, int len, int id, DataFormat df ); diff -ur QtDMM-0.8.1/src/simplecfg.cpp QtDMM-0.8.1-wavetek/src/simplecfg.cpp --- QtDMM-0.8.1/src/simplecfg.cpp 2001-09-04 16:38:13.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/simplecfg.cpp 2004-11-12 09:25:31.528980608 +0100 @@ -22,7 +22,9 @@ #include #include #include -#include +#include +using namespace std; + SimpleCfgGroup::SimpleCfgGroup( const QString & name ) : groupName( name ) Kun i QtDMM-0.8.1-wavetek/src: tmp diff -ur QtDMM-0.8.1/src/uiconfigdlg.ui QtDMM-0.8.1-wavetek/src/uiconfigdlg.ui --- QtDMM-0.8.1/src/uiconfigdlg.ui 2002-10-15 17:26:39.000000000 +0200 +++ QtDMM-0.8.1-wavetek/src/uiconfigdlg.ui 2004-11-12 10:22:41.598600800 +0100 @@ -2376,6 +2376,12 @@ 11 bytes binary, continuous (M9803R) + + + text + 11 bytes binary, continuous (Wavetek) + + name protocolCombo