SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

config.h

Browse Source
This commit is contained in:
dreamsourcelabTAI
2021-11-16 15:49:26 +08:00
parent 4185466401
commit 264f57fe95
5 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DSView/config.h Executable file
View File

@@ -0,0 +1,36 @@
/*
* This file is part of the PulseView project.
*
* Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#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

3
DSView/pv/appcontrol.cpp
View File

@@ -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)

4
DSView/pv/data/decoderstack.cpp
View File

@@ -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:"<<i;
@@ -542,6 +542,8 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
entry_cnt++;
}
qDebug()<<"send to decoder times:"<<entry_cnt;
if (error)
g_free(error);

2
DSView/pv/sigsession.cpp
View File

@@ -1813,7 +1813,7 @@ void SigSession::set_stop_scale(float scale)
}
//the task maybe is running
qDebug()<<"remove a running decode task";
// qDebug()<<"remove a running decode task";
trace->decoder()->stop_decode_work();
}

19
qtpro/DSView.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.0, 2021-11-12T18:52:28. -->
<!-- Written by QtCreator 4.11.0, 2021-11-15T18:43:34. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -55,8 +55,25 @@
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap">
<valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
<value type="bool" key="AutoTest.Framework.Boost">true</value>
<value type="bool" key="AutoTest.Framework.GTest">true</value>
<value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
<value type="bool" key="AutoTest.Framework.QtTest">true</value>
</valuemap>
<value type="int" key="AutoTest.RunAfterBuild">0</value>
<value type="bool" key="AutoTest.UseGlobal">true</value>
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
<valuemap type="QVariantMap" key="ClangTools">
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.TidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">4</value>
<valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
<valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
</valuemap>
</valuemap>
</data>
<data>