Commit 8deeb86f authored by Matheus Müller's avatar Matheus Müller
Browse files

Renomeados os programas e atualizado o arquivo de Licença

parent 355465ce
############################ LICENÇA #################################
######################### LICENÇA ##############################
O software XXX é composto de mais de um programa, escritos em C e Python.
O software Estação de Espectrometria é composto de mais de um
programa, escritos em C e Python.
######################################################################
################################################################
#### YYY ####
O programa YYY é baseado no N957Demo disponibilizado pela CAEN no site ....
Os termos desta licença estão contidos no arquivo LICENCE.CAEN
#### N957Run ####
O programa N957Run é baseado no N957Demo disponibilizado pela CAEN
em seu site. Os termos desta licença estão contidos no arquivo
LICENCE.CAEN
#### ZZZZ ####
O programa ZZZ é licenciado pela Licença Pública do GNU versão 3 (GNU GPL v3)
Os termos da GNU GPL v.3 estão contidos no arquivo GPLV3.txt
#### Estação de Espectrometria ####
As demais partes do programa Estação de Espectrometria do
Laboratório de Implantação Iônica do Instituto de Física da UFRGS
é licenciado pela Licença Pública do GNU versão 3 (GNU GPL v3).
Os termos da GNU GPL v.3 estão contidos no arquivo gplv3.txt
......@@ -10,7 +10,7 @@
#
########################################################################
EXE = N957Demo
EXE = N957Run
CC = gcc
......
# ****************************************************************
# N957Demo Configuration File
# N957Run Configuration File
# ****************************************************************
# Lines starting with # (first column) are comments
......
Tarefas Estação de Espectrometria
- Renomear programas
- Implementar atualização em tempo real do espectro no programa em Python
- Salvar e abrir arquivo com espectro
- Escolher Regiões de interesse para integração
COMPLETAS
- Editar arquivo de licença: Licença CAEN para software em C e GPL para parte em python
- Renomear programas
......@@ -129,7 +129,7 @@ int main(int argc, char **argv)
// print header
printf( "\n");
printf( "-------------------------------------------------------\n");
printf( "- N 9 5 7 D E M O -\n");
printf( "- N 9 5 7 R U N -\n");
printf( "- -\n");
printf( "- www.caen.it rev.02.03 -\n");
printf( "-------------------------------------------------------\n");
......
......@@ -16,7 +16,7 @@ os.system('sh V0.6/n957_load.2.6')
# Subprocess variable
subp = subprocess.Popen('./N957Demo', shell=True, stdin=PIPE)#, stdout=PIPE)
subp = subprocess.Popen('./N957Run', shell=True, stdin=PIPE)#, stdout=PIPE)
TempData = list()
Data=list()
......@@ -96,7 +96,7 @@ def pause():
def restart():
global subp
subp.terminate()
subp = subprocess.Popen('./N957Demo', shell=True, stdin=PIPE)
subp = subprocess.Popen('./N957Run', shell=True, stdin=PIPE)
##############################################################################
##############################################################################
......
......@@ -22,7 +22,7 @@
////////////////////////////////////////////
#define DEF_LOG_FILENAME "data.log" /* read board values default filename */
#define DEF_CONFIG_FILENAME "N957Demo.conf" /* configuration default filename */
#define DEF_CONFIG_FILENAME "N957Run.conf" /* configuration default filename */
#define DEF_GNU_PLOT_PATH "../gnuplot/" /* GNUPLOT default path */
......@@ -144,15 +144,15 @@ BOOL user_settings_parse_input_param( user_setting_data* p_data, int argc, char*
{
// show help screen
TRACE ( "\n");
TRACE ( "N957 usage: N957Demo {params_list}\n");
TRACE ( "N957 usage: N957Run {params_list}\n");
TRACE ( "params_list:\n");
TRACE ( "-ffilename | -Ffilename\n");
TRACE1( " filename= configuration filename. If not specified '%s' will be assumed.\n", DEF_CONFIG_FILENAME);
TRACE ( " example: N957Demo -f\"N957Demo.conf\"\n");
TRACE ( " N957Demo -FN957Demo.conf\n");
TRACE ( " example: N957Run -f\"N957Run.conf\"\n");
TRACE ( " N957Run -FN957Run.conf\n");
TRACE ( "-h | -H\n");
TRACE ( " Show this help screen\n");
TRACE ( " example: N957Demo -h\n");
TRACE ( " example: N957Run -h\n");
TRACE ( "\n");
TRACE ( "Hit a key to continue ... \n");
while( !kbhit());
......
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