drawio update

This commit is contained in:
Nathan Lebrun
2025-01-27 09:55:18 +01:00
parent d6f470a5e9
commit 8a24b6817f
7 changed files with 136 additions and 56 deletions

View File

@@ -13,7 +13,7 @@
#ifndef DRAWIO_H
# define DRAWIO_H
#include "../../libft.h"
# include "../../libft.h"
typedef enum e_dio_elemtype
{
@@ -35,8 +35,8 @@ typedef struct s_dio_elem
} t_dio_elem;
int drawio_init(char *file_path);
int drawio_create_elem(int fd, t_dio_elem *elem);
void drawio_end_file(int fd);
int drawio_init(char *file_path);
int drawio_create_elem(int fd, t_dio_elem *elem);
void drawio_end_file(int fd);
#endif

View File

@@ -10,8 +10,8 @@
/* */
/* ************************************************************************** */
#ifndef DIO_PRIVATE
# define DIO_PRIVATE
#ifndef DIO_PRIVATE_H
# define DIO_PRIVATE_H
int draw_rect(int fd, int id, t_dio_elem *elem);
int draw_arrow(int fd, int id, t_dio_elem *elem);

View File

@@ -17,12 +17,12 @@ int draw_rect(int fd, int id, t_dio_elem *elem)
{
ft_fprintf(fd, "<mxCell id=\"%d\" ", id);
ft_fprintf(fd, "value=\"%s\" ", elem->text);
ft_fprintf(fd, "style=\"rounded=%d;whiteSpace=wrap;html=1;\" ", elem->rounded);
ft_fprintf(fd, "vertex=\"1\" parent=\"1\"> \n");
ft_fprintf(fd, "style=\"rounded=%d;whiteSpace=wrap;", elem->rounded);
ft_fprintf(fd, "html=1;\" vertex=\"1\" parent=\"1\"> \n");
ft_fprintf(fd, "<mxGeometry x=\"%d\" y=\"%d\" ", elem->x, elem->y);
ft_fprintf(fd, "width=\"%d\" height=\"%d\" ", elem->w, elem->h);
ft_fprintf(fd, "as=\"geometry\"/>\n");
ft_fprintf(fd, "</mxCell>\n");
ft_fprintf(fd, "</mxCell>\n");
return (id);
}
@@ -31,8 +31,8 @@ int draw_arrow(int fd, int id, t_dio_elem *elem)
if (!elem->id_src || !elem->id_dst)
return (0);
ft_fprintf(fd, "<mxCell id=\"%d\" ", id);
ft_fprintf(fd, "edge=\"1\" parent=\"1\" ");
ft_fprintf(fd, "source=\"%d\" target=\"%d\">\n", elem->id_src, elem->id_dst);
ft_fprintf(fd, "<mxGeometry relative=\"1\" as=\"geometry\"/>\n</mxCell>\n");
ft_fprintf(fd, "edge=\"1\" parent=\"1\" source=");
ft_fprintf(fd, "\"%d\" target=\"%d\">\n", elem->id_src, elem->id_dst);
ft_fprintf(fd, "<mxGeometry relative=\"1\" as=\"geometry\"/>\n</mxCell>\n");
return (id);
}

View File

@@ -13,33 +13,32 @@
#include "../drawio.h"
#include "../header/dio_private.h"
int drawio_init(char *file_path)
int drawio_init(char *file_path)
{
int fd;
int fd;
fd = open(file_path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
ft_fprintf(fd, "<mxfile host=\"app.diagrams.net\" ");
ft_fprintf(fd, "modified=\"2025-01-24T12:00:00Z\" ");
ft_fprintf(fd, "agent=\"c_generator\" version=\"15.8.7\" ");
ft_fprintf(fd, "type=\"device\">\n");
ft_fprintf(fd, "<diagram id=\"GEN\" name=\"GEN-Diagram\">\n");
ft_fprintf(fd, "<mxGraphModel>\n");
ft_fprintf(fd, "<root>\n");
ft_fprintf(fd, "<mxCell id=\"0\"/>\n");
ft_fprintf(fd, "<mxGraphModel>\n");
ft_fprintf(fd, "<root>\n");
ft_fprintf(fd, "<mxCell id=\"0\"/>\n");
ft_fprintf(fd, "<mxCell id=\"1\" parent=\"0\"/>\n");
return(fd);
return (fd);
}
void drawio_end_file(int fd)
void drawio_end_file(int fd)
{
ft_fprintf(fd, "</root>\n</mxGraphModel>\n</diagram>\n</mxfile>");
close(fd);
}
int drawio_create_elem(int fd, t_dio_elem *elem)
int drawio_create_elem(int fd, t_dio_elem *elem)
{
static int id = 1;
static int id = 1;
id ++;
if (elem->type == ARROW)

90
tests/drawio.c Normal file
View File

@@ -0,0 +1,90 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* drawio.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:41:02 by nalebrun #+# #+# */
/* Updated: 2025/01/24 14:41:02 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
#include "parsing.h"
#include "tokenizer/tokenizer.h"
int get_amp_count(char *str)
{
int i;
int count;
i = 0;
count = 0;
while (str[i])
{
if (str[i] == '&')
count++;
i++;
}
return (count);
}
char* replace_ampercent(char *src)
{
int i;
int j;
int amp_count;
char *out;
i = -1;
j = 0;
amp_count = get_amp_count(src);
out = malloc(ft_strlen(src) + amp_count * 4);
while (src[++i])
{
if (src[i] == '&')
{
out[j] = '&';
out[j + 1] = 'a';
out[j + 2] = 'm';
out[j + 3] = 'p';
out[j + 4] = ';';
j += 5;
}
else
out[j++] = src[i];
}
out[j] = 0;
return (out);
}
void gen_dio_linked_list(t_node *head, char *fp)
{
int fd;
t_dio_elem rect;
t_dio_elem arrow;
t_node *current;
current = head;
fd = drawio_init(fp);
rect.type = RECT;
rect.rounded = 0;
rect.x = 50;
rect.y = 50;
rect.w = 100;
rect.h = 50;
arrow.id_src = 0;
arrow.type = ARROW;
while (current != NULL)
{
rect.text = ft_sprintf("|||%s|||", current->val);
rect.text = replace_ampercent(rect.text);
arrow.id_dst = drawio_create_elem(fd, &rect);
drawio_create_elem(fd, &arrow);
arrow.id_src = arrow.id_dst;
rect.x += 150;
free(rect.text);
current = current->next;
}
drawio_end_file(fd);
}

21
tests/parsing.h Normal file
View File

@@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* parsing.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:45:28 by nalebrun #+# #+# */
/* Updated: 2025/01/24 14:45:28 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef PARSING_H
# define PARSING_H
# include "tokenizer/tokenizer.h"
// drawio
void gen_dio_linked_list(t_node *head, char *fp);
#endif

View File

@@ -10,7 +10,7 @@
/* */
/* ************************************************************************** */
#include "tokenizer/tokenizer.h"
#include "parsing.h"
/*#include "../includes/env.h"*/
void truncate_comment(char *str)
@@ -37,36 +37,6 @@ void truncate_comment(char *str)
}
}
void gen_dio_linked_list(t_node *head, char *fp)
{
int fd;
t_dio_elem rect;
t_dio_elem arrow;
t_node *current;
current = head;
fd = drawio_init(fp);
rect.type = RECT;
rect.rounded = 0;
rect.x = 50;
rect.y = 50;
rect.w = 100;
rect.h = 50;
arrow.id_src = 0;
arrow.type = ARROW;
while (current != NULL)
{
rect.text = ft_sprintf("%s", current->val);
arrow.id_dst = drawio_create_elem(fd, &rect);
drawio_create_elem(fd, &arrow);
arrow.id_src = arrow.id_dst;
rect.x += 150;
free(rect.text);
current = current->next;
}
drawio_end_file(fd);
}
/*static t_data *init_data(char **envp)*/
/*{*/
/* t_data *data;*/
@@ -96,7 +66,7 @@ int main(int ac, char **av, char **envp)
lst = tokenize(av[2]);
if (!lst)
return (1);
debug_linked_list(lst, "Tokenized");
gen_dio_linked_list(lst, av[1]);
debug_linked_list(lst, "ff");
free_linked_list(lst);
}