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

update build script

Browse Source
This commit is contained in:
dreamsourcelabTAI
2022-10-17 09:06:02 +08:00
parent 1379117213
commit 7bf81734d4
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -345,6 +345,7 @@ set(DSView_SOURCES
DSView/pv/utility/encoding.cpp
DSView/pv/utility/path.cpp
DSView/pv/deviceagent.cpp
DSView/pv/ui/langresource.cpp
)
set(DSView_HEADERS

8
DSView/pv/mainwindow.cpp
View File

@@ -663,7 +663,13 @@ namespace pv
else if (info->datatype == SR_T_FLOAT)
_device_agent->set_config(NULL, NULL, info->key, g_variant_new_double(sessionObj[info->name].toDouble()));
else if (info->datatype == SR_T_CHAR)
_device_agent->set_config(NULL, NULL, info->key, g_variant_new_string(sessionObj[info->name].toString().toUtf8()));
{
QString v = sessionObj[info->name].toString();
if (info->key == SR_CONF_OPERATION_MODE){
}
_device_agent->set_config(NULL, NULL, info->key, g_variant_new_string(v.toUtf8()));
}
}
}

2
DSView/pv/prop/binding/deviceoptions.cpp
View File

@@ -79,7 +79,7 @@ DeviceOptions::DeviceOptions()
label_char = info->label_cn;
g_variant_unref(gvar_tmp);
}
const QString label(label_char);
QString label(label_char);
switch(key)
{

2
DSView/pv/ui/langresource.h
View File

@@ -61,7 +61,7 @@ static const struct lang_page_item lange_page_keys[] =
{STR_PAGE_MAIN, "main.json"},
{STR_PAGE_TOOLBAR, "toolbar.json"},
{STR_PAGE_MSG, "msg.json"},
{STR_PAGE_DEVICE, "device.json"},
{STR_PAGE_DSL, "DSL.json"},
};
class LangResource

4
DSView/pv/ui/string_ids.h
View File

@@ -24,8 +24,8 @@
#define STR_PAGE_MAIN 1
#define STR_PAGE_MSG 2
#define STR_PAGE_DEVICE 3
#define STR_PAGE_TOOLBAR 4
#define STR_PAGE_TOOLBAR 3
#define STR_PAGE_DSL 100
#define IDS_TOOLBAR_MODE
#define IDS_TOOLBAR_START

3
libsigrok4DSL/hardware/DSL/dslogic.c
View File

@@ -930,7 +930,8 @@ static int config_set(int id, GVariant *data, struct sr_dev_inst *sdi,
if (sdi->mode != LOGIC) {
dso_init(sdi);
}
} else if (id == SR_CONF_OPERATION_MODE) {
}
else if (id == SR_CONF_OPERATION_MODE) {
stropt = g_variant_get_string(data, NULL);
if (sdi->mode == LOGIC) {
if (!strcmp(stropt, get_opmodes(devc)[OP_BUFFER])) {

7
libsigrok4DSL/libsigrok.h
View File

@@ -1162,12 +1162,7 @@ struct ds_trigger_pos {
uint32_t status;
};
/**
* @file
*
* Header file containing API function prototypes.
*/
/*--- input/input.c ---------------------------------------------------------*/