Commit ceac869e authored by Erwan Jahier's avatar Erwan Jahier

lurette 1.22 Mon, 08 Mar 2004 13:46:15 +0100 by jahier

Parent-Version:      1.21
Version-Log:

Add a couple of scade files in the distrib so that it is easier
to test scade programs under linux using the generated c files.

source/value.ml
   use T and F instead of t and f for booleans (more visible under xlurette).

share/Makefile.lurette.in:
   Reorganize (clean-up) the file

xlurette/xlurette_glade_main.ml:
share/plot:
   Fix the gnuplot problems (+ <<set mouse>> in share/plot).

source/util.ml:
source/lurettetop.ml:
   Move the gnuplot stuff into lurettetop.

Project-Description: Lurette
parent d115d326
This diff is collapsed.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# For updates see: # For updates see:
# http://www.oefai.at/~markus/ocaml_sources # http://www.oefai.at/~markus/ocaml_sources
# #
# $Id: OcamlMakefile 1.51 Fri, 13 Jun 2003 09:05:17 +0200 jahier $ # $Id: OcamlMakefile 1.52 Mon, 08 Mar 2004 13:46:15 +0100 jahier $
# #
########################################################################### ###########################################################################
...@@ -178,7 +178,7 @@ endif ...@@ -178,7 +178,7 @@ endif
export OCAMLDEP export OCAMLDEP
ifndef OCAMLLEX ifndef OCAMLLEX
OCAMLLEX := ocamllex OCAMLLEX := ocamllex.opt
endif endif
export OCAMLLEX export OCAMLLEX
...@@ -190,7 +190,7 @@ endif ...@@ -190,7 +190,7 @@ endif
export OCAMLYACC export OCAMLYACC
ifndef CAMLIDL ifndef CAMLIDL
CAMLIDL := camlidl CAMLIDL := camlidl.opt
endif endif
export CAMLIDL export CAMLIDL
......
...@@ -18,7 +18,7 @@ xlurette: ...@@ -18,7 +18,7 @@ xlurette:
probably your best entry point if you want to test your lustre probably your best entry point if you want to test your lustre
programs. programs.
Cf doc/lurette-tut.ps and/or check the tool-tip displayed when Cf doc/lurette-man.pdf and/or check the tool-tip displayed when
mouse pointing at the different buttons of the GUI. mouse pointing at the different buttons of the GUI.
lurettetop: lurettetop:
...@@ -36,11 +36,11 @@ lutin: ...@@ -36,11 +36,11 @@ lutin:
There are also tools which are used by the ones above that one might There are also tools which are used by the ones above that one might
want to use (you probably need to source the $HOSTTYPE/lucky_init.sh want to use.
or $HOSTTYPE/lucky_init.csh to use them directly).
gen_fake_lucky:
gen_fake_lutin: gen_fake_lutin:
generates a fake lutin file (from C files generated by the generates a fake lucky/lutin file (from C files generated by the
lustre compiler). It is automatically called from xlurette, lustre compiler). It is automatically called from xlurette,
whenever you try to test a program without providing an whenever you try to test a program without providing an
environment for it; hence you should not need to use it directly. environment for it; hence you should not need to use it directly.
...@@ -55,6 +55,15 @@ lucky: ...@@ -55,6 +55,15 @@ lucky:
simulate/executes lutin programs outside xlurette can sometimes simulate/executes lutin programs outside xlurette can sometimes
be convenient. be convenient.
sim2chro:
A timing diagram visualiser (.rif files) by Yann Rémond.
gnuplot-rif:
An sh-script that uses gnuplot to visualise timing diagrams
(.rif files). Requires plot (by M. Sternberg) that is provided.
nb : plot requires gawk (gnu awk) that is not provided.
Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/ Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/
...@@ -89,5 +98,5 @@ Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/ ...@@ -89,5 +98,5 @@ Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/
o Cudd, a BDD library by the University of Colorado o Cudd, a BDD library by the University of Colorado
o polka, cuddaux and mlcuddidl by B. Jeannet, IRISA o polka, cuddaux and mlcuddidl by B. Jeannet, IRISA
o sim2chro by Y. Rémond - Verimag o sim2chro by Y. Rémond - Verimag
o autoconf, make, emacs, latex, dot, gtk, gnuplot, plot... o autoconf, make, emacs, latex, dot, gtk, gnuplot...
o plot, by Michael Sternberg (requires gnu-awk)
****** A faire vite *******
* inclure la libc en statique
? Les alias doivent ils etre dans le .rif ??
* Rajouter le step mode dans lurettetop et xlurette sed 's/[ ^t]*$//' file
ie, il faut rajouter dans lurette une option --step-inside --step-edges
--step-vertices (et renommer --draw-inside par --try-inside ??)
+ Rajouter dans lurettetop les options qui permette d'acceder au step mode
(ie, le mode du tirage pour faire un step)
*********** BUGS *********** BUGS
* le parseur est trop lent sur les exemples generes par nbac
* Bug dans le repertoire HS si dans Makefile.lurette on
positionne CFLAGS à -Oi pour i >= 1. Le bug ne se produit
que sur les machines linux possedant gcc 3.
* meme avec x < 20000, il prend en compte la valeur max par defaut (10000)
(via ~max, ca marche en revanche)
* le parseur est trop lent (cf les exemples generes par nbac).
...@@ -32,13 +34,61 @@ et je ne suis plus oblig ...@@ -32,13 +34,61 @@ et je ne suis plus oblig
*********** A faire *********** A faire
* parse_lucky.ml:
XXX parse_lustre_expression : attention au tilde (virer le hack et ragarder ce que ca change)
+ verifier que 2 vars ne sont définies 2 fois dans le meme fichiers
* Ajouter la possibilité de pouvoir rejouer un séquence et de la continuer
(? redondant avec la graine ?)
* Faire de la pub dans les forum et autres mailing list !
* inclure la libc en statique (comme pascal)
ou mettre tous les .so dans un repertoire (comme matlab) ???
* Mettre Les alias doivent ils etre dans le .rif au meme titre
que les autres variables locales
* plot a besion de gnu-awk ... Je devrais ecrire moi-meme
le programme qui genere le bon format pour gnuplot...
* sim2chro
- le recompiler en statique avec gcc3 et sous solaris
(pour ce faire recompiler librif.a).
* Finir le ocaml-lutin (.mluc)
* Faire une section <<Testing programs that are not lustre or scade programs>>
-> faire un autre mode d'interfacage : le mode stdin/stdout, qui fonctionnerait
grosso-modo ainsi :
<sut write on stout>
var1 (input|output) (bool|int|float)
....
varn (input|output) (bool|int|float)
#go
<sut reads on stdin>
val_1 ... val_ki
-> <stdout> : out_1 ... out_ko
or
#restore
or
#end
* Mettre des iterateurs de tableaux * Mettre des iterateurs de tableaux
-> nécessite d'avoir une notion de noeud ou de fonction dans lucky
* Rajouter les fonctions, et notamment les fonctions externes
-> comment faire depuis un tel interpreteur ????
* reporter le contenu de la nouvelle section de d1.1-v2 dans les entetes de modules * reporter le contenu de la nouvelle section de d1.1-v2 dans les entetes de modules
* autoriser plusieurs automates dans le meme fichier * autoriser plusieurs automates dans le meme fichier
* rajouter une option --reactive ou lucky rend ses valeurs precedentes * rajouter une option --reactive dans lucky où il rend ses valeurs precedentes
si aucune formule n'est satisfiable (ainsi que --reactive-no-warning) si aucune formule n'est satisfiable (ainsi que --reactive-no-warning)
* il faudrait au moins pouvoir avoir des pre sur des var de types structurés * il faudrait au moins pouvoir avoir des pre sur des var de types structurés
......
...@@ -43,7 +43,8 @@ ICFLAGS = \ ...@@ -43,7 +43,8 @@ ICFLAGS = \
# #
# i386-linux # i386-linux
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD # XCFLAGS = -DHAVE_IEEE_754 -DBSD # -mcpu=pentiumpro -malign-double
XCFLAGS = -mcpu=i386 -DHAVE_IEEE_754 -DBSD
# sparc-sun # sparc-sun
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 # XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
......
...@@ -23,10 +23,10 @@ xlurette_exe: dummy ...@@ -23,10 +23,10 @@ xlurette_exe: dummy
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \ | sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \ | sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml > xlurette_glade_interface.ml
ocamlc.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml ocamlc.opt -c -I +lablgtk -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_interface.ml
ocamlc.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml ocamlc.opt -c -I +lablgtk -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_callbacks.ml
ocamlc.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml ocamlc.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib -c xlurette_glade_main.ml
ocamlc.opt $(THREAD) \ ocamlc.opt $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib \
-I +lablgtk -I +str -o xlurette_exe$(EXE) str.cma unix.cma lablgtk.cma gtkInit.cmo \ -I +lablgtk -I +str -o xlurette_exe$(EXE) str.cma unix.cma lablgtk.cma gtkInit.cmo \
xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo xlurette_glade_main.cmo xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo xlurette_glade_main.cmo
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
<class>GtkNotebook</class> <class>GtkNotebook</class>
<name>notebook1</name> <name>notebook1</name>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<accelerator>
<modifiers>GDK_CONTROL_MASK</modifiers>
<key>GDK_Tab</key>
<signal>switch_page</signal>
</accelerator>
<show_tabs>True</show_tabs> <show_tabs>True</show_tabs>
<show_border>True</show_border> <show_border>True</show_border>
<tab_pos>GTK_POS_TOP</tab_pos> <tab_pos>GTK_POS_TOP</tab_pos>
...@@ -1078,7 +1073,12 @@ scade ...@@ -1078,7 +1073,12 @@ scade
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>button125</name> <name>button125</name>
<border_width>4</border_width> <border_width>4</border_width>
<tooltip>Call sim2chro with the selected file</tooltip> <tooltip>Call sim2chro with the selected file (c)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_c</key>
<signal>clicked</signal>
</accelerator>
<signal> <signal>
<name>clicked</name> <name>clicked</name>
<handler>tdm_sim2chro</handler> <handler>tdm_sim2chro</handler>
...@@ -1095,7 +1095,12 @@ scade ...@@ -1095,7 +1095,12 @@ scade
<border_width>4</border_width> <border_width>4</border_width>
<width>150</width> <width>150</width>
<height>100</height> <height>100</height>
<tooltip>Call gnuplot with the selected file (3.7 or higher)</tooltip> <tooltip>Call gnuplot with the selected file (g)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_g</key>
<signal>clicked</signal>
</accelerator>
<signal> <signal>
<name>clicked</name> <name>clicked</name>
<handler>tdm_gnuplot</handler> <handler>tdm_gnuplot</handler>
...@@ -1125,7 +1130,12 @@ scade ...@@ -1125,7 +1130,12 @@ scade
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>button128</name> <name>button128</name>
<border_width>4</border_width> <border_width>4</border_width>
<tooltip> Edit the file -- via the $EDITOR shell variable</tooltip> <tooltip> Edit the file -- via the $EDITOR shell variable (e)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_e</key>
<signal>clicked</signal>
</accelerator>
<signal> <signal>
<name>clicked</name> <name>clicked</name>
<handler>tdm_edit</handler> <handler>tdm_edit</handler>
...@@ -1140,7 +1150,12 @@ scade ...@@ -1140,7 +1150,12 @@ scade
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>button129</name> <name>button129</name>
<border_width>4</border_width> <border_width>4</border_width>
<tooltip>Delete the selected file</tooltip> <tooltip>Delete the selected file (d)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_d</key>
<signal>clicked</signal>
</accelerator>
<signal> <signal>
<name>clicked</name> <name>clicked</name>
<handler>tdm_delete</handler> <handler>tdm_delete</handler>
...@@ -1239,7 +1254,7 @@ scade ...@@ -1239,7 +1254,7 @@ scade
<class>GtkLabel</class> <class>GtkLabel</class>
<child_name>Notebook:tab</child_name> <child_name>Notebook:tab</child_name>
<name>timing_diagram_label</name> <name>timing_diagram_label</name>
<label> Timing Diagrams Manager </label> <label> Timing diagrams manager </label>
<justify>GTK_JUSTIFY_LEFT</justify> <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0.5</xalign> <xalign>0.5</xalign>
...@@ -1299,7 +1314,7 @@ scade ...@@ -1299,7 +1314,7 @@ scade
<name>fileselection_oracle</name> <name>fileselection_oracle</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Select File</title> <title>Select File</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position> <position>GTK_WIN_POS_MOUSE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -1343,7 +1358,7 @@ scade ...@@ -1343,7 +1358,7 @@ scade
<name>fileselection_env</name> <name>fileselection_env</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Select a new environement file</title> <title>Select a new environement file</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position> <position>GTK_WIN_POS_MOUSE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -1386,7 +1401,7 @@ scade ...@@ -1386,7 +1401,7 @@ scade
<class>GtkWindow</class> <class>GtkWindow</class>
<name>step_by_step_window</name> <name>step_by_step_window</name>
<title>Step by step...</title> <title>Step by step...</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position> <position>GTK_WIN_POS_MOUSE</position>
<modal>False</modal> <modal>False</modal>
<default_width>200</default_width> <default_width>200</default_width>
...@@ -1817,7 +1832,7 @@ Setting such an oracle is not mandatory however.</label> ...@@ -1817,7 +1832,7 @@ Setting such an oracle is not mandatory however.</label>
<class>GtkWindow</class> <class>GtkWindow</class>
<name>quit_window</name> <name>quit_window</name>
<title>Quit xlurette -- save parameters </title> <title>Quit xlurette -- save parameters </title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -1931,7 +1946,7 @@ Do you really want to quit xlurette? ...@@ -1931,7 +1946,7 @@ Do you really want to quit xlurette?
<name>extra_env_var_window</name> <name>extra_env_var_window</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Setting environment variables</title> <title>Setting environment variables</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2418,7 +2433,7 @@ Do you really want to quit xlurette? ...@@ -2418,7 +2433,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_cfiles</name> <name>fileselection_extra_cfiles</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Select extra C File</title> <title>Select extra C File</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2462,7 +2477,7 @@ Do you really want to quit xlurette? ...@@ -2462,7 +2477,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_libs</name> <name>fileselection_extra_libs</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Select external lib (.a)</title> <title>Select external lib (.a)</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2506,7 +2521,7 @@ Do you really want to quit xlurette? ...@@ -2506,7 +2521,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_libdirs</name> <name>fileselection_extra_libdirs</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Select a directory to search librairies in</title> <title>Select a directory to search librairies in</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2550,7 +2565,7 @@ Do you really want to quit xlurette? ...@@ -2550,7 +2565,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_includedirs</name> <name>fileselection_extra_includedirs</name>
<border_width>10</border_width> <border_width>10</border_width>
<title>Select a directory to search header files in</title> <title>Select a directory to search header files in</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2593,7 +2608,7 @@ Do you really want to quit xlurette? ...@@ -2593,7 +2608,7 @@ Do you really want to quit xlurette?
<class>GtkWindow</class> <class>GtkWindow</class>
<name>test_thickness_help_window</name> <name>test_thickness_help_window</name>
<title>Help about Test Thickness parameters</title> <title>Help about Test Thickness parameters</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2704,8 +2719,9 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV) ...@@ -2704,8 +2719,9 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<widget> <widget>
<class>GtkWindow</class> <class>GtkWindow</class>
<name>set_parameters_window</name> <name>set_parameters_window</name>
<border_width>3</border_width>
<title> Setting parameters </title> <title> Setting parameters </title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
...@@ -2924,7 +2940,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV) ...@@ -2924,7 +2940,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<tooltip>Try one formula</tooltip> <tooltip>Try one formula</tooltip>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<label>One </label> <label>One </label>
<active>False</active> <active>True</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<child> <child>
<padding>0</padding> <padding>0</padding>
...@@ -2939,7 +2955,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV) ...@@ -2939,7 +2955,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<tooltip>Try all the formula (reachable from the current state) </tooltip> <tooltip>Try all the formula (reachable from the current state) </tooltip>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<label>All</label> <label>All</label>
<active>True</active> <active>False</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<group>radiobutton_draw_one_formula</group> <group>radiobutton_draw_one_formula</group>
<child> <child>
...@@ -3082,7 +3098,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV) ...@@ -3082,7 +3098,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<update_policy>GTK_UPDATE_ALWAYS</update_policy> <update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap> <snap>False</snap>
<wrap>False</wrap> <wrap>False</wrap>
<value>10</value> <value>0</value>
<lower>0</lower> <lower>0</lower>
<upper>100000</upper> <upper>100000</upper>
<step>1</step> <step>1</step>
...@@ -3155,7 +3171,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV) ...@@ -3155,7 +3171,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<update_policy>GTK_UPDATE_ALWAYS</update_policy> <update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap> <snap>False</snap>
<wrap>False</wrap> <wrap>False</wrap>
<value>10</value> <value>0</value>
<lower>0</lower> <lower>0</lower>
<upper>100000</upper> <upper>100000</upper>
<step>1</step> <step>1</step>
...@@ -3954,6 +3970,11 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV) ...@@ -3954,6 +3970,11 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<name>close_parameters_window</name> <name>close_parameters_window</name>
<border_width>4</border_width> <border_width>4</border_width>
<tooltip> close this window </tooltip> <tooltip> close this window </tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_q</key>
<signal>clicked</signal>
</accelerator>
<signal> <signal>
<name>clicked</name> <name>clicked</name>
<handler>on_close_parameters_window_clicked</handler> <handler>on_close_parameters_window_clicked</handler>
......
...@@ -26,14 +26,6 @@ let notebook1 = GPack.notebook ...@@ -26,14 +26,6 @@ let notebook1 = GPack.notebook
() ()
in in
let _ = GtkBase.Widget.set_can_focus notebook1#as_widget true in let _ = GtkBase.Widget.set_can_focus notebook1#as_widget true in
let _ = notebook1#misc#add_accelerator
~group:accel_group
GdkKeysyms._Tab
~sgn:{ GtkSignal.name = "switch_page";
GtkSignal.marshaller = GtkSignal.marshal_unit ;
GtkSignal.classe = `base }
~modi:[`CONTROL;]
in
let vbox26 = GPack.vbox let vbox26 = GPack.vbox
~spacing:0 ~spacing:0
~homogeneous:false ~homogeneous:false
...@@ -708,13 +700,29 @@ let button125 = toolbar31#insert_button ...@@ -708,13 +700,29 @@ let button125 = toolbar31#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "chrono.xpm") ()) ())#coerce ~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "chrono.xpm") ()) ())#coerce
() ()
in in
let _ = tooltips#set_tip ~text:"Call sim2chro with the selected file" button125#coerce in let _ = tooltips#set_tip ~text:"Call sim2chro with the selected file (c)" button125#coerce in
let _ = button125#misc#add_accelerator
~group:accel_group
GdkKeysyms._c
~sgn:{ GtkSignal.name = "clicked";
GtkSignal.marshaller = GtkSignal.marshal_unit ;
GtkSignal.classe = `base }
~modi:[]
in
let button126 = toolbar31#insert_button let button126 = toolbar31#insert_button
~text: " " ~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "gnuplot-rif.xpm") ()) ())#coerce ~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "gnuplot-rif.xpm") ()) ())#coerce
() ()
in in
let _ = tooltips#set_tip ~text:"Call gnuplot with the selected file (3.7 or higher)" button126#coerce in let _ = tooltips#set_tip ~text:"Call gnuplot with the selected file (g)" button126#coerce in
let _ = button126#misc#add_accelerator
~group:accel_group
GdkKeysyms._g
~sgn:{ GtkSignal.name = "clicked";
GtkSignal.marshaller = GtkSignal.marshal_unit ;
GtkSignal.classe = `base }
~modi:[]
in
let button127 = toolbar31#insert_button let button127 = toolbar31#insert_button
~text: "postscript " ~text: "postscript "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "gnuplot-rif.xpm") ()) ())#coerce ~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "gnuplot-rif.xpm") ()) ())#coerce
...@@ -726,13 +734,29 @@ let button128 = toolbar31#insert_button ...@@ -726,13 +734,29 @@ let button128 = toolbar31#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "open.xpm") ()) ())#coerce ~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "open.xpm") ()) ())#coerce
() ()
in in
let _ = tooltips#set_tip ~text:" Edit the file -- via the $EDITOR shell variable" button128#coerce in let _ = tooltips#set_tip ~text:" Edit the file -- via the $EDITOR shell variable (e)" button128#coerce in
let _ = button128#misc#add_accelerator
~group:accel_group
GdkKeysyms._e
~sgn:{ GtkSignal.name = "clicked";
GtkSignal.marshaller = GtkSignal.marshal_unit ;
GtkSignal.classe = `base }
~modi:[]
in
let button129 = toolbar31#insert_button