diff --git a/doc/codegeneration/Makefile b/doc/codegeneration/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..afe101a2023f4093e1e8bc421fbba446c4915df9
--- /dev/null
+++ b/doc/codegeneration/Makefile
@@ -0,0 +1,86 @@
+# Tools
+LATEXFLAGS ?= -interaction=nonstopmode -file-line-error
+PDFLATEX = pdflatex $(LATEXFLAGS)
+BIBTEX = bibtex
+FIG2DEV = fig2dev
+RUBBER ?= $(shell which rubber 2> /dev/null)
+RUBBERFLAGS = --pdf --short --warn refs --warn misc
+
+# Files and directories
+FIGDIR = figures
+FIGS = $(wildcard $(FIGDIR)/*.fig)
+FIGPDFS = $(patsubst $(FIGDIR)/%.fig,$(FIGDIR)/%.pdf,$(FIGURES))
+FIGPDFTS = $(patsubst $(FIGDIR)/%.fig,$(FIGDIR)/%.pdf_t,$(FIGURES))
+FIGURES = $(filter-out $(FIGS) $(FIGPDFS) $(FIGPDFTS), $(wildcard $(FIGDIR)/*))
+
+JOB = lettreBenjaminRanft
+TEXS = $(wildcard *.tex) $(wildcard *.sty) $(wildcard *.cls)
+PICS = $(wildcard *.png) $(filter-out $(JOB).pdf,$(wildcard *.pdf))
+BIBS = $(wildcard *.bib) $(wildcard *.bst)
+
+TOPS = $(shell grep -l '[^%]*\\begin{document}' *.tex)
+PDFTARGETS = $(patsubst %.tex,%.pdf,$(TOPS))
+TARGETS = $(patsubst %.tex,%,$(TOPS))
+
+.DEFAULT: help
+.PHONY: all help clean ultraclean
+
+help:
+ @echo '----------------------------------------------------------------'; \
+ echo 'available targets:'; \
+ echo ' "make" or "make help": print this help'; \
+ echo ' "make foo" or "make foo.pdf": build the foo.pdf document'; \
+ echo ' "make all": build all documents'; \
+ echo ' "make clean": delete non-essential generated files'; \
+ echo ' "make ultraclean": delete all generated files'; \
+ echo '----------------------------------------------------------------'; \
+ echo 'Buildable documents:'; \
+ echo -n $(sort $(TARGETS)) | sed -e 's/\([^ ]\+\) */ \1\n/g'; \
+ echo '----------------------------------------------------------------'; \
+ echo 'if you encounter problems please contact:'; \
+ echo ' Renaud Pacalet <renaud.pacalet@telecom-paristech.fr>'; \
+ echo '----------------------------------------------------------------'
+
+all: $(PDFTARGETS)
+$(TARGETS): % : %.pdf
+
+ifeq ($(RUBBER),)
+
+# Bootstrap aux file, then keep running pdflatex until it reaches a fixpoint
+
+$(JOB).aux: | $(TEXS) $(PICS)
+ $(PDFLATEX) $(JOB)
+
+$(JOB).bbl: $(JOB).aux $(BIBS)
+ $(BIBTEX) $(JOB)
+
+$(JOB).pdf: $(TEXS) $(PICS) $(JOB).aux $(JOB).bbl
+ @cp -p $(JOB).aux $(JOB).aux.bak
+ $(PDFLATEX) $(JOB)
+ @if cmp -s $(JOB).aux $(JOB).aux.bak; \
+ then touch -r $(JOB).aux.bak $(JOB).aux; \
+ else NEWS="$$NEWS -W $(JOB).aux"; fi; rm $(JOB).aux.bak; \
+ if [ -n "$$NEWS" ]; then $(MAKE) $$NEWS $@; fi
+
+$(FIGDIR)/%.pdf: $(FIGDIR)/%.fig
+ $(FIG2DEV) -L pdftex $< $@
+
+$(FIGDIR)/%.pdf_t: $(FIGDIR)/%.fig $(FIGDIR)/%.pdf
+ $(FIG2DEV) -L pdftex_t -p $(patsubst %.pdf_t,%.pdf,$@) $< $@
+
+clean:
+ rm -f $(JOB).aux $(JOB).log $(JOB).blg $(JOB).bbl $(JOB).out $(JOB).pdf
+
+else
+
+.NOTPARALLEL:
+
+.PHONY: $(PDFTARGETS)
+
+$(PDFTARGETS): %.pdf: %.tex
+ @$(RUBBER) $(RUBBERFLAGS) $<
+
+clean:
+ @$(RUBBER) $(RUBBERFLAGS) --clean $(TOPS)
+
+endif
diff --git a/doc/codegeneration/codegeneration_documentation.tex b/doc/codegeneration/codegeneration_documentation.tex
new file mode 100644
index 0000000000000000000000000000000000000000..a8a34b629133fe618b68cfaa45981bf1a6241cdb
--- /dev/null
+++ b/doc/codegeneration/codegeneration_documentation.tex
@@ -0,0 +1,183 @@
+\documentclass[12pt]{article}
+\usepackage{amsmath}
+\usepackage{latexsym}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+\usepackage{graphicx}
+\usepackage{txfonts}
+\usepackage{wasysym}
+\usepackage{adjustbox}
+\usepackage{ragged2e}
+\usepackage{tabularx}
+\usepackage{hhline}
+\usepackage{float}
+\usepackage{multirow}
+\usepackage{makecell}
+\usepackage{fancyhdr}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[a4paper,bindingoffset=0.2in,headsep=0.5cm,left=1in,right=1in,bottom=3cm,top=2cm,headheight=2cm]{geometry}
+\usepackage{hyperref}
+\usepackage{listings}
+
+\everymath{\displaystyle}
+\pagestyle{fancy}
+\fancyhf{}
+\rfoot{Page \thepage}
+\begin{document}
+\sloppy
+
+\begin{center}
+\Large Telecom ParisTech \\
+\Large TTool \\
+\Large \url{ttool.telecom-paristech.fr}
+\vspace{20 pt}\\
+\underline{\Large Code generation from Avatar Design Diagrams in TTool}
+\vspace{30 pt}
+\end{center}
+
+\begin{table}[H]
+\large
+\centering
+\begin{adjustbox}{width=\textwidth}
+\begin{tabular}{ |p{1.6cm}|p{6.0cm}|p{4.2cm}|p{4.2cm}| }
+\hhline{----}
+ & \textbf{Document Manager} & \textbf{Contributors} & \textbf{Checked by} \\
+\hhline{----}
+\textbf{Name} & Ludovic APVRILLE & \multirow{2}{*}{Ludovic APVRILLE} &
+\multirow{2}{*}{Ludovic APVRILLE} \\
+\hhline{--~~}
+\textbf{Contact} & ludovic.apvrille@telecom-paristech.fr & & \\
+\hhline{--~~}
+\textbf{Date} & \today & & \\
+\hline
+\end{tabular}
+\end{adjustbox}
+\end{table}
+
+\newpage
+\tableofcontents
+
+% \newpage
+% \listoffigures
+
+\newpage
+\section{Preface}
+
+\subsection{Table of Versions}
+
+\begin{table}[H]
+\large
+\centering
+\begin{adjustbox}{width=\textwidth}
+\begin{tabular}{ |p{1.5cm}|p{2.5cm}|p{9.0cm}|p{3.0cm}| }
+\hhline{----}
+\textbf{Version} & \textbf{Date} & \textbf{Description $ \& $ Rationale of
+Modifications} & \textbf{Sections Modified} \\
+\hhline{----}
+1.0 & 13/06/2017 & First draft & \\
+\hline
+\end{tabular}
+\end{adjustbox}
+\end{table}
+
+\subsection{Table of References and Applicable Documents}
+
+\begin{table}[H]
+\large
+\centering
+\begin{adjustbox}{width=\textwidth}
+\begin{tabular}{ |p{2.66in}|p{2.66in}|p{0.95in}|p{0.43in}| }
+\hhline{----}
+\textbf{Reference} & \textbf{Title $ \& $ Edition} & \textbf{Author or
+Editor} & \textbf{Year}
+\\
+\hhline{----}
+ & & & \\
+\hline
+\end{tabular}
+\end{adjustbox}
+\end{table}
+
+\subsection{Acronyms and glossary}
+
+\begin{table}[H]
+\large
+\centering
+\begin{adjustbox}{width=\textwidth}
+\begin{tabular}{ |p{1.24in}|p{5.45in}| }
+\hhline{--}
+\textbf{Term} & \textbf{Description} \\
+\hhline{--}
+ & \\
+\hline
+\end{tabular}
+\end{adjustbox}
+\end{table}
+
+\subsection{Summary}
+
+This document describes the code generation principle for AVATAR design diagrams implemented in TTool. It describes how to configure TTool for generating code, how to generate the code, how to compile it, how to execute it.
+Finally, the document explains how to have the generated code to connect with an external graphical interface.
+
+\section{Configuration}
+\subsection{TTool configuration}
+\label{sec:conf}
+At first, if not already configured\footnote{TTool should be provided with the configuration already done}, you must open the configuration file of TTool. The default file is located in:
+\begin{verbatim}
+TTool/bin/config.xml
+\end{verbatim}
+Open your configuration file, and set the following lines accordingly with your TTool installation:
+\begin{itemize}
+\item Main directory in which the generated code and the avatar runtime library are located:
+\begin{verbatim}
+<AVATARExecutableCodeDirectory data="../executablecode/" />
+\end{verbatim}
+\item Host to connect to perform the code compilation and execution. Default value is "localhost".
+\begin{verbatim}
+<AVATARExecutableCodeHost data="localhost"/>
+\end{verbatim}
+\item Compilation command to compile the generated code:
+\begin{verbatim}
+<AVATARExecutableCodeCompileCommand data="make -C ../executablecode/" />
+\end{verbatim}
+\item Execution command. This will start the application generated from your model:
+\begin{verbatim}
+<AVATARExecutableCodeExecuteCommand data="../executablecode/run.x" />
+\end{verbatim}
+\end{itemize}
+
+\subsection{External tools}
+The previous configuration assumes that a \textbf{c compiler}, referenced by the provided Makefile (default = "gcc") is installed on your machine, as well as the \textbf{POSIX-1 librairies}. Also, a Mafile utility must be installed (e.g., "gnu make").
+
+\section{A first example}
+This very first example explains how to generate the code from an AVATAR design model, and how to introduce your own basic C directive in the code generation process.
+
+\section{Getting the example}
+Be sure to get the latest version of TTool including the remote loading of models (June 2017 and after). Do: File, Open from TTool repository, and select "HelloWorldCodeGeneration.xml".
+
+\section{Understanding the model}
+This models contains a design diagram composed of one MainBlock. This later regularly executes the "printHelloWorld" method (see Figure \ref{fig:printhelloworld}).
+
+
+\begin{figure*}[htbp]
+\centering
+\includegraphics[scale=0.65]{figures/bdhelloworld.pdf}
+\hspace{1cm}
+\includegraphics[scale=0.65]{figures/smdhelloworld.pdf}
+\caption{Hello world model} \label{fig:printhelloworld}
+\end{figure*}
+
+You may then check the syntax of the diagram, and select the "interactive simulation icon". From the window that opens, make a step by step simulation, and observe the behaviour of the system. This behaviour is simulated, that is, there is no executable code that is generated to execute the system.
+
+\section{Generating executable code}
+To generate executable code,
+
+
+
+
+
+
+
+
+\end{document}
diff --git a/doc/codegeneration/figures/bdhelloworld.pdf b/doc/codegeneration/figures/bdhelloworld.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..454501db22db03941b5b078f4401a45f03d930d8
Binary files /dev/null and b/doc/codegeneration/figures/bdhelloworld.pdf differ
diff --git a/doc/codegeneration/figures/smdhelloworld.pdf b/doc/codegeneration/figures/smdhelloworld.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..eec6c3d8b55bc64a7b0b441b3637eea83c00f346
Binary files /dev/null and b/doc/codegeneration/figures/smdhelloworld.pdf differ
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 9c894c91e5fd407eaf8175a33627a70a90f0a7b5..f7056e9b6293cd43780de9e63c2614df674f1fcb 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/MainBlock.c
\ No newline at end of file
diff --git a/src/main/java/ui/TGConnector.java b/src/main/java/ui/TGConnector.java
index ac94c5baab9cbbd73d374b8583e8adb042f66812..c7228e430ca6dc7e5bc28e740f42207c53dfdc42 100755
--- a/src/main/java/ui/TGConnector.java
+++ b/src/main/java/ui/TGConnector.java
@@ -343,7 +343,7 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
//System.out.println("Algo2");
// Algorithm 2: more complex
// we need at least 4 points
- TraceManager.addDev("Making square ...");
+ //TraceManager.addDev("Making square ...");
int minXX = 500000, maxXX = 0, resX = 0;
// search for the min x and maxX
int averageX = 0;
@@ -353,9 +353,8 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
if ((i != 0) && (i != points.length-1))
averageX += points[i].getX();
}
- averageX = averageX / (points.length-2);
-
- TraceManager.addDev("averageX = " + averageX + " minXX= " + minXX + " maxXX =" + maxXX);
+
+ //TraceManager.addDev("averageX = " + averageX + " minXX= " + minXX + " maxXX =" + maxXX);
resX = 0;
//System.out.println("p1.x = " + p1.getX() + " p2.x = " + p2.getX() + " minXX=" + minXX + "maxXX=" + maxXX);
@@ -363,13 +362,18 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
//System.out.println("p1.x = " + p1.getX() + " p2.x = " + p2.getX() + " minXX=" + minXX + "maxXX=" + maxXX);
- if ((Math.abs(averageX - maxXX)) < (Math.abs(averageX - minXX))) {
- resX = maxXX;
+ if (averageX >0) {
+ averageX = averageX / (points.length-2);
+ if ((Math.abs(averageX - maxXX)) < (Math.abs(averageX - minXX))) {
+ resX = maxXX;
+ } else {
+ resX = minXX;
+ }
} else {
- resX = minXX;
+ resX = p1.getX() + p2.getX() / 2;
}
- TraceManager.addDev("Using resX = " + resX);
+ //TraceManager.addDev("Using resX = " + resX);
/*if (resX < p2.getX()) {
resX = minXX;
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index 4fca5077a01863d7726f2d39460f0853ae5772ee..0831642197cf9512f5def03b9abcb8377cfbb625 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -627,7 +627,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
JDialogAvatarBlock jdab = new JDialogAvatarBlock(this.myAttributes, this.myMethods, this.mySignals, null, frame, "Setting attributes of " + value, "Attribute", tab, globalCode, true, mainCode);
setJDialogOptions(jdab);
// jdab.setSize(650, 575);
- GraphicLib.centerOnParent(jdab, 650, 575);
+ GraphicLib.centerOnParent(jdab, 750, 775);
jdab.setVisible(true); // blocked until dialog has been closed
//makeValue();
//if (oldValue.equals(value)) {
diff --git a/src/main/java/ui/window/JDialogAvatarBlock.java b/src/main/java/ui/window/JDialogAvatarBlock.java
index 9ea6dd9ea4950389116a3957501b9e93e57d37fd..7952482477d529f39eea4b323e48d5a46ca8cf81 100755
--- a/src/main/java/ui/window/JDialogAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogAvatarBlock.java
@@ -215,12 +215,14 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Adding " + attrib + "s"));
- panel1.setPreferredSize(new Dimension(300, 250));
+ panel1.setPreferredSize(new Dimension(300, 450));
+ panel1.setMinimumSize(new Dimension(300, 200));
panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Managing " + attrib + "s"));
- panel2.setPreferredSize(new Dimension(300, 250));
+ panel2.setPreferredSize(new Dimension(300, 450));
+ panel1.setMinimumSize(new Dimension(300, 200));
// first line panel1
c1.gridwidth = 1;
@@ -293,7 +295,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
listAttribute.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
listAttribute.addListSelectionListener(this);
JScrollPane scrollPane = new JScrollPane(listAttribute);
- scrollPane.setSize(300, 250);
+ scrollPane.setSize(300, 450);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c2.fill = GridBagConstraints.BOTH;
c2.gridheight = 5;
@@ -327,12 +329,12 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
panel3 = new JPanel();
panel3.setLayout(gridbag3);
panel3.setBorder(new javax.swing.border.TitledBorder("Adding methods"));
- panel3.setPreferredSize(new Dimension(300, 250));
+ panel3.setPreferredSize(new Dimension(300, 450));
panel4 = new JPanel();
panel4.setLayout(gridbag2);
panel4.setBorder(new javax.swing.border.TitledBorder("Managing methods"));
- panel4.setPreferredSize(new Dimension(300, 250));
+ panel4.setPreferredSize(new Dimension(300, 450));
// first line panel3
c3.gridwidth = 1;
@@ -386,7 +388,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
listMethod.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
listMethod.addListSelectionListener(this);
scrollPane = new JScrollPane(listMethod);
- scrollPane.setSize(300, 250);
+ scrollPane.setSize(300, 450);
c4.gridwidth = GridBagConstraints.REMAINDER; //end row
c4.fill = GridBagConstraints.BOTH;
c4.gridheight = 5;
@@ -420,12 +422,12 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
panel5 = new JPanel();
panel5.setLayout(gridbag5);
panel5.setBorder(new javax.swing.border.TitledBorder("Adding signals"));
- panel5.setPreferredSize(new Dimension(300, 250));
+ panel5.setPreferredSize(new Dimension(300, 550));
panel6 = new JPanel();
panel6.setLayout(gridbag6);
panel6.setBorder(new javax.swing.border.TitledBorder("Managing signals"));
- panel6.setPreferredSize(new Dimension(300, 250));
+ panel6.setPreferredSize(new Dimension(300, 550));
// first line panel5
c5.gridwidth = 1;
@@ -476,7 +478,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
listSignal.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
listSignal.addListSelectionListener(this);
scrollPane = new JScrollPane(listSignal);
- scrollPane.setSize(300, 250);
+ scrollPane.setSize(300, 450);
c6.gridwidth = GridBagConstraints.REMAINDER; //end row
c6.fill = GridBagConstraints.BOTH;
c6.gridheight = 5;