Commit 2717d2df authored by implantador1's avatar implantador1
Browse files

2 Módulos funcionando(foram adaptadas todas as funções)

Roi, aquisição, zoom, gráficas, adicionado alguns frames,arrumado bug
do autoscale, timer.
parent d3bcae7a
...@@ -5,9 +5,8 @@ ...@@ -5,9 +5,8 @@
# #
# The board number # The board number
BOARD_NUM 0 BOARD_NUM 1
#
# path to the executable file of gnuplot # path to the executable file of gnuplot
GNUPLOT_PATH "" GNUPLOT_PATH ""
...@@ -17,7 +16,7 @@ LOG_TO_FILE 1 ...@@ -17,7 +16,7 @@ LOG_TO_FILE 1
# #
# Readout data Output Filename ( meaningful only for LOG_TO_FILE!= 0) # Readout data Output Filename ( meaningful only for LOG_TO_FILE!= 0)
LOG_FILENAME "data.log" #LOG_FILENAME "data.log"
# #
# Maximum number of samples to acquire (-1 means no limit) # Maximum number of samples to acquire (-1 means no limit)
...@@ -41,9 +40,17 @@ LLD_THR_VAL 30 ...@@ -41,9 +40,17 @@ LLD_THR_VAL 30
# #
# Gnu plot refresh rate (msec) # Gnu plot refresh rate (msec)
GNU_PLOT_REFRESH 2000 #GNU_PLOT_REFRESH 2000
# #
# Gnu plot X scale factor # Gnu plot X scale factor
GNU_PLOT_X_SCALE 0.3 #GNU_PLOT_X_SCALE 0.3
This diff is collapsed.
...@@ -58,22 +58,11 @@ BOOL user_settings_open( user_setting_data* p_data) ...@@ -58,22 +58,11 @@ BOOL user_settings_open( user_setting_data* p_data)
// module variable init // module variable init
p_data->m_log_filename= (char*)malloc( MAX_FILENAME_LENGHT); p_data->m_log_filename= (char*)malloc( MAX_FILENAME_LENGHT);
p_data->m_config_filename= (char*)malloc( MAX_FILENAME_LENGHT); p_data->m_config_filename= (char*)malloc( MAX_FILENAME_LENGHT);
// gnuplot path
// JULIO p_data->m_gnu_plot_path= (char*)malloc( MAX_FILENAME_LENGHT);;
// setting default values ...
/*JULIOif( p_data->m_log_filename== NULL)
TRACE("ME11:user setting module: insufficient memory!\n");
else
strcpy( p_data->m_log_filename, DEF_LOG_FILENAME);*/
if( p_data->m_config_filename== NULL) if( p_data->m_config_filename== NULL)
TRACE("ME12:user setting module: insufficient memory !\n"); TRACE("ME12:user setting module: insufficient memory !\n");
else else
strcpy( p_data->m_config_filename, DEF_CONFIG_FILENAME); strcpy( p_data->m_config_filename, DEF_CONFIG_FILENAME);
// JULIO if( p_data->m_gnu_plot_path== NULL)
// JULIO TRACE("ME13user setting module: insufficient memory !\n");
// JULIO else
// JULIO strcpy( p_data->m_gnu_plot_path, DEF_GNU_PLOT_PATH);
p_data->m_max_num_samples= DEF_MAX_NUM_SAMPLES; p_data->m_max_num_samples= DEF_MAX_NUM_SAMPLES;
p_data->m_debug= N957_FALSE; p_data->m_debug= N957_FALSE;
...@@ -82,8 +71,7 @@ BOOL user_settings_open( user_setting_data* p_data) ...@@ -82,8 +71,7 @@ BOOL user_settings_open( user_setting_data* p_data)
p_data->m_N957_handle= N957_INVALID_HANDLE_VALUE; p_data->m_N957_handle= N957_INVALID_HANDLE_VALUE;
p_data->m_log_to_file= N957_FALSE; p_data->m_log_to_file= N957_FALSE;
p_data->m_bd_num= 0; p_data->m_bd_num= 0;
// JULIO p_data->m_gnu_plot_refresh= DEF_GNU_PLOT_REFRESH;
// JULIO p_data->m_gnu_plot_x_scale= DEF_GNU_PLOT_X_SCALE;
return TRUE; return TRUE;
} }
...@@ -199,27 +187,7 @@ BOOL parse_config_file( user_setting_data* p_data) { ...@@ -199,27 +187,7 @@ BOOL parse_config_file( user_setting_data* p_data) {
} }
continue; continue;
} }
// GNUplot path
//JULIOif (strstr(str, "GNUPLOT_PATH")!=NULL) {
//fscanf( p_conf_file, "%s", p_data->m_gnu_plot_path);
//JULIO fscanf( p_conf_file, "%s", tmp_filename);
//JULIO strcpy( p_data->m_gnu_plot_path, trim( trim_text_charset, sizeof( trim_text_charset), tmp_filename));
//JULIO continue;
//JULIO }
// Write Data to output file
//JULIO if (strstr(str, "LOG_TO_FILE")!=NULL){
//JULIO int tmp= 0;
//JULIO fscanf(p_conf_file, "%d", &tmp);
//JULIO p_data->m_log_to_file= tmp!= 0;
//JULIO continue;
//JULIO}
// log filename
//JULIOif (strstr(str, "LOG_FILENAME")!=NULL){
//JULIO //fscanf( p_conf_file, "%s", p_data->m_log_filename);
//JULIO fscanf( p_conf_file, "%s", tmp_filename);
//JULIO strcpy( p_data->m_log_filename, trim( trim_text_charset, sizeof( trim_text_charset), tmp_filename));
//JULIO continue;
// JULIO }
// Number of samples to acquire // Number of samples to acquire
if (strstr(str, "MAX_NUM_SAMPLES")!=NULL) { if (strstr(str, "MAX_NUM_SAMPLES")!=NULL) {
fscanf(p_conf_file, "%ld", &p_data->m_max_num_samples); fscanf(p_conf_file, "%ld", &p_data->m_max_num_samples);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment