diff --git a/DSView/config.h b/DSView/config.h new file mode 100755 index 00000000..25d9638f --- /dev/null +++ b/DSView/config.h @@ -0,0 +1,36 @@ +/* + * This file is part of the PulseView project. + * + * Copyright (C) 2012 Alexandru Gagniuc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _DSVIEW_CONFIG_H +#define _DSVIEW_CONFIG_H + +/* Application details */ +#define DS_TITLE "DSView" +#define DS_DESCRIPTION "A GUI for instruments of DreamSourceLab" +#define DS_BIN_NAME "DSView" + +/* DSView version information */ +#define DS_VERSION_MAJOR 1 +#define DS_VERSION_MINOR 5 +#define DS_VERSION_MICRO 0 +#define DS_VERSION_STRING "1.5.0" + +#define DS_DEBUG_TRACE + +#endif diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp index eae70d5d..39461b2c 100644 --- a/DSView/pv/appcontrol.cpp +++ b/DSView/pv/appcontrol.cpp @@ -71,7 +71,8 @@ bool AppControl::Init() return false; } - const char *decoderScriptDir = "/home/lala/tmpdir/any"; + // const char *decoderScriptDir = "/home/lala/tmpdir/any"; + const char * decoderScriptDir = NULL; // Initialise libsigrokdecode if (srd_init(decoderScriptDir) != SRD_OK) diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp index b8c15a24..9a32a7ab 100755 --- a/DSView/pv/data/decoderstack.cpp +++ b/DSView/pv/data/decoderstack.cpp @@ -480,7 +480,7 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod uint64_t entry_cnt = 0; uint64_t i = decode_start; - char *error = NULL; + char *error = NULL; if( i >= decode_end){ qDebug()<<"decode data index have been end:"<decoder()->stop_decode_work(); } diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user index cb6bad0c..562886c3 100644 --- a/qtpro/DSView.pro.user +++ b/qtpro/DSView.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -55,8 +55,25 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true true + + true + Builtin.TidyAndClazy + 4 + + + + true +