Pd-cvs May 2008

pd-cvs@lists.iem.at

16 participants
271 discussions

SF.net SVN: pure-data: [9876] trunk/externals/pdvjtools/videogrid
by lluisbigorda＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9876 http://pure-data.svn.sourceforge.net/pure-data/?rev=9876&view=rev Author: lluisbigorda Date: 2008-05-23 15:40:19 -0700 (Fri, 23 May 2008) Log Message: ----------- changed code to be in a single file added ffmpeg support Added Paths: ----------- trunk/externals/pdvjtools/videogrid/videogrid.cpp Removed Paths: ------------- trunk/externals/pdvjtools/videogrid/cua.c trunk/externals/pdvjtools/videogrid/cua.h trunk/externals/pdvjtools/videogrid/qtconverter.c trunk/externals/pdvjtools/videogrid/qtconverter.h trunk/externals/pdvjtools/videogrid/tk2c.sh trunk/externals/pdvjtools/videogrid/videogrid.c trunk/externals/pdvjtools/videogrid/videogrid.tk trunk/externals/pdvjtools/videogrid/videogrid.tk2c Deleted: trunk/externals/pdvjtools/videogrid/cua.c =================================================================== --- trunk/externals/pdvjtools/videogrid/cua.c 2008-05-23 22:39:49 UTC (rev 9875) +++ trunk/externals/pdvjtools/videogrid/cua.c 2008-05-23 22:40:19 UTC (rev 9876) @@ -1,164 +0,0 @@ -/* -cue for videogrid external -Copyright (C) 2007 Sergi Lario - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "cua.h" - -/* -- compilació: - $ gcc -c -ansi -O -Wall -Wmissing-prototypes cua.c -- muntatge: - $ gcc cua.o -o cua -- execució: - $ ./cua -*/ -/* programa principal de prova */ -/* -int main() -{ - - int opc=8; - char path[BYTESNOMFITXER]; - int ok; - Cua cua; - crearCua(&cua); - - while(opc!=5) - { - printf("\t\t\tMENU PRINCIPAL\n\n\n"); - printf("\t 1. Encuar\n"); - printf("\t 2. Desencuar\n"); - printf("\t 3. Nombre de nodes\n"); - printf("\t 4. Contingut de la cua\n"); - printf("\t 5. Sortir\n"); - - scanf("%d", &opc); - - switch(opc) - { - case 1: - printf("path a introduir:\n"); - scanf("%s", path); - encuar(&cua, path); - break; - - case 2: - ok = desencuar(&cua); - if(ok) printf("node eliminat de la cua\n"); - break; - - case 3: - printf("nombre de nodes de la cua %d\n", numNodes(&cua)); - break; - case 4: - escriuCua(&cua); - break; - case 5: - eliminarCua(&cua); - break; - } - } - getchar(); - return 0; -} -*/ -/* implementació de les funcions */ -void crearCua(Cua *cua) -{ - cua->davanter=cua->final=NULL; -} - -/* funció que encua el node al final de la cua */ -void encuar (Cua *cua, path x) -{ - Node *nou; - nou=(Node*)malloc(sizeof(Node)); - strcpy(nou->pathFitxer,x); - nou->seguent=NULL; - if(cuaBuida(cua)) - { - cua->davanter=nou; - } - else - cua->final->seguent=nou; - cua->final=nou; -} - -/* elimina l'element del principi de la cua */ -int desencuar (Cua *cua) -{ - if(!cuaBuida(cua)) - { - Node *nou; - nou=cua->davanter; - cua->davanter=cua->davanter->seguent; - free(nou); - return 1; - } - else - { - /* printf("Cua buida\a\n"); */ - return 0; - } - -} - -/* funció que retorna si la cua és buida */ -int cuaBuida(Cua *cua) -{ - return (cua->davanter==NULL); -} - -/* elimina el contingut de la cua */ -void eliminarCua(Cua *cua) -{ - while (!cuaBuida(cua)) desencuar(cua); - printf("Cua eliminada\n"); -} - -/* funció que retorna el nombre de nodes de la cua */ -int numNodes(Cua *cua) -{ - int contador=0; - Node *actual; - actual=cua->davanter; - if(actual) contador=1; - while((actual)&&(actual != cua->final)){ - contador ++; - actual = actual->seguent; - } - return (contador); -} - -/* funció que escriu la cua de nodes per la sortida estàndard */ -void escriuCua(Cua *cua) -{ - if(!cuaBuida(cua)) - { - Node *actual; - actual=cua->davanter; - printf("CUA DE NODES\n["); - do{ - printf("#%s#",actual->pathFitxer); - actual = actual->seguent; - }while(actual); - printf("]\n"); - - } - else - printf("Cua buida\n"); -} Deleted: trunk/externals/pdvjtools/videogrid/cua.h =================================================================== --- trunk/externals/pdvjtools/videogrid/cua.h 2008-05-23 22:39:49 UTC (rev 9875) +++ trunk/externals/pdvjtools/videogrid/cua.h 2008-05-23 22:40:19 UTC (rev 9876) @@ -1,47 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* nombre de caracters per el nom del path del fitxer */ -#define BYTESNOMFITXER 512 - -typedef char path[BYTESNOMFITXER]; - -/* estructures i tipus de dades de la cua */ - -/* estructura de dades: un node de la cua */ -struct node -{ - /* nom del path de la imatge */ - path pathFitxer; - /* apuntador al següent node en cua */ - struct node *seguent; -}; - -/* definició del tipus node */ -typedef struct node Node; - -/* definició del tipus de cua */ -typedef struct -{ - Node *davanter; - Node *final; -}Cua; - - -/* declaracions de les funcions */ - -/* crea una cua */ -void crearCua(Cua *cua); -/* encuara un element al final de la cua */ -void encuar (Cua *cua, path x); -/* elimina un element de la cua */ -int desencuar (Cua *cua); -/* retorna si la cua és buida */ -int cuaBuida(Cua *cua); -/* elimina el contingut de la cua */ -void eliminarCua(Cua *cua); -/* retorna el nombre de nodes de la cua */ -int numNodes(Cua *cua); -/* escriu el contingut de la cua */ -void escriuCua(Cua *cua); Deleted: trunk/externals/pdvjtools/videogrid/qtconverter.c =================================================================== --- trunk/externals/pdvjtools/videogrid/qtconverter.c 2008-05-23 22:39:49 UTC (rev 9875) +++ trunk/externals/pdvjtools/videogrid/qtconverter.c 2008-05-23 22:40:19 UTC (rev 9876) @@ -1,133 +0,0 @@ -#include "qtconverter.h" - -/* -void post(char args[]){ - printf("%s",args); -} -*/ - -int convertir_img(pathimage pathFitxer, tipus_format f, int W, int H, int posi){ - /* - Quicktime per les conversions - */ - - /* RGB vectors */ - unsigned char * qt_rows[3]; - /* YUV vesctor frame */ - unsigned char *qt_frame = NULL; - /* quicktime decoder */ - quicktime_t *qt; - /* quicktime color model */ - int qt_cmodel; - - int nN = posi; - int x_vwidth = 0; - int x_vheight = 0; - /* convertir(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); */ - qt = quicktime_open(pathFitxer, 1, 0); - - if (!(qt)){ - /* post("videogrid: error opening qt file"); */ - return -1; - } - - if (!quicktime_has_video(qt)) { - /* post("videogrid: no video stream"); */ - quicktime_close(qt); - return -1; - - } - else if (!quicktime_supported_video(qt,0)) { - /* post("videogrid: unsupported video codec\n"); */ - quicktime_close(qt); - return -1; - } - else - { - qt_cmodel = BC_YUV420P; - x_vwidth = quicktime_video_width(qt,0); - x_vheight = quicktime_video_height(qt,0); - - - free(qt_frame); - qt_frame = (unsigned char*)malloc(x_vwidth*x_vheight*4); - - int size = x_vwidth * x_vheight; - qt_rows[0] = &qt_frame[0]; - qt_rows[2] = &qt_frame[size]; - qt_rows[1] = &qt_frame[size + (size>>2)]; - - quicktime_set_cmodel(qt, qt_cmodel); - } - - /* int length = quicktime_video_length(qt,0); */ - /* int Vpos = quicktime_video_position(qt,0); */ - lqt_decode_video(qt, qt_rows, 0); - - switch(qt_cmodel){ - case BC_YUV420P: - printf(" "); - /* post("videogrid: qt colormodel : BC_YUV420P"); */ - - /* per a fer la miniatura - cada k colomnes pillem una - cada l files pillem una */ - int w = x_vwidth; - int h = x_vheight; - int k = (w/W); - int l = (h/H); - - /*int cont=0;*/ - - char nNstr[BYTES_NUM_TEMP]; - pathimage ig_path = PATH_TEMPORAL; - - sprintf(nNstr, "%d", nN); - strcat(ig_path,nNstr); - strcat(ig_path,"."); - strcat(ig_path,FORMAT_MINIATURA); - /* printf("Creacio de la imatge %s ...",ig_path); */ - /* escriu el contingut de data a un arxiu. */ - FILE *fp = fopen(ig_path, "w"); - fprintf (fp, "P6\n%d %d\n255\n", W, H); - - int i,j,y,u,v,r,g,b; - - for (i=0;i<(l*H);i=i+l) { - for (j=0;j<(k*W);j=j+k) { - y=qt_rows[0][(w*i+j)]; - u=qt_rows[1][(w/2)*(i/2)+(j/2)]; - v=qt_rows[2][(w/2)*(i/2)+(j/2)]; - r = CLAMP8(y + 1.402 *(v-128)); - g = CLAMP8(y - 0.34414 *(u-128) - 0.71414 *(v-128)); - b = CLAMP8(y + 1.772 *(u-128)); - fprintf (fp, "%c%c%c", r,g,b); - } - } - - /* escriu el contingut de data a un arxiu.*/ - fclose (fp); - } - return 0; -} - - - -/* -cc -fPIC -c -O -Wall -Wmissing-prototypes -o qtconverter.o -c qtconverter.c -cc -o qtconverter qtconverter.o -lc -lm -lquicktime `Wand-config --ldflags --libs` -./qtconverter -*/ - -/* -int main(void){ - pathimage imatge = "/usr/lib/pd/extra/videogrid/videos/dscn0243.mov"; - tipus_format fo = "ppm"; - int flauta; - flauta = convertir(imatge,fo,60,40,2); - printf("\n%d FET\n", flauta); - return(0); -} -*/ - - Deleted: trunk/externals/pdvjtools/videogrid/qtconverter.h =================================================================== --- trunk/externals/pdvjtools/videogrid/qtconverter.h 2008-05-23 22:39:49 UTC (rev 9875) +++ trunk/externals/pdvjtools/videogrid/qtconverter.h 2008-05-23 22:40:19 UTC (rev 9876) @@ -1,27 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -//#include <quicktime/lqt.h> -//#include <quicktime/colormodels.h> -#include <lqt/lqt.h> -#include <lqt/colormodels.h> - -/* 8bits clamp rgb values */ - -#define CLAMP8(x) (((x)<0) ? 0 : ((x>255)? 255 : (x))) - -#define BYTESNOMFITXERIMATGE 512 -#define BYTESTIPUSFROMAT 4 - -#define FORMAT_MINIATURA "ppm" -#define PATH_TEMPORAL "/tmp/vigrid_" -#define BYTES_NUM_TEMP 4 - -typedef char pathimage[BYTESNOMFITXERIMATGE]; - -typedef char tipus_format[BYTESTIPUSFROMAT]; - -int convertir_img(pathimage pathFitxer, tipus_format f, int W, int H, int posi); -/* void post(char args[]); */ - Deleted: trunk/externals/pdvjtools/videogrid/tk2c.sh =================================================================== --- trunk/externals/pdvjtools/videogrid/tk2c.sh 2008-05-23 22:39:49 UTC (rev 9875) +++ trunk/externals/pdvjtools/videogrid/tk2c.sh 2008-05-23 22:40:19 UTC (rev 9876) @@ -1,25 +0,0 @@ -#!/bin/bash - -#set -x - -while read line -do - for word in $line - do - if [ "X"$word != "X"${word#\#} ] - then - echo // ${line#\#} - break - else - line=${line//\'/\\\'} -#useless, slashes never gets in - line=${line//\\/\\\\} -#this one's dirty, i know - line=${line//;/\\\\;} - line=${line//\"/\\\"} - echo 'sys_gui("'$line'\n");' - break - fi - done -done - Deleted: trunk/externals/pdvjtools/videogrid/videogrid.c =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.c 2008-05-23 22:39:49 UTC (rev 9875) +++ trunk/externals/pdvjtools/videogrid/videogrid.c 2008-05-23 22:40:19 UTC (rev 9876) @@ -1,983 +0,0 @@ - -/* -videogrid external for Puredata -Copyright (C) 2007 Sergi Lario -sll :: slario-at-gmail.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdio.h> -#include <dirent.h> -#include <string.h> -#include <unistd.h> -#include <math.h> - -/* incloure les definicions de variables i - prototipus de dades i de funcions de puredata */ -#include "m_pd.h" -/* incloure estructures de dades i capceleres de funcions gàfiques bàsiques de pd */ -#include "g_canvas.h" -/* incloure estructures de dades i capceleres de funcions per a gestionar una cua */ -#include "cua.h" -/* incloure estructures de dades i capceleres de funcions per convertir imatges a diferents formats */ -/* #include "magickconverter.h" */ -/* incloure estructures de dades i capceleres de funcions per tractar frames de vídeo */ -#include "qtconverter.h" -/* incloure estructures de dades i capceleres de funcions per traballar amb threads */ -#include "pthread.h" - -/* &&&&&&&&&&&&&&&&&&&&&&&&&&&&& VIDEOGRID &&&&&&&&&&&&&&&&&&&&&&&&&&&&& */ - -/* definició de l'amplada i l'alçada d'una casella */ -#define W_CELL 60 -#define H_CELL 40 - -/* definició del gruix en pixels del marc del tauler */ -#define GRUIX 2 - -/* crear un apuntador al nou objecte */ -static t_class *videogrid_class; -/* indica el nombre de videogrid creats - utilitzat per diferenciar el nom d'instàncies d'objectes del mateix tipus */ -static int videogridcount = 0; - -/* definició de la classe i la seva estructura de dades */ - -typedef struct _videogrid { - t_object x_obj; - /* declaració de la sortida de l'objecte */ - t_outlet *x_sortida; - /* llista d'objectes gràfics */ - t_glist *x_glist; - /* nombre de files */ - int x_num_fil; - /* nombre de columnes */ - int x_num_col; - /* posició de la última imatge en el tauler */ - int x_ultima_img; - /* path del directori actual */ - path x_dir_actual; - /* path del directori a canviar */ - path x_dir_canvi; - /* posicio ultim al directori actual */ - int x_dir_pos; - /* apuntador al primer element posicionat al tauler */ - Node *x_tauler_primer; - /* cua d'imatges */ - Cua x_cua; - /* nom de l'objecte */ - t_symbol *x_name; - /* color de fons */ - t_symbol *x_color_fons; - /* color del marge */ - t_symbol *x_color_marc; - /* mutex per evitar concurrencia sobre la cua al accedir diferents threads*/ - pthread_mutex_t x_lock; - /* v 0.2 -- posicó de la cel·la seleccionada */ - int x_pos_selected; - /* v 0.2 -- color de seleccio */ - t_symbol *x_color_grasp; - -} t_videogrid; - - -/* calcula la posició x del tauler a partir de la posició de l'element de la cua (d'esquerra a dreta) */ -int getX(t_videogrid* x, int posCua){ - int c = x->x_num_col; - int xpos = (posCua % c) * W_CELL + ((posCua % c) + 1) * GRUIX; - return(xpos + 1); -} - -/* calcula la posició y del tauler a partir de la posició de l'element de la cua (de dalt a baix) */ -int getY(t_videogrid* x, int posCua){ - int c = x->x_num_col; - int ypos = (posCua / c) * H_CELL + ((posCua / c) + 1) * GRUIX; - return(ypos + 1); -} - -/* elimina les imatges temporals */ -void eliminar_imatges_temporals(int maxim){ - FILE *fitxer; - path path_total; - int contador = 0; - char contador_str[BYTES_NUM_TEMP]; - while(contador < maxim){ - strcpy(path_total,PATH_TEMPORAL); - sprintf(contador_str,"%d", contador); - strcat(path_total,contador_str); - strcat(path_total,"."); - strcat(path_total,FORMAT_MINIATURA); - /* elimina el fitxer si no hi ha cap problema */ - if(unlink(path_total)){ - /* post("Imatge temporal %s eliminada\n",path_total); */ - } - contador++; - } - /* post("Videogrid: Imatges temporals eliminades\n",path_total); */ -} - -int format_adequat_v(path nomF){ - int retorn = 0; - path ig_path = ""; - strcat(ig_path,nomF); - char *t1; - path extensio = ""; - for ( t1 = strtok(ig_path,"."); - t1 != NULL; - t1 = strtok(NULL,".") ) - strcpy(extensio,t1); - if(strcmp(extensio,"mov")==0) retorn = 1; - /* - if(strcmp(extensio,"eps")==0) retorn = 1; - if(strcmp(extensio,"gif")==0) retorn = 1; - if(strcmp(extensio,"jpg")==0) retorn = 1; - if(strcmp(extensio,"jpeg")==0) retorn = 1; - if(strcmp(extensio,"png")==0) retorn = 1; - if(strcmp(extensio,"ppm")==0) retorn = 1; - if(strcmp(extensio,"tif")==0) retorn = 1; - if(strcmp(extensio,"tiff")==0) retorn = 1; - */ - - return (retorn); -} - -/* afegir una imatge al grid */ -void videogrid_afegir_imatge(t_videogrid *x, path entrada) -{ - int maxim; - char nNstr[BYTES_NUM_TEMP]; - int pos = 0; - /* escriu l'argument entrat */ - if (format_adequat_v(entrada) == 1){ - /* post("Afegint la imatge %s ...",entrada); */ - maxim = x->x_num_fil * x->x_num_col; - path ig_path = PATH_TEMPORAL; - - /* si hi ha tants nodes a la cua com el maxim */ - if((numNodes(&x->x_cua)) >= maxim){ - /* desencua */ - int extret; - extret = desencuar(&x->x_cua); - /* obtenir la posició en la cua del nou node */ - if(x->x_ultima_img == maxim-1) { - pos = 0; - }else{ - pos = x->x_ultima_img+1; - } - sys_vgui(".x%x.c delete %xS%d\n", glist_getcanvas(x->x_glist), x, pos); - } - /* encua el nou node */ - encuar(&x->x_cua, entrada); - /* si no és el primer element a encuar incrementem la posicio de la última imatge insertada */ - if(numNodes(&x->x_cua) != 1) x->x_ultima_img ++; - /* si assoleix el maxim torna a començar, inicialitzant la posició en el tauler de la última imatge insertada */ - if(x->x_ultima_img == maxim) x->x_ultima_img = 0; - - /* - Quicktime per les conversions - */ - int nN = x->x_ultima_img; - convertir_img(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); - sprintf(nNstr, "%d", nN); - strcat(ig_path,nNstr); - strcat(ig_path,"."); - strcat(ig_path,FORMAT_MINIATURA); - /*printf("Creacio de la imatge %s ...",ig_path);*/ - sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); - /* printf("1. Creacio de la imatge %s ...",ig_path); */ - sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", - glist_getcanvas(x->x_glist), - text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), - text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2), - x,nN,x,nN); - /* printf("2. Creacio de la imatge %s ...",ig_path); */ - if(nN == 0){ - x->x_tauler_primer = x->x_cua.final; - /* post("Ara el primer del tauler es %s\n",x->x_tauler_primer->pathFitxer); */ - } - /* printf("SURT de la creacio de la imatge %s ...",ig_path); */ - }else{ - post("Videogrid: Incompatible file format (%s).\n",entrada); - } - /* - sys_vgui("image create photo img%x -file %s\n",x,entrada); - sys_vgui(".x%x.c create image %d %d -image img%x -tags %xS\n", - glist_getcanvas(glist),text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x,x); - */ -} - -/* dibuixa videogrid */ -void videogrid_drawme(t_videogrid *x, t_glist *glist, int firsttime) -{ - /* post("Entra a drawme amb firsttime: %d", firsttime); */ - if (firsttime) { - char name[MAXPDSTRING]; - canvas_makefilename(glist_getcanvas(x->x_glist), x->x_name->s_name, name, MAXPDSTRING); - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill %s -tags %xGRID -outline %s\n", - glist_getcanvas(glist), - text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), - text_xpix(&x->x_obj, glist) + (x->x_num_col * W_CELL) + 1 + (x->x_num_col * GRUIX) + GRUIX, text_ypix(&x->x_obj, glist) + (x->x_num_fil * H_CELL) + 1 + (x->x_num_fil * GRUIX) + GRUIX, - x->x_color_fons->s_name, x,x->x_color_marc->s_name); - - canvas_fixlinesfor(glist_getcanvas(glist), (t_text*)x); - /* si hi elements a la cua els afegeix (redimensió) */ - if(!cuaBuida(&x->x_cua)) - { - path ig_path; - int nN = 0; - char nNstr[BYTES_NUM_TEMP]; - Node *actual; - actual=x->x_cua.davanter; - do{ - strcpy(ig_path,PATH_TEMPORAL); - sprintf(nNstr, "%d", nN); - strcat(ig_path,nNstr); - strcat(ig_path,"."); - strcat(ig_path,FORMAT_MINIATURA); - /* post("reestablint la imatge %s", actual->pathFitxer); */ - // videogrid_afegir_imatge(x,actual->pathFitxer); - convertir_img(actual->pathFitxer,FORMAT_MINIATURA, W_CELL, H_CELL, nN); - sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); - sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", - glist_getcanvas(x->x_glist),text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2),x,nN,x,nN); - actual = actual->seguent; - nN++; - }while(actual); - } - } - else { - sys_vgui(".x%x.c coords %xGRID %d %d %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),text_xpix(&x->x_obj, glist) + (x->x_num_col*W_CELL) + 1 + (x->x_num_col * GRUIX) + GRUIX, text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL) + 1 + (x->x_num_fil * GRUIX) + GRUIX); - if(!cuaBuida(&x->x_cua)) - { - int contador = 0; - while(contador < numNodes(&x->x_cua)){ - sys_vgui(".x%x.c coords %xS%d \ - %d %d\n", - glist_getcanvas(glist), x, contador, - text_xpix(&x->x_obj, x->x_glist) + getX(x,contador) + (W_CELL/2), text_ypix(&x->x_obj, x->x_glist) + getY(x,contador) + (H_CELL/2)); - contador++; - } - - /* char buf[800]; - sprintf(buf, "pdtk_videogrid_table %%s %s %d %d\n", x->x_name->s_name, x->x_num_fil, x->x_num_col); - gfxstub_new(&x->x_obj.ob_pd, x, buf); */ - } - if (x->x_pos_selected > -1){ - sys_vgui(".x%x.c coords %xGRASP %d %d %d %d\n", glist_getcanvas(glist), x, - text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected), text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected), - text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected) + W_CELL, text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected) + H_CELL); - } - sys_vgui(".x%x.c delete %xLINIA\n", glist_getcanvas(x->x_glist), x); - } - int xI = text_xpix(&x->x_obj, glist); - int yI = text_ypix(&x->x_obj, glist); - int xF = xI + (x->x_num_col * W_CELL) + ((x->x_num_col + 1) * GRUIX); - int yF = yI + (x->x_num_fil * H_CELL) + ((x->x_num_fil + 1) * GRUIX); - int vlines = 0; - int xi = 0; - while(vlines < x->x_num_col){ - xi = xI + getX(x,vlines) - GRUIX + 1; - sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xi, yI, xi, yF, x->x_color_marc->s_name,GRUIX,x); - vlines++; - } - xi = xi + W_CELL + GRUIX; - sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xi, yI, xi, yF, x->x_color_marc->s_name,GRUIX,x); - int hlines = 0; - int yi = 0; - while(hlines < x->x_num_fil){ - yi = yI + ((H_CELL + GRUIX) * hlines) + 2; - sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xI, yi, xF, yi, x->x_color_marc->s_name,GRUIX,x); - hlines++; - } - yi = yi + H_CELL + GRUIX; - sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xI, yi, xF, yi, x->x_color_marc->s_name,GRUIX,x); -} - -/* borra videogrid v 0.2 -- int toclear */ -void videogrid_erase(t_videogrid* x,t_glist* glist, int toclear) -{ - int maxim = x->x_num_fil * x->x_num_col; - path path_total; - char contador_str[BYTES_NUM_TEMP]; - /* post("Entra a erase"); */ - /* elimina les imatges */ - int contador = 0; - while(contador < numNodes(&x->x_cua)){ - - sys_vgui(".x%x.c delete %xS%d\n", glist_getcanvas(x->x_glist), x, contador); - strcpy(path_total,PATH_TEMPORAL); - sprintf(contador_str,"%d", contador); - strcat(path_total,contador_str); - strcat(path_total,"."); - strcat(path_total,FORMAT_MINIATURA); - if(unlink(path_total)){ - /* post("Imatge temporal %s eliminada\n",path_total); */ - } - contador++; - } - - /* elimina el grid v 0.2 -- excepte quan es fa un clear */ - if(toclear == 0){ - sys_vgui(".x%x.c delete %xGRID\n", glist_getcanvas(glist), x); - sys_vgui(".x%x.c delete %xLINIA\n", glist_getcanvas(x->x_glist), x); - } - /* v 0.2 -- elimina el marc de la casella seleccionada */ - if(x->x_pos_selected > -1){ - sys_vgui(".x%x.c delete %xGRASP\n", glist_getcanvas(glist), x); - x->x_pos_selected = -1; - } - eliminar_imatges_temporals(maxim); -} - -/* mètode de la clase que escriu un missatge al rebre un bang */ -void videogrid_bang(t_videogrid *x) -{ - /* post("Hello videogrid !!"); */ - escriuCua(&x->x_cua); -} - -/* mètode de la classe que es dispara al rebre una entrada de missatge amb [putvideo +string( com a paràmetre */ -void videogrid_putvideo(t_videogrid *x, t_symbol *entrada) -{ - /* comprova que existeixi el fitxer */ - FILE *fitxer; - path e; - strcpy(e,entrada->s_name); - /* post("putvideo de %s\n", e); */ - - fitxer = fopen(e,"r"); - if (!fitxer) { - post("Videogrid: Problem opening file %s.\n",e); - } - else { - /* post("s'encua la imatge %s\n", e); */ - videogrid_afegir_imatge(x,e); - /*outlet_symbol(x->x_sortida, entrada);*/ - } - /* post("putvideo amb img = %s\n", e); */ -} - -/* mètode de la classe que es dispara al rebre una entrada de missatge amb [putvideodir +string( com a paràmetre */ -void *videogrid_putvideodir_thread(t_videogrid *x) -{ - DIR *dirp; - struct dirent * direntp; - path nomImatge, directoriAnterior, pathActual; - int numEncuats = 0, numPosDir = 0; - int maxim; - if ((dirp = opendir(x->x_dir_canvi)) == NULL) - { - post("Videogrid: Can not open folder %s.\n", x->x_dir_canvi); - }else{ - maxim = x->x_num_fil * x->x_num_col; - strcpy(directoriAnterior, x->x_dir_actual); - strcpy(x->x_dir_actual, x->x_dir_canvi); - /* si es el mateix directori entrat l'ultim busca la ultima imatge afegida per a seguir a encuant a partir d'ella en endavant */ - if(strcmp(directoriAnterior, x->x_dir_actual) == 0){ - /* post("Videogrid: Repeteix directori %s\n", x->x_dir_actual); */ - while ( (direntp = readdir( dirp )) != NULL ){ - /* es descarta el mateix directori, el directori anterior i tot el que no sigui un fitxer regular */ - if((strcmp(direntp->d_name,"..") != 0)&&(strcmp(direntp->d_name,".") != 0)&&(direntp->d_type == DT_REG)){ - /* incrementa la posició en el directori */ - numPosDir++; - /* assolir la posició anterior en el directori */ - if(numPosDir > x->x_dir_pos){ - /* si el nombre de nodes encuats per aquest directori no supera el màxim encua el nou node */ - if(numEncuats < maxim){ - /* post("s'encua la imatge %s\n", direntp->d_name); */ - /* concatena el path i el nom de la imatge */ - strcpy(nomImatge,direntp->d_name); - strcpy(pathActual,x->x_dir_actual); - strcat(pathActual,"/"); - strcat(pathActual,nomImatge); - pthread_mutex_lock(&x->x_lock); - videogrid_afegir_imatge(x, pathActual); - pthread_mutex_unlock(&x->x_lock); - /* incrementa en 1 per indicar el nombre de nodes encuats per aquest directori */ - numEncuats++; - /* es desa la posició en el directori de l'últim node encuat */ - x->x_dir_pos = numPosDir; - } - } - } - } - }else{ - /* directori diferent omple la cua començant pel primer fitxer */ - /* post("Videogrid: Nou directori %s \n", x->x_dir_actual); */ - while ( (direntp = readdir( dirp )) != NULL ){ - /* es descarta el mateix directori, el directori anterior i tot el que no sigui un fitxer regular */ - if((strcmp(direntp->d_name,"..") != 0)&&(strcmp(direntp->d_name,".") != 0)&&(direntp->d_type == DT_REG)){ - /* incrementa la posició en el directori */ - numPosDir++; - /* si el nombre de nodes encuats per aquest directori no supera el màxim enca el nou node */ - if(numEncuats < maxim){ - /* post("s'encua la imatge %s\n", direntp->d_name); */ - /* concatena el path i el nom de la imatge */ - strcpy(nomImatge,direntp->d_name); - strcpy(pathActual,x->x_dir_actual); - strcat(pathActual,"/"); - strcat(pathActual,nomImatge); - pthread_mutex_lock(&x->x_lock); - videogrid_afegir_imatge(x, pathActual); - pthread_mutex_unlock(&x->x_lock); - /* incrementa en 1 per indicar el nombre de nodes encuats per aquest directori */ - numEncuats++; - /* es desa la posició en el directori de l'últim node encuat */ - x->x_dir_pos = numPosDir; - } - } - } - } - /* si la posicio de l'actual es la de l'utim fitxer del directori, inicialitza la posició */ - if(x->x_dir_pos >= numPosDir) x->x_dir_pos = 0; - closedir(dirp); - } - /* escriu l'argument entrat */ - /* post("Obtenint imatges del directori: %s ...",x->x_dir_canvi); */ - /* envia a la sorida l'argument entrat */ - /* outlet_symbol(x->x_sortida, entrada); */ - pthread_exit(NULL); -} - -void videogrid_putvideodir(t_videogrid *x, t_symbol *entrada) -{ - - pthread_t unthread; - pthread_attr_t unatribut; - pthread_attr_init( &unatribut ); - - strcpy(x->x_dir_canvi,entrada->s_name); - - // ---------------- THREAD CREAT ------------------------- - pthread_mutex_init(&x->x_lock, NULL); - pthread_create(&unthread,&unatribut,(void *)videogrid_putvideodir_thread, x); - pthread_mutex_destroy(&x->x_lock); -} - - -/* v 0.2 -- mètode de la classe que desmarca la cel·la seleccionada */ -static void videogrid_ungrasp_selected(t_videogrid *x) -{ - /* post("Ungrasp selected thumb %d", x->x_pos_selected); */ - if(x->x_pos_selected > -1) { - sys_vgui(".x%x.c delete %xGRASP\n", glist_getcanvas(x->x_glist), x); - x->x_pos_selected = -1; - } -} - -/* v 0.2 -- mètode de la classe que marca la cel·la seleccionada */ -static void videogrid_grasp_selected(t_videogrid *x, int pos) -{ - /*printf("Grasp selected thumb %d", pos);*/ - if(pos != x->x_pos_selected) { - videogrid_ungrasp_selected(x); - /* post("Grasp selected thumb %d", pos); */ - x->x_pos_selected = pos; - /* nem per aqui ---- */ - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill {} -tags %xGRASP -outline %s -width %d\n", - glist_getcanvas(x->x_glist), - text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected), text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected), - text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected) + W_CELL, text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected) + H_CELL, - x,x->x_color_grasp->s_name, GRUIX + 1); - canvas_fixlinesfor(glist_getcanvas(x->x_glist), (t_text*)x); - } -} - -/* v 0.2 -- mètode de la classe que dispara l'element del taules en la posicio N [seek N( */ -void videogrid_seek(t_videogrid *x, t_floatarg postauler) -{ - /* post("seek a %d\n",postauler); */ - path pathSortida; - Node *actual; - int contador = 0; - int maxim = x->x_num_fil * x->x_num_col; - /* obtenir el path per enviar a la sortida */ - if((!cuaBuida(&x->x_cua))&&(postauler < numNodes(&x->x_cua))&&(postauler >= 0 )){ - if(x->x_tauler_primer){ - actual = x->x_tauler_primer; - while(contador <= postauler){ - if(contador == postauler){ - strcpy(pathSortida,actual->pathFitxer); - } - if(actual->seguent == NULL){ - actual = x->x_cua.davanter; - }else{ - actual = actual->seguent; - } - contador++; - } - outlet_symbol(x->x_sortida, gensym(pathSortida)); - /* post("Esta a videogrid_click amb %d %d a la posicio %d\n", x_pos, y_pos, postauler);*/ - /* v 0.2 -- marcar casella */ - videogrid_grasp_selected(x, postauler); - } - } -} - -static int videogrid_click(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) -{ - t_videogrid* x = (t_videogrid *)z; - int x_pos = xpix - text_xpix(&x->x_obj, x->x_glist); - int y_pos = ypix - text_ypix(&x->x_obj, x->x_glist); - int xa, ya, postauler; - if (doit) - { - /* obtenir la posicio en el tauler */ - // -- v 0.2 -- midoficacio pel gruix del marc // - xa = ((x_pos) / (W_CELL + GRUIX + 1)); - ya = ((y_pos) / (H_CELL + GRUIX + 1)) * x->x_num_col; - postauler = ya + xa; - // -- v 0.2 -- seleciona la casella disparant el path // - videogrid_seek(x, postauler); - } - return (1); -} - -/* v 0.2 -- mètode de la classe que buida el tauler amb el missatge [clear ( */ -void videogrid_clear(t_videogrid *x) -{ - videogrid_erase(x, x->x_glist,1); - eliminarCua(&x->x_cua); - x->x_ultima_img = 0; - x->x_dir_pos = 0; - x->x_tauler_primer = NULL; - videogrid_drawme(x, x->x_glist, 0); -} - - -static void videogrid_getrect(t_gobj *z, t_glist *glist,int *xp1, int *yp1, int *xp2, int *yp2) -{ - int cols, fils; - t_videogrid* x = (t_videogrid*)z; - cols = x->x_num_col; - fils = x->x_num_fil; - *xp1 = text_xpix(&x->x_obj, glist); - *yp1 = text_ypix(&x->x_obj, glist); - *xp2 = text_xpix(&x->x_obj, glist) + (cols*W_CELL) + ((cols + 1) * GRUIX); - *yp2 = text_ypix(&x->x_obj, glist) + (fils*H_CELL) + ((fils + 1) * GRUIX); - /* post("Esta amb el ratoli en el punt %d %d %d %d o son els vetexs de la caixa... es/bd", xp1, yp1, xp2, yp2); */ -} - -static void videogrid_displace(t_gobj *z, t_glist *glist,int dx, int dy) -{ - /* post("Entra a displace amb dx %d i dy %d", dx, dy); */ - t_videogrid *x = (t_videogrid *)z; - x->x_obj.te_xpix += dx; - x->x_obj.te_ypix += dy; - sys_vgui(".x%x.c coords %xGRID %d %d %d %d\n", - glist_getcanvas(glist), x, - text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), - text_xpix(&x->x_obj, glist) + (x->x_num_col*W_CELL) + 1 + (x->x_num_col * GRUIX) + GRUIX, text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL) + 1 + (x->x_num_fil * GRUIX) + GRUIX); - videogrid_drawme(x, glist, 0); - canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); -} - -static void videogrid_select(t_gobj *z, t_glist *glist, int state) -{ - /* post("Entra select amb state %d", state); */ - t_videogrid *x = (t_videogrid *)z; - if (state) { - /* post("Videogrid seleccionat"); */ - sys_vgui(".x%x.c itemconfigure %xGRID -outline #0000FF\n", glist_getcanvas(glist), x); - } - else { - /* post("Videogrid deseleccionat"); */ - sys_vgui(".x%x.c itemconfigure %xGRID -outline %s\n", glist_getcanvas(glist), x, x->x_color_marc->s_name); - } -} - -static void videogrid_delete(t_gobj *z, t_glist *glist) -{ - /* post("Entra a delete"); */ - t_text *x = (t_text *)z; - canvas_deletelinesfor(glist_getcanvas(glist), x); -} - -static void videogrid_vis(t_gobj *z, t_glist *glist, int vis) -{ - /* post("Entra a vist amb vis %d", vis); */ - t_videogrid* s = (t_videogrid*)z; - if (vis) - videogrid_drawme(s, glist, 1); - else - videogrid_erase(s,glist,0); -} - - -static void videogrid_save(t_gobj *z, t_binbuf *b) -{ - /* post("Entra a save"); */ - t_videogrid *x = (t_videogrid *)z; - /* crea la cadena de paths per desar */ - /* 100 possibles paths com a màxim a 512 cada path*/ - /* char cadenaPaths[51200];*/ - char *cadenaPaths, *cadenaPathsInicials; - path ultimPath = ""; - cadenaPaths = (char *)malloc(51200*sizeof(char)); - strcpy(cadenaPaths,""); - cadenaPathsInicials = (char *)malloc(51200*sizeof(char)); - strcpy(cadenaPathsInicials,""); - /*strcpy(cadenaPaths,(char *)argv[5].a_w.w_symbol->s_name);*/ - if(!cuaBuida(&x->x_cua)) - { - Node *actual; - int maxim = x->x_num_fil * x->x_num_col; - int contador = x->x_ultima_img + 1; - - if (contador > maxim) { - contador = 0; - } - /* printf("\n contador %d i maxim %d i laultimaPOS %d \n", contador, maxim, x->x_ultima_img); */ - /* - strcat(cadenaPaths, actual->pathFitxer); - strcat(cadenaPaths, "1|\n"); - contador ++; - */ - /* prenem el davanter de la cua */ - actual=x->x_cua.davanter; - - while(contador < numNodes(&x->x_cua)){ - /* afegim els paths del davanter fins a l'ultim node al tauler */ - strcat(cadenaPaths, actual->pathFitxer); - strcat(cadenaPaths, "|"); - actual = actual->seguent; - contador ++; - } - if(actual != x->x_cua.final){ - /* ara resten els de de l'inici del tauler fins al final de la cua */ - while(actual != x->x_cua.final){ - strcat(cadenaPathsInicials, actual->pathFitxer); - strcat(cadenaPathsInicials, "|"); - actual = actual->seguent; - } - /* afegeix l'últim */ - strcat(ultimPath, actual->pathFitxer); - strcat(ultimPath, "|"); - /* afegeix l'ultim de la cua */ - strcat(cadenaPathsInicials, ultimPath); - }else{ - if(x->x_ultima_img == 0){ - strcat(ultimPath, actual->pathFitxer); - strcat(ultimPath, "|"); - strcat(cadenaPathsInicials, ultimPath); - } - } - /* ordena el paths segons aparicio en el tauler */ - strcat(cadenaPathsInicials, cadenaPaths); - /* DE MOMENT NO DESA ELS PATHS */ - strcat(cadenaPathsInicials, ""); - /* printf("%s",cadenaPathsInicials); */ - } - - binbuf_addv(b, "ssiissiisss", gensym("#X"),gensym("obj"), - x->x_obj.te_xpix, x->x_obj.te_ypix, - atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)), - x->x_name,x->x_num_fil,x->x_num_col,x->x_color_fons,x->x_color_marc,x->x_color_grasp,gensym(cadenaPathsInicials)); - binbuf_addv(b, ";"); -} - -static void videogrid_properties(t_gobj *z, t_glist *owner) -{ - char buf[900]; - t_videogrid *x=(t_videogrid *)z; - - /* post("Es crida a pdtk_videogrid dialog passant nom = %s\n fils = %d \t cols = %d \t color fons = %s \t color marc = %s\n", x->x_name->s_name, x->x_num_fil, x->x_num_col, x->x_color_fons->s_name, x->x_color_marc->s_name); */ - sprintf(buf, "pdtk_videogrid_dialog %%s %s %d %d %s %s %s\n", - x->x_name->s_name, x->x_num_fil, x->x_num_col, x->x_color_fons->s_name, x->x_color_marc->s_name, x->x_color_grasp->s_name); - /* post("videogrid_properties : %s", buf ); */ - gfxstub_new(&x->x_obj.ob_pd, x, buf); -} - -static void videogrid_dialog(t_videogrid *x, t_symbol *s, int argc, t_atom *argv) -{ - int maxim, maxdigit; - int nfil = 0; - int ncol = 0; - if ( !x ) { - post("Videogrid: error_ Attempt to alter the properties of an object that does not exist.\n"); - } - switch (argc) { - case 3: - /* versio inicial */ - if (argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT || argv[2].a_type != A_FLOAT) - { - post("Videogrid: error_ Some of the values are inconsistent in its data type.\n"); - return; - } - x->x_name = argv[0].a_w.w_symbol; - nfil = (int)argv[1].a_w.w_float; - ncol = (int)argv[2].a_w.w_float; - break; - case 5: - /* versio 0.1 */ - if (argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT || argv[2].a_type != A_FLOAT || argv[3].a_type != A_SYMBOL || argv[4].a_type != A_SYMBOL) - { - post("Videogrid: error_ Some of the values are inconsistent in its data type.\n"); - return; - } - x->x_name = argv[0].a_w.w_symbol; - nfil = (int)argv[1].a_w.w_float; - ncol = (int)argv[2].a_w.w_float; - x->x_color_fons = argv[3].a_w.w_symbol; - x->x_color_marc = argv[4].a_w.w_symbol; - break; - case 6: - /* versio 0.2 */ - if (argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT || argv[2].a_type != A_FLOAT || argv[3].a_type != A_SYMBOL || argv[4].a_type != A_SYMBOL || argv[5].a_type != A_SYMBOL) - { - post("Videogrid: error_ Some of the values are inconsistent in its data type.\n"); - return; - } - x->x_name = argv[0].a_w.w_symbol; - nfil = (int)argv[1].a_w.w_float; - ncol = (int)argv[2].a_w.w_float; - x->x_color_fons = argv[3].a_w.w_symbol; - x->x_color_marc = argv[4].a_w.w_symbol; - x->x_color_grasp = argv[5].a_w.w_symbol; - break; - default: - /* no fa res */ - break; - } - /* el màxim es fixa pel nombre de digits utilitzats pel nom de la imatge temporal */ - maxdigit = pow(10,BYTES_NUM_TEMP); - if((nfil*ncol) <= maxdigit){ - if((nfil*ncol) > 0){ - x->x_num_fil = nfil; - x->x_num_col = ncol; - }else{ - post("Videogrid: The number of rows and columns is less than the minimum allowed: 1 cell.\n",maxdigit); - } - }else{ - post("Videogrid: The number of rows and columns exceeds the maximum allowed: a total of %d cells.\n",maxdigit); - } - /* post("Videogrid: Modified values\n name = %s\n rows = %d \t cols = %d.\n", x->x_name->s_name, x->x_num_fil, x->x_num_col); */ - /* elimina els nodes no representables amb la nova configuració */ - maxim = x->x_num_fil * x->x_num_col; - int extret; - videogrid_erase(x, x->x_glist,0); - /* si hi ha més nodes a la cua que el maxim */ - while((numNodes(&x->x_cua)) > maxim){ - /* desencuem */ - extret = desencuar(&x->x_cua); - } - /* al reestablir el tamany del tauler cal saber la posició de l'últim element */ - x->x_ultima_img = numNodes(&x->x_cua) - 1; - if (x->x_ultima_img < 0) x->x_ultima_img = 0; - x->x_tauler_primer = x->x_cua.davanter; - videogrid_drawme(x, x->x_glist, 1); -} - -t_widgetbehavior videogrid_widgetbehavior; - -static void videogrid_setwidget(void) -{ - /* post("Entra a setwidget"); */ - videogrid_widgetbehavior.w_getrectfn = videogrid_getrect; - videogrid_widgetbehavior.w_displacefn = videogrid_displace; - videogrid_widgetbehavior.w_selectfn = videogrid_select; - videogrid_widgetbehavior.w_activatefn = NULL; - videogrid_widgetbehavior.w_deletefn = videogrid_delete; - videogrid_widgetbehavior.w_visfn = videogrid_vis; - /* clic del ratoli */ - videogrid_widgetbehavior.w_clickfn = videogrid_click; - -#if PD_MINOR_VERSION < 37 - videogrid_widgetbehavior.w_savefn = videogrid_save; - videogrid_widgetbehavior.w_propertiesfn = videogrid_properties; -#endif - -} - -/* el constructor de la classe*/ -static void *videogrid_new(t_symbol* name, int argc, t_atom *argv) -{ - /* instanciació del nou objecte */ - t_videogrid *x = (t_videogrid *)pd_new(videogrid_class); - /* crea una sortida per l'objecte*/ - x->x_sortida = outlet_new(&x->x_obj,&s_symbol); - /* s'obté el canvas de pd */ - x->x_glist = (t_glist*) canvas_getcurrent(); - /* posició en el tauler de la última imatge afegida */ - x->x_ultima_img = 0; - /* posició de l'últim fitxer del directori encuat */ - x->x_dir_pos = 0; - /* apuntador al primer element en el tauler */ - x->x_tauler_primer = NULL; - x->x_pos_selected = -1; - /* fixa el nom de l'objecte */ - char nom[15]; - sprintf(nom, "videogrid%d", ++videogridcount); - name = gensym(nom); - x->x_name = name; - /* amb aquest nom es prepara per poder rebre dades */ - pd_bind(&x->x_obj.ob_pd, x->x_name); - /* crea la cua de nodes */ - crearCua(&x->x_cua); - post("NEW videogrid: created with %d parameters.\n", argc); - - switch (argc) { - case 3: - /* versio inicial */ - x->x_num_fil = (int)atom_getintarg(1, argc, argv); - x->x_num_col = (int)atom_getintarg(2, argc, argv); - x->x_color_fons = gensym("#F0F0F0"); - x->x_color_marc = gensym("#0F0F0F"); - x->x_color_grasp = gensym("#F1882B"); - break; - case 5: - /* versio 0.1 */ - x->x_num_fil = (int)atom_getintarg(1, argc, argv); - x->x_num_col = (int)atom_getintarg(2, argc, argv); - x->x_color_fons = argv[3].a_w.w_symbol; - x->x_color_marc = argv[4].a_w.w_symbol; - x->x_color_grasp = gensym("#F1882B"); - break; - case 6: - /* versio 0.2 */ - x->x_num_fil = (int)atom_getintarg(1, argc, argv); - x->x_num_col = (int)atom_getintarg(2, argc, argv); - x->x_color_fons = argv[3].a_w.w_symbol; - x->x_color_marc = argv[4].a_w.w_symbol; - x->x_color_grasp = argv[5].a_w.w_symbol; - break; - case 7: - /* versio 0.1 - paths dels elsements del tauler */ - x->x_num_fil = (int)atom_getintarg(1, argc, argv); - x->x_num_col = (int)atom_getintarg(2, argc, argv); - x->x_color_fons = argv[3].a_w.w_symbol; - x->x_color_marc = argv[4].a_w.w_symbol; - x->x_color_grasp = argv[5].a_w.w_symbol; - /* - // -- llegir la cadena de paths | afegir els paths a la cua // - // -- ATENCIO! NO AFEGEIX ELS PATHS !!! // - char *cadenaPaths; - cadenaPaths = (char *)malloc(51200*sizeof(char)); - strcpy(cadenaPaths,(char *)argv[6].a_w.w_symbol->s_name); - // -- printf("Es carreguen els paths %s --- %s **** %s\n", cadenaPaths, argv[5].a_w.w_symbol->s_name,argv[3].a_w.w_symbol->s_name); // - // -- split // - char *token; - t_symbol *tt; - for ( token = strtok(argv[6].a_w.w_symbol->s_name,"|"); - token != NULL; - token = strtok(NULL,"|") ){ - tt = gensym(token); - // -- printf("AFEGINT CARREGANT %s\n",tt->s_name); // - // -- imagegrid_putimg(x,tt); // - // -- ATENCIO! NO AFEGEIX ELS PATHS !!! // - // -- imagegrid_afegir_imatge(x,tt->s_name); // - } - - token = strtok(cadenaPaths,"|"); - while(token){ - tt = gensym(token); - printf("AFEGINT CARREGANT %s\n",tt->s_name); - imagegrid_putimg(x,tt); - token = strtok(NULL,"|"); - } - free(cadenaPaths); - */ - break; - - default: - /* crea un objecte nou per defecte */ - /* post("NEW imagegrid created.\n"); */ - /* fixa el nombre de files */ - x->x_num_fil = 3; - /* fixa el nombre de columnes */ - x->x_num_col = 5; - /* colors de fons i de marc*/ - x->x_color_fons = gensym("#F0F0F0"); - x->x_color_marc = gensym("#0F0F0F"); - x->x_color_grasp = gensym("#F1882B"); - break; - } - /* printf("S'ha instanciat un videogrid anomenat %s amb les caracteristiques seguents:",x->x_name->s_name); - printf("Nombre de files %d - Nombre de columnes: %d", x->x_num_fil, x->x_num_col); */ - - return (x); -} - -static void videogrid_destroy(t_videogrid *x){ - /* elimina el contingut de la cua */ - eliminarCua(&x->x_cua); - post("Videogrid destroyed.\n"); -} - -/* generacio d'una nova classe */ -/* al carregar la nova llibreria my_lib pd intenta cridar la funció my_lib_setup */ -/* aquesta crea la nova classe i les seves propietats només un sol cop */ - -void videogrid_setup(void) -{ - /* post("Entra a setup per generar la classe videogrid"); */ - #include "videogrid.tk2c" - /* - sense pas d'arguments - videogrid_class = class_new(gensym("videogrid"), - (t_newmethod)videogrid_new, - (t_method)videogrid_destroy, - sizeof(t_videogrid), - CLASS_DEFAULT, - A_DEFSYM, - 0); - amb pas d'arguments: - */ - videogrid_class = class_new(gensym("videogrid"), - (t_newmethod)videogrid_new, - (t_method)videogrid_destroy, - sizeof(t_videogrid), - CLASS_DEFAULT, - A_GIMME, - 0); - /* class_new crea la nova classe retornant un punter al seu prototipus, - el primer argument es el nom simbolic de la classe, - el segon i tercer corresponen al constructor i destructor de la classe respectivament, - (el constructor instancia un objecte i inicialitza les seves dades cada cop que es crea un objecte - el destructor allibera la memoria reservada al destruid l'objecte per qualsevol causa) - el quart correspon a la mida de l'estructura de dades, per tal de poder reservar la memoria necessària, - el cinquè influeix en el mòde de representació gràfica del objectes. Per defecte CLASS_DEFAULT o ``0', - la resta d'arguments defineixen els arguments de l'objecte i el seu tipus, la llista acaba amb 0 - */ - - /* afegeix el mètode helloworld_bang a la classe helloworld_class */ - class_addbang(videogrid_class, videogrid_bang); - - /* afegeix el mètode videogrid_putvideo a la classe videogrid per a entrades de missatge - que inicien amb putvideo i una cadena string com a argument */ - class_addmethod(videogrid_class,(t_method)videogrid_putvideo,gensym("putvideo"), A_DEFSYMBOL, 0); - - /* afegeix el mètode videogrid_putvideodir a la classe videogrid per a entrades de missatge - que inicien amb putvideodir i una cadena string com a argument */ - class_addmethod(videogrid_class,(t_method)videogrid_putvideodir,gensym("putvideodir"), A_DEFSYMBOL, 0); - /* afegeix un metode per a modificar el valor de les propietats de l'objecte */ - class_addmethod(videogrid_class, (t_method)videogrid_dialog, gensym("dialog"), A_GIMME, 0); - /* afegeix un metode per l'obtencio de la posicio del clic del ratolí */ - class_addmethod(videogrid_class, (t_method)videogrid_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); - /* v 0.2 -- afegeix un metode netejar el contigut del tauler */ - class_addmethod(videogrid_class, (t_method)videogrid_clear, gensym("clear"), 0); - /* v 0.2 -- afegeix un metode seek #num per disparar */ - class_addmethod(videogrid_class, (t_method)videogrid_seek, gensym("seek"), A_FLOAT, 0); - /* inicia el comportament de videogrid */ - videogrid_setwidget(); - -#if PD_MINOR_VERSION >= 37 - class_setsavefn(videogrid_class,&videogrid_save); - class_setpropertiesfn(videogrid_class, videogrid_properties); -#endif - - /* afegeix el mètode videogrid_widgetbehavior al la classe videogrid per a la creació de l'element visual */ - class_setwidget(videogrid_class,&videogrid_widgetbehavior); - class_sethelpsymbol(videogrid_class, gensym("videogrid.pd")); -} Added: trunk/externals/pdvjtools/videogrid/videogrid.cpp =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.cpp (rev 0) +++ trunk/externals/pdvjtools/videogrid/videogrid.cpp 2008-05-23 22:40:19 UTC (rev 9876) @@ -0,0 +1,1574 @@ + +/* +videogrid external for Puredata +Copyright (C) 2007 Sergi Lario +sll :: slario-at-gmail.com + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <dirent.h> +#include <string.h> +#include <unistd.h> +#include <math.h> + +/* incloure les definicions de variables i + prototipus de dades i de funcions de puredata */ +#include "m_pd.h" +/* incloure estructures de dades i capceleres de funcions gàfiques bàsiques de pd */ +#include "g_canvas.h" +/* incloure estructures de dades i capceleres de funcions per traballar amb threads */ +#include "pthread.h" + +/*ffmpeg includes*/ +#include <avcodec.h> +#include <avformat.h> + +/*libquicktime includes*/ +//#include <quicktime/lqt.h> +//#include <quicktime/colormodels.h> +#include <lqt/lqt.h> +#include <lqt/colormodels.h> + + +/* &&&&&&&&&&&&&&&&&&&&&&&&&&&&& VIDEOGRID &&&&&&&&&&&&&&&&&&&&&&&&&&&&& */ + +/* definició de l'amplada i l'alçada d'una casella */ +#define W_CELL 60 +#define H_CELL 40 + +/* definició del gruix en pixels del marc del tauler */ +#define GRUIX 2 + +/* nombre de caracters per el nom del path del fitxer */ +#define BYTESNOMFITXER 512 + +/* 8bits clamp rgb values */ + +#define CLAMP8(x) (((x)<0) ? 0 : ((x>255)? 255 : (x))) + +#define BYTESNOMFITXERIMATGE 512 +#define BYTESTIPUSFROMAT 4 + +#define FORMAT_MINIATURA "ppm" +#define PATH_TEMPORAL "/tmp/vigrid_" +#define BYTES_NUM_TEMP 4 + +typedef char pathimage[BYTESNOMFITXERIMATGE]; + +typedef char tipus_format[BYTESTIPUSFROMAT]; + +#ifdef __cplusplus +extern "C" int convertir_img_ff(pathimage pathFitxer, tipus_format f, int W, int H, int posi); +#endif + +void SaveFrame(AVFrame *pFrame, int width, int height, int W, int H, int posi) +{ + FILE *pFile; + char szFilename[32]; + int nN = posi; + + /*int cont=0;*/ + + char nNstr[BYTES_NUM_TEMP]; + pathimage ig_path = PATH_TEMPORAL; + + sprintf(nNstr, "%d", nN); + strcat(ig_path,nNstr); + strcat(ig_path,"."); + strcat(ig_path,FORMAT_MINIATURA); + + // Open file + sprintf(szFilename, ig_path); + pFile=fopen(szFilename, "wb"); + if(pFile==NULL) + return; + + // Write header + fprintf(pFile, "P6\n%d %d\n255\n", W, H); + + + int w = width; + int h = height; + float k = (width/W); + float l = (height/H); + int i,j,y,x,realx; + + // Write pixel data + for(y=0; y<H; y=y++) { + for(x=0; x<W; x=x++) { + realx = ((x*k)+(3-((int)(x*k)%3)))*3; + fwrite((pFrame->data[0]+(int)(y*l)*pFrame->linesize[0])+realx, 1, 3, pFile); + } + } + + // for (i=0;i<(l*H);i=i+l) { + // for (j=0;j<(k*W);j=j+k) { + // fwrite(pFrame->data[0]+(i*pFrame->linesize[0]+j), 1, 3, pFile); + // } + // } + + // Close file + fclose(pFile); +} + +extern "C" { +int convertir_img_ff(pathimage pathFitxer, tipus_format f, int W, int H, int posi) +{ + AVFormatContext *pFormatCtx; + int i, videoStream; + AVCodecContext *pCodecCtx; + AVCodec *pCodec; + AVFrame *pFrame; + AVFrame *pFrameRGB; + AVPacket packet; + int frameFinished; + int numBytes; + uint8_t *buffer; + + int nN = posi; + + // Register all formats and codecs + av_register_all(); + + // Open video file + if(av_open_input_file(&pFormatCtx, pathFitxer, NULL, 0, NULL)!=0) + return -1; // Couldn't open file + + + // Retrieve stream information + if(av_find_stream_info(pFormatCtx)<0) + return -1; // Couldn't find stream information + + // Dump information about file onto standard error + dump_format(pFormatCtx, 0, pathFitxer, false); + + // Find the first video stream + videoStream=-1; + for(i=0; i<pFormatCtx->nb_streams; i++) + if(pFormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) + { + videoStream=i; + break; + } + if(videoStream==-1) + return -1; // Didn't find a video stream + + // Get a pointer to the codec context for the video stream + pCodecCtx=pFormatCtx->streams[videoStream]->codec; + + // Find the decoder for the video stream + pCodec=avcodec_find_decoder(pCodecCtx->codec_id); + if(pCodec==NULL) + return -1; // Codec not found + + // Open codec + if(avcodec_open(pCodecCtx, pCodec)<0) + return -1; // Could not open codec + + // Hack to correct wrong frame rates that seem to be generated by some + // codecs + // if(pCodecCtx->frame_rate>1000 && pCodecCtx->frame_rate_base==1) + // pCodecCtx->frame_rate_base=1000; + + // Allocate video frame + pFrame=avcodec_alloc_frame(); + + // Allocate an AVFrame structure + pFrameRGB=avcodec_alloc_frame(); + if(pFrameRGB==NULL) + return -1; + + // Determine required buffer size and allocate buffer + numBytes=avpicture_get_size(PIX_FMT_RGB24, pCodecCtx->width, + pCodecCtx->height); + buffer=new uint8_t[numBytes]; + + // Assign appropriate parts of buffer to image planes in pFrameRGB + avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, + pCodecCtx->width, pCodecCtx->height); + + // Read frames and save first five frames to disk + av_read_frame(pFormatCtx, &packet); + // Is this a packet from the video stream? + if(packet.stream_index==videoStream) + { + // Decode video frame + avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, + packet.data, packet.size); + + // Did we get a video frame? + if(frameFinished) + { + // Convert the image from its native format to RGB + img_convert((AVPicture *)pFrameRGB, PIX_FMT_RGB24, + (AVPicture*)pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, + pCodecCtx->height); + + // Save the frame to disk + SaveFrame(pFrameRGB, pCodecCtx->width, pCodecCtx->height, W, H, posi); + } + } + + // Free the packet that was allocated by av_read_frame + av_free_packet(&packet); + // Read frames and save first five frames to disk + av_read_frame(pFormatCtx, &packet); + // Is this a packet from the video stream? + if(packet.stream_index==videoStream) + { + // Decode video frame + avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, + packet.data, packet.size); + + // Did we get a video frame? + if(frameFinished) + { + // Convert the image from its native format to RGB + img_convert((AVPicture *)pFrameRGB, PIX_FMT_RGB24, + (AVPicture*)pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, + pCodecCtx->height); + + // Save the frame to disk + SaveFrame(pFrameRGB, pCodecCtx->width, pCodecCtx->height, W, H, posi); + } + } + + // Free the packet that was allocated by av_read_frame + av_free_packet(&packet); + //} + + // Free the RGB image + delete [] buffer; + av_free(pFrameRGB); + + // Free the YUV frame + av_free(pFrame); + + // Close the codec + avcodec_close(pCodecCtx); + + // Close the video file + av_close_input_file(pFormatCtx); + + return 0; +} +} + + +int convertir_img(pathimage pathFitxer, tipus_format f, int W, int H, int posi){ + /* + Quicktime per les conversions + */ + + /* RGB vectors */ + unsigned char * qt_rows[3]; + /* YUV vesctor frame */ + unsigned char *qt_frame = NULL; + /* quicktime decoder */ + quicktime_t *qt; + /* quicktime color model */ + int qt_cmodel; + + int nN = posi; + int x_vwidth = 0; + int x_vheight = 0; + /* convertir(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); */ + qt = quicktime_open(pathFitxer, 1, 0); + + if (!(qt)){ + /* post("videogrid: error opening qt file"); */ + return -1; + } + + if (!quicktime_has_video(qt)) { + /* post("videogrid: no video stream"); */ + quicktime_close(qt); + return -1; + + } + else if (!quicktime_supported_video(qt,0)) { + /* post("videogrid: unsupported video codec\n"); */ + quicktime_close(qt); + return -1; + } + else + { + qt_cmodel = BC_YUV420P; + x_vwidth = quicktime_video_width(qt,0); + x_vheight = quicktime_video_height(qt,0); + + + free(qt_frame); + qt_frame = (unsigned char*)malloc(x_vwidth*x_vheight*4); + + int size = x_vwidth * x_vheight; + qt_rows[0] = &qt_frame[0]; + qt_rows[2] = &qt_frame[size]; + qt_rows[1] = &qt_frame[size + (size>>2)]; + + quicktime_set_cmodel(qt, qt_cmodel); + } + + /* int length = quicktime_video_length(qt,0); */ + /* int Vpos = quicktime_video_position(qt,0); */ + lqt_decode_video(qt, qt_rows, 0); + + switch(qt_cmodel){ + case BC_YUV420P: + printf(" "); + /* post("videogrid: qt colormodel : BC_YUV420P"); */ + + /* per a fer la miniatura + cada k colomnes pillem una + cada l files pillem una */ + int w = x_vwidth; + int h = x_vheight; + int k = (w/W); + int l = (h/H); + + /*int cont=0;*/ + + char nNstr[BYTES_NUM_TEMP]; + pathimage ig_path = PATH_TEMPORAL; + + sprintf(nNstr, "%d", nN); + strcat(ig_path,nNstr); + strcat(ig_path,"."); + strcat(ig_path,FORMAT_MINIATURA); + /* printf("Creacio de la imatge %s ...",ig_path); */ + /* escriu el contingut de data a un arxiu. */ + FILE *fp = fopen(ig_path, "w"); + fprintf (fp, "P6\n%d %d\n255\n", W, H); + + int i,j,y,u,v,r,g,b; + + for (i=0;i<(l*H);i=i+l) { + for (j=0;j<(k*W);j=j+k) { + y=qt_rows[0][(w*i+j)]; + u=qt_rows[1][(w/2)*(i/2)+(j/2)]; + v=qt_rows[2][(w/2)*(i/2)+(j/2)]; + r = CLAMP8(y + 1.402 *(v-128)); + g = CLAMP8(y - 0.34414 *(u-128) - 0.71414 *(v-128)); + b = CLAMP8(y + 1.772 *(u-128)); + fprintf (fp, "%c%c%c", r,g,b); + } + } + + /* escriu el contingut de data a un arxiu.*/ + fclose (fp); + } + return 0; +} + + +typedef char path[BYTESNOMFITXER]; + + +/* estructura de dades: un node de la cua */ +struct node +{ + /* nom del path de la imatge */ + path pathFitxer; + /* apuntador al següent node en cua */ + struct node *seguent; +}; + +/* definició del tipus node */ +typedef struct node Node; + +/* estructures i tipus de dades de la cua */ +/* definició del tipus de cua */ +typedef struct +{ + Node *davanter; + Node *final; +}Cua; + +/* declaracions de les funcions */ + +/* crea una cua */ +void crearCua(Cua *cua); +/* encuara un element al final de la cua */ +void encuar (Cua *cua, path x); +/* elimina un element de la cua */ +int desencuar (Cua *cua); +/* retorna si la cua és buida */ +int cuaBuida(Cua *cua); +/* elimina el contingut de la cua */ +void eliminarCua(Cua *cua); +/* retorna el nombre de nodes de la cua */ +int numNodes(Cua *cua); +/* escriu el contingut de la cua */ +void escriuCua(Cua *cua); + + +/* implementació de les funcions */ +void crearCua(Cua *cua) +{ + cua->davanter=cua->final=NULL; +} + +/* funció que encua el node al final de la cua */ +void encuar (Cua *cua, path x) +{ + Node *nou; + nou=(Node*)malloc(sizeof(Node)); + strcpy(nou->pathFitxer,x); + nou->seguent=NULL; + if(cuaBuida(cua)) + { + cua->davanter=nou; + } + else + cua->final->seguent=nou; + cua->final=nou; +} + +/* elimina l'element del principi de la cua */ +int desencuar (Cua *cua) +{ + if(!cuaBuida(cua)) + { + Node *nou; + nou=cua->davanter; + cua->davanter=cua->davanter->seguent; + free(nou); + return 1; + } + else + { + /* printf("Cua buida\a\n"); */ + return 0; + } + +} + +/* funció que retorna si la cua és buida */ +int cuaBuida(Cua *cua) +{ + return (cua->davanter==NULL); +} + +/* elimina el contingut de la cua */ +void eliminarCua(Cua *cua) +{ + while (!cuaBuida(cua)) desencuar(cua); + printf("Cua eliminada\n"); +} + +/* funció que retorna el nombre de nodes de la cua */ +int numNodes(Cua *cua) +{ + int contador=0; + Node *actual; + actual=cua->davanter; + if(actual) contador=1; + while((actual)&&(actual != cua->final)){ + contador ++; + actual = actual->seguent; + } + return (contador); +} + +/* funció que escriu la cua de nodes per la sortida estàndard */ +void escriuCua(Cua *cua) +{ + if(!cuaBuida(cua)) + { + Node *actual; + actual=cua->davanter; + printf("CUA DE NODES\n["); + do{ + printf("#%s#",actual->pathFitxer); + actual = actual->seguent; + }while(actual); + printf("]\n"); + + } + else + printf("Cua buida\n"); +} + + +/* crear un apuntador al nou objecte */ +static t_class *videogrid_class; +/* indica el nombre de videogrid creats - utilitzat per diferenciar el nom d'instàncies d'objectes del mateix tipus */ +static int videogridcount = 0; + +/* definició de la classe i la seva estructura de dades */ + +typedef struct _videogrid { + t_object x_obj; + /* declaració de la sortida de l'objecte */ + t_outlet *x_sortida; + /* llista d'objectes gràfics */ + t_glist *x_glist; + /* nombre de files */ + int x_num_fil; + /* nombre de columnes */ + int x_num_col; + /* posició de la última imatge en el tauler */ + int x_ultima_img; + /* path del directori actual */ + path x_dir_actual; + /* path del directori a canviar */ + path x_dir_canvi; + /* posicio ultim al directori actual */ + int x_dir_pos; + /* apuntador al primer element posicionat al tauler */ + Node *x_tauler_primer; + /* cua d'imatges */ + Cua x_cua; + /* nom de l'objecte */ + t_symbol *x_name; + /* color de fons */ + t_symbol *x_color_fons; + /* color del marge */ + t_symbol *x_color_marc; + /* mutex per evitar concurrencia sobre la cua al accedir diferents threads*/ + pthread_mutex_t x_lock; + /* v 0.2 -- posicó de la cel·la seleccionada */ + int x_pos_selected; + /* v 0.2 -- color de seleccio */ + t_symbol *x_color_grasp; + +} t_videogrid; + +void load_tk_procs () { + // ########### procediments per videogrid -- slario(at)gmail.com [a partir del codi del grid de l'Ives: ydegoyon(at)free.fr] ######### + sys_gui("proc videogrid_apply {id} {\n"); + // strip "." from the TK id to make a variable name suffix + sys_gui("set vid [string trimleft $id .]\n"); + // for each variable, make a local variable to hold its name... + sys_gui("set var_graph_name [concat graph_name_$vid]\n"); + sys_gui("global $var_graph_name\n"); + sys_gui("set var_graph_num_fil [concat graph_num_fil_$vid]\n"); + sys_gui("global $var_graph_num_fil\n"); + sys_gui("set var_graph_num_col [concat graph_num_col_$vid]\n"); + sys_gui("global $var_graph_num_col\n"); + sys_gui("set var_graph_color_fons [concat graph_color_fons_$vid]\n"); + sys_gui("global $var_graph_color_fons\n"); + sys_gui("set var_graph_color_marc [concat graph_color_marc_$vid]\n"); + sys_gui("global $var_graph_color_marc\n"); + sys_gui("set var_graph_color_grasp [concat graph_color_grasp_$vid]\n"); + sys_gui("global $var_graph_color_grasp\n"); + sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_name] [eval concat $$var_graph_num_fil] [eval concat $$var_graph_num_col] [eval concat $$var_graph_color_fons] [eval concat $$var_graph_color_marc] [eval concat $$var_graph_color_grasp] \\;]\n"); + // puts stderr $cmd + sys_gui("pd $cmd\n"); + sys_gui("}\n"); + sys_gui("proc videogrid_cancel {id} {\n"); + sys_gui("set cmd [concat $id cancel \\;]\n"); + // puts stderr $cmd + sys_gui("pd $cmd\n"); + sys_gui("}\n"); + sys_gui("proc videogrid_ok {id} {\n"); + sys_gui("videogrid_apply $id\n"); + sys_gui("videogrid_cancel $id\n"); + sys_gui("}\n"); + sys_gui("proc pdtk_videogrid_dialog {id name num_fil num_col color_fons color_marc color_grasp} {\n"); + sys_gui("set vid [string trimleft $id .]\n"); + sys_gui("set var_graph_name [concat graph_name_$vid]\n"); + sys_gui("global $var_graph_name\n"); + sys_gui("set var_graph_num_fil [concat graph_num_fil_$vid]\n"); + sys_gui("global $var_graph_num_fil\n"); + sys_gui("set var_graph_num_col [concat graph_num_col_$vid]\n"); + sys_gui("global $var_graph_num_col\n"); + sys_gui("set var_graph_color_fons [concat graph_color_fons_$vid]\n"); + sys_gui("global $var_graph_color_fons\n"); + sys_gui("set var_graph_color_marc [concat graph_color_marc_$vid]\n"); + sys_gui("global $var_graph_color_marc\n"); + sys_gui("set var_graph_color_grasp [concat graph_color_grasp_$vid]\n"); + sys_gui("global $var_graph_color_grasp\n"); + sys_gui("set $var_graph_name $name\n"); + sys_gui("set $var_graph_num_fil $num_fil\n"); + sys_gui("set $var_graph_num_col $num_col\n"); + sys_gui("set $var_graph_color_fons $color_fons\n"); + sys_gui("set $var_graph_color_marc $color_marc\n"); + sys_gui("set $var_graph_color_grasp $color_grasp\n"); + sys_gui("toplevel $id\n"); + sys_gui("wm title $id {videogrid}\n"); + sys_gui("wm protocol $id WM_DELETE_WINDOW [concat videogrid_cancel $id]\n"); + sys_gui("label $id.label -text {VIDEOGRID PROPERTIES}\n"); + sys_gui("pack $id.label -side top\n"); + sys_gui("frame $id.buttonframe\n"); + sys_gui("pack $id.buttonframe -side bottom -fill x -pady 2m\n"); + sys_gui("button $id.buttonframe.cancel -text {Cancel} -command \"videogrid_cancel $id\"\n"); + sys_gui("button $id.buttonframe.apply -text {Apply} -command \"videogrid_apply $id\"\n"); + sys_gui("button $id.buttonframe.ok -text {OK} -command \"videogrid_ok $id\"\n"); + sys_gui("pack $id.buttonframe.cancel -side left -expand 1\n"); + sys_gui("pack $id.buttonframe.apply -side left -expand 1\n"); + sys_gui("pack $id.buttonframe.ok -side left -expand 1\n"); + sys_gui("frame $id.1rangef\n"); + sys_gui("pack $id.1rangef -side top\n"); + sys_gui("label $id.1rangef.lname -text \"Name :\"\n"); + sys_gui("entry $id.1rangef.name -textvariable $var_graph_name -width 7\n"); + sys_gui("pack $id.1rangef.lname $id.1rangef.name -side left\n"); + sys_gui("frame $id.2rangef\n"); + sys_gui("pack $id.2rangef -side top\n"); + sys_gui("label $id.2rangef.lnum_fil -text \"Rows :\"\n"); + sys_gui("entry $id.2rangef.num_fil -textvariable $var_graph_num_fil -width 7\n"); + sys_gui("pack $id.2rangef.lnum_fil $id.2rangef.num_fil -side left\n"); + sys_gui("frame $id.3rangef\n"); + sys_gui("pack $id.3rangef -side top\n"); + sys_gui("label $id.3rangef.lnum_col -text \"Cols :\"\n"); + sys_gui("entry $id.3rangef.num_col -textvariable $var_graph_num_col -width 7\n"); + sys_gui("pack $id.3rangef.lnum_col $id.3rangef.num_col -side left\n"); + sys_gui("frame $id.4rangef\n"); + sys_gui("pack $id.4rangef -side top\n"); + sys_gui("label $id.4rangef.lcolor_fons -text \"Bg Color :\"\n"); + sys_gui("entry $id.4rangef.color_fons -textvariable $var_graph_color_fons -width 7\n"); + sys_gui("pack $id.4rangef.lcolor_fons $id.4rangef.color_fons -side left\n"); + sys_gui("frame $id.5rangef\n"); + sys_gui("pack $id.5rangef -side top\n"); + sys_gui("label $id.5rangef.lcolor_marc -text \"Border Color :\"\n"); + sys_gui("entry $id.5rangef.color_marc -textvariable $var_graph_color_marc -width 7\n"); + sys_gui("pack $id.5rangef.lcolor_marc $id.5rangef.color_marc -side left\n"); + sys_gui("frame $id.6rangef\n"); + sys_gui("pack $id.6rangef -side top\n"); + sys_gui("label $id.6rangef.lcolor_grasp -text \"Sel Color :\"\n"); + sys_gui("entry $id.6rangef.color_grasp -textvariable $var_graph_color_grasp -width 7\n"); + sys_gui("pack $id.6rangef.lcolor_grasp $id.6rangef.color_grasp -side left\n"); + sys_gui("bind $id.1rangef.name <KeyPress-Return> [concat videogrid_ok $id]\n"); + sys_gui("bind $id.2rangef.num_fil <KeyPress-Return> [concat videogrid_ok $id]\n"); + sys_gui("bind $id.3rangef.num_col <KeyPress-Return> [concat videogrid_ok $id]\n"); + sys_gui("bind $id.4rangef.color_fons <KeyPress-Return> [concat videogrid_ok $id]\n"); + sys_gui("bind $id.5rangef.color_marc <KeyPress-Return> [concat videogrid_ok $id]\n"); + sys_gui("bind $id.6rangef.color_grasp <KeyPress-Return> [concat videogrid_ok $id]\n"); + sys_gui("focus $id.1rangef.name\n"); + sys_gui("}\n"); + sys_gui("proc table {w content args} {\n"); + sys_gui("frame $w -bg black\n"); + sys_gui("set r 0\n"); + sys_gui("foreach row $content {\n"); + sys_gui("set fields {}\n"); + sys_gui("set c 0\n"); + sys_gui("foreach col $row {\n"); + // lappend fields [label $w.$r/$c -text $col] + sys_gui("set img [image create photo -file $col]\n"); + sys_gui("lappend fields [label $w.$r/$c -image $img]\n"); + sys_gui("incr c\n"); + sys_gui("}\n"); + sys_gui("eval grid $fields -sticky news -padx 1 -pady 1\n"); + sys_gui("incr r\n"); + sys_gui("}\n"); + sys_gui("set w\n"); + sys_gui("}\n"); + sys_gui("proc pdtk_videogrid_table {id name num_fil num_col} {\n"); + sys_gui("table .tauler {\n"); + sys_gui("{sll80x60.gif 3160x120.gif sll80x60.gif}\n"); + sys_gui("{sll80x60.gif sll80x60.gif sll80x60.gif}\n"); + sys_gui("{sll80x60.ppm sll80x60.gif 3160x120.gif}\n"); + sys_gui("}\n"); + sys_gui("pack .tauler\n"); + sys_gui("}\n"); +} + +/* calcula la posició x del tauler a partir de la posició de l'element de la cua (d'esquerra a dreta) */ +int getX(t_videogrid* x, int posCua){ + int c = x->x_num_col; + int xpos = (posCua % c) * W_CELL + ((posCua % c) + 1) * GRUIX; + return(xpos + 1); +} + +/* calcula la posició y del tauler a partir de la posició de l'element de la cua (de dalt a baix) */ +int getY(t_videogrid* x, int posCua){ + int c = x->x_num_col; + int ypos = (posCua / c) * H_CELL + ((posCua / c) + 1) * GRUIX; + return(ypos + 1); +} + +/* elimina les imatges temporals */ +void eliminar_imatges_temporals(int maxim){ + FILE *fitxer; + path path_total; + int contador = 0; + char contador_str[BYTES_NUM_TEMP]; + while(contador < maxim){ + strcpy(path_total,PATH_TEMPORAL); + sprintf(contador_str,"%d", contador); + strcat(path_total,contador_str); + strcat(path_total,"."); + strcat(path_total,FORMAT_MINIATURA); + /* elimina el fitxer si no hi ha cap problema */ + if(unlink(path_total)){ + /* post("Imatge temporal %s eliminada\n",path_total); */ + } + contador++; + } + /* post("Videogrid: Imatges temporals eliminades\n",path_total); */ +} + +int format_adequat_v(path nomF){ + int retorn = 0; + path ig_path = ""; + strcat(ig_path,nomF); + char *t1; + path extensio = ""; + for ( t1 = strtok(ig_path,"."); + t1 != NULL; + t1 = strtok(NULL,".") ) + strcpy(extensio,t1); + if(strcmp(extensio,"mov")==0) retorn = 1; + /* + if(strcmp(extensio,"eps")==0) retorn = 1; + if(strcmp(extensio,"gif")==0) retorn = 1; + if(strcmp(extensio,"jpg")==0) retorn = 1; + if(strcmp(extensio,"jpeg")==0) retorn = 1; + if(strcmp(extensio,"png")==0) retorn = 1; + if(strcmp(extensio,"ppm")==0) retorn = 1; + if(strcmp(extensio,"tif")==0) retorn = 1; + if(strcmp(extensio,"tiff")==0) retorn = 1; + */ + + return (retorn); +} + +/* afegir una imatge al grid */ +void videogrid_afegir_imatge(t_videogrid *x, path entrada) +{ + int maxim; + char nNstr[BYTES_NUM_TEMP]; + int pos = 0; + /* escriu l'argument entrat */ + /* post("Afegint la imatge %s ...",entrada); */ + maxim = x->x_num_fil * x->x_num_col; + path ig_path = PATH_TEMPORAL; + + /* si hi ha tants nodes a la cua com el maxim */ + if((numNodes(&x->x_cua)) >= maxim){ + /* desencua */ + int extret; + extret = desencuar(&x->x_cua); + /* obtenir la posició en la cua del nou node */ + if(x->x_ultima_img == maxim-1) { + pos = 0; + }else{ + pos = x->x_ultima_img+1; + } + sys_vgui(".x%x.c delete %xS%d\n", glist_getcanvas(x->x_glist), x, pos); + } + /* encua el nou node */ + encuar(&x->x_cua, entrada); + /* si no és el primer element a encuar incrementem la posicio de la última imatge insertada */ + if(numNodes(&x->x_cua) != 1) x->x_ultima_img ++; + /* si assoleix el maxim torna a començar, inicialitzant la posició en el tauler de la última imatge insertada */ + if(x->x_ultima_img == maxim) x->x_ultima_img = 0; + + /* + Quicktime per les conversions + */ + int nN = x->x_ultima_img; + if (format_adequat_v(entrada) == 1) { + convertir_img(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); + } else { + convertir_img_ff(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); + } + + sprintf(nNstr, "%d", nN); + strcat(ig_path,nNstr); + strcat(ig_path,"."); + strcat(ig_path,FORMAT_MINIATURA); + /*printf("Creacio de la imatge %s ...",ig_path);*/ + sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); + /* printf("1. Creacio de la imatge %s ...",ig_path); */ + sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", + glist_getcanvas(x->x_glist), + text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), + text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2), + x,nN,x,nN); + /* printf("2. Creacio de la imatge %s ...",ig_path); */ + if(nN == 0){ + x->x_tauler_primer = x->x_cua.final; + /* post("Ara el primer del tauler es %s\n",x->x_tauler_primer->pathFitxer); */ + } + /* printf("SURT de la creacio de la imatge %s ...",ig_path); */ + /* + sys_vgui("image create photo img%x -file %s\n",x,entrada); + sys_vgui(".x%x.c create image %d %d -image img%x -tags %xS\n", + glist_getcanvas(glist),text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x,x); + */ +} + +/* dibuixa videogrid */ +void videogrid_drawme(t_videogrid *x, t_glist *glist, int firsttime) +{ + /* post("Entra a drawme amb firsttime: %d", firsttime); */ + if (firsttime) { + char name[MAXPDSTRING]; + canvas_makefilename(glist_getcanvas(x->x_glist), x->x_name->s_name, name, MAXPDSTRING); + sys_vgui(".x%x.c create rectangle %d %d %d %d -fill %s -tags %xGRID -outline %s\n", + glist_getcanvas(glist), + text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), + text_xpix(&x->x_obj, glist) + (x->x_num_col * W_CELL) + 1 + (x->x_num_col * GRUIX) + GRUIX, text_ypix(&x->x_obj, glist) + (x->x_num_fil * H_CELL) + 1 + (x->x_num_fil * GRUIX) + GRUIX, + x->x_color_fons->s_name, x,x->x_color_marc->s_name); + + canvas_fixlinesfor(glist_getcanvas(glist), (t_text*)x); + /* si hi elements a la cua els afegeix (redimensió) */ + if(!cuaBuida(&x->x_cua)) + { + path ig_path; + int nN = 0; + char nNstr[BYTES_NUM_TEMP]; + Node *actual; + actual=x->x_cua.davanter; + do{ + strcpy(ig_path,PATH_TEMPORAL); + sprintf(nNstr, "%d", nN); + strcat(ig_path,nNstr); + strcat(ig_path,"."); + strcat(ig_path,FORMAT_MINIATURA); + /* post("reestablint la imatge %s", actual->pathFitxer); */ + // videogrid_afegir_imatge(x,actual->pathFitxer); + convertir_img(actual->pathFitxer,FORMAT_MINIATURA, W_CELL, H_CELL, nN); + sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); + sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", + glist_getcanvas(x->x_glist),text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2),x,nN,x,nN); + actual = actual->seguent; + nN++; + }while(actual); + } + } + else { + sys_vgui(".x%x.c coords %xGRID %d %d %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),text_xpix(&x->x_obj, glist) + (x->x_num_col*W_CELL) + 1 + (x->x_num_col * GRUIX) + GRUIX, text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL) + 1 + (x->x_num_fil * GRUIX) + GRUIX); + if(!cuaBuida(&x->x_cua)) + { + int contador = 0; + while(contador < numNodes(&x->x_cua)){ + sys_vgui(".x%x.c coords %xS%d \ + %d %d\n", + glist_getcanvas(glist), x, contador, + text_xpix(&x->x_obj, x->x_glist) + getX(x,contador) + (W_CELL/2), text_ypix(&x->x_obj, x->x_glist) + getY(x,contador) + (H_CELL/2)); + contador++; + } + + /* char buf[800]; + sprintf(buf, "pdtk_videogrid_table %%s %s %d %d\n", x->x_name->s_name, x->x_num_fil, x->x_num_col); + gfxstub_new(&x->x_obj.ob_pd, x, buf); */ + } + if (x->x_pos_selected > -1){ + sys_vgui(".x%x.c coords %xGRASP %d %d %d %d\n", glist_getcanvas(glist), x, + text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected), text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected), + text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected) + W_CELL, text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected) + H_CELL); + } + sys_vgui(".x%x.c delete %xLINIA\n", glist_getcanvas(x->x_glist), x); + } + int xI = text_xpix(&x->x_obj, glist); + int yI = text_ypix(&x->x_obj, glist); + int xF = xI + (x->x_num_col * W_CELL) + ((x->x_num_col + 1) * GRUIX); + int yF = yI + (x->x_num_fil * H_CELL) + ((x->x_num_fil + 1) * GRUIX); + int vlines = 0; + int xi = 0; + while(vlines < x->x_num_col){ + xi = xI + getX(x,vlines) - GRUIX + 1; + sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xi, yI, xi, yF, x->x_color_marc->s_name,GRUIX,x); + vlines++; + } + xi = xi + W_CELL + GRUIX; + sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xi, yI, xi, yF, x->x_color_marc->s_name,GRUIX,x); + int hlines = 0; + int yi = 0; + while(hlines < x->x_num_fil){ + yi = yI + ((H_CELL + GRUIX) * hlines) + 2; + sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xI, yi, xF, yi, x->x_color_marc->s_name,GRUIX,x); + hlines++; + } + yi = yi + H_CELL + GRUIX; + sys_vgui(".x%x.c create line %d %d %d %d -fill %s -width %d -tag %xLINIA\n", glist_getcanvas(x->x_glist), xI, yi, xF, yi, x->x_color_marc->s_name,GRUIX,x); +} + +/* borra videogrid v 0.2 -- int toclear */ +void videogrid_erase(t_videogrid* x,t_glist* glist, int toclear) +{ + int maxim = x->x_num_fil * x->x_num_col; + path path_total; + char contador_str[BYTES_NUM_TEMP]; + /* post("Entra a erase"); */ + /* elimina les imatges */ + int contador = 0; + while(contador < numNodes(&x->x_cua)){ + + sys_vgui(".x%x.c delete %xS%d\n", glist_getcanvas(x->x_glist), x, contador); + strcpy(path_total,PATH_TEMPORAL); + sprintf(contador_str,"%d", contador); + strcat(path_total,contador_str); + strcat(path_total,"."); + strcat(path_total,FORMAT_MINIATURA); + if(unlink(path_total)){ + /* post("Imatge temporal %s eliminada\n",path_total); */ + } + contador++; + } + + /* elimina el grid v 0.2 -- excepte quan es fa un clear */ + if(toclear == 0){ + sys_vgui(".x%x.c delete %xGRID\n", glist_getcanvas(glist), x); + sys_vgui(".x%x.c delete %xLINIA\n", glist_getcanvas(x->x_glist), x); + } + /* v 0.2 -- elimina el marc de la casella seleccionada */ + if(x->x_pos_selected > -1){ + sys_vgui(".x%x.c delete %xGRASP\n", glist_getcanvas(glist), x); + x->x_pos_selected = -1; + } + eliminar_imatges_temporals(maxim); +} + +/* mètode de la clase que escriu un missatge al rebre un bang */ +void videogrid_bang(t_videogrid *x) +{ + /* post("Hello videogrid !!"); */ + escriuCua(&x->x_cua); +} + +/* mètode de la classe que es dispara al rebre una entrada de missatge amb [putvideo +string( com a paràmetre */ +void videogrid_putvideo(t_videogrid *x, t_symbol *entrada) +{ + /* comprova que existeixi el fitxer */ + FILE *fitxer; + path e; + strcpy(e,entrada->s_name); + /* post("putvideo de %s\n", e); */ + + fitxer = fopen(e,"r"); + if (!fitxer) { + post("Videogrid: Problem opening file %s.\n",e); + } + else { + /* post("s'encua la imatge %s\n", e); */ + videogrid_afegir_imatge(x,e); + /*outlet_symbol(x->x_sortida, entrada);*/ + } + /* post("putvideo amb img = %s\n", e); */ +} + +/* mètode de la classe que es dispara al rebre una entrada de missatge amb [putvideodir +string( com a paràmetre */ +void *videogrid_putvideodir_thread(void *z) +{ + t_videogrid *x = (t_videogrid *)z; + DIR *dirp; + struct dirent * direntp; + path nomImatge, directoriAnterior, pathActual; + int numEncuats = 0, numPosDir = 0; + int maxim; + if ((dirp = opendir(x->x_dir_canvi)) == NULL) + { + post("Videogrid: Can not open folder %s.\n", x->x_dir_canvi); + }else{ + maxim = x->x_num_fil * x->x_num_col; + strcpy(directoriAnterior, x->x_dir_actual); + strcpy(x->x_dir_actual, x->x_dir_canvi); + /* si es el mateix directori entrat l'ultim busca la ultima imatge afegida per a seguir a encuant a partir d'ella en endavant */ + if(strcmp(directoriAnterior, x->x_dir_actual) == 0){ + /* post("Videogrid: Repeteix directori %s\n", x->x_dir_actual); */ + while ( (direntp = readdir( dirp )) != NULL ){ + /* es descarta el mateix directori, el directori anterior i tot el que no sigui un fitxer regular */ + if((strcmp(direntp->d_name,"..") != 0)&&(strcmp(direntp->d_name,".") != 0)&&(direntp->d_type == DT_REG)){ + /* incrementa la posició en el directori */ + numPosDir++; + /* assolir la posició anterior en el directori */ + if(numPosDir > x->x_dir_pos){ + /* si el nombre de nodes encuats per aquest directori no supera el màxim encua el nou node */ + if(numEncuats < maxim){ + /* post("s'encua la imatge %s\n", direntp->d_name); */ + /* concatena el path i el nom de la imatge */ + strcpy(nomImatge,direntp->d_name); + strcpy(pathActual,x->x_dir_actual); + strcat(pathActual,"/"); + strcat(pathActual,nomImatge); + pthread_mutex_lock(&x->x_lock); + videogrid_afegir_imatge(x, pathActual); + pthread_mutex_unlock(&x->x_lock); + /* incrementa en 1 per indicar el nombre de nodes encuats per aquest directori */ + numEncuats++; + /* es desa la posició en el directori de l'últim node encuat */ + x->x_dir_pos = numPosDir; + } + } + } + } + }else{ + /* directori diferent omple la cua començant pel primer fitxer */ + /* post("Videogrid: Nou directori %s \n", x->x_dir_actual); */ + while ( (direntp = readdir( dirp )) != NULL ){ + /* es descarta el mateix directori, el directori anterior i tot el que no sigui un fitxer regular */ + if((strcmp(direntp->d_name,"..") != 0)&&(strcmp(direntp->d_name,".") != 0)&&(direntp->d_type == DT_REG)){ + /* incrementa la posició en el directori */ + numPosDir++; + /* si el nombre de nodes encuats per aquest directori no supera el màxim enca el nou node */ + if(numEncuats < maxim){ + /* post("s'encua la imatge %s\n", direntp->d_name); */ + /* concatena el path i el nom de la imatge */ + strcpy(nomImatge,direntp->d_name); + strcpy(pathActual,x->x_dir_actual); + strcat(pathActual,"/"); + strcat(pathActual,nomImatge); + pthread_mutex_lock(&x->x_lock); + videogrid_afegir_imatge(x, pathActual); + pthread_mutex_unlock(&x->x_lock); + /* incrementa en 1 per indicar el nombre de nodes encuats per aquest directori */ + numEncuats++; + /* es desa la posició en el directori de l'últim node encuat */ + x->x_dir_pos = numPosDir; + } + } + } + } + /* si la posicio de l'actual es la de l'utim fitxer del directori, inicialitza la posició */ + if(x->x_dir_pos >= numPosDir) x->x_dir_pos = 0; + closedir(dirp); + } + /* escriu l'argument entrat */ + /* post("Obtenint imatges del directori: %s ...",x->x_dir_canvi); */ + /* envia a la sorida l'argument entrat */ + /* outlet_symbol(x->x_sortida, entrada); */ + pthread_exit(NULL); +} + +void videogrid_putvideodir(t_videogrid *x, t_symbol *entrada) +{ + + pthread_t unthread; + pthread_attr_t unatribut; + pthread_attr_init( &unatribut ); + + strcpy(x->x_dir_canvi,entrada->s_name); + + // ---------------- THREAD CREAT ------------------------- + pthread_mutex_init(&x->x_lock, NULL); + // int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg); + pthread_create(&unthread, &unatribut, videogrid_putvideodir_thread, (void *)x); + pthread_mutex_destroy(&x->x_lock); +} + + +/* v 0.2 -- mètode de la classe que desmarca la cel·la seleccionada */ +static void videogrid_ungrasp_selected(t_videogrid *x) +{ + /* post("Ungrasp selected thumb %d", x->x_pos_selected); */ + if(x->x_pos_selected > -1) { + sys_vgui(".x%x.c delete %xGRASP\n", glist_getcanvas(x->x_glist), x); + x->x_pos_selected = -1; + } +} + +/* v 0.2 -- mètode de la classe que marca la cel·la seleccionada */ +static void videogrid_grasp_selected(t_videogrid *x, int pos) +{ + /*printf("Grasp selected thumb %d", pos);*/ + if(pos != x->x_pos_selected) { + videogrid_ungrasp_selected(x); + /* post("Grasp selected thumb %d", pos); */ + x->x_pos_selected = pos; + /* nem per aqui ---- */ + sys_vgui(".x%x.c create rectangle %d %d %d %d -fill {} -tags %xGRASP -outline %s -width %d\n", + glist_getcanvas(x->x_glist), + text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected), text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected), + text_xpix(&x->x_obj, x->x_glist) + getX(x,x->x_pos_selected) + W_CELL, text_ypix(&x->x_obj, x->x_glist) + getY(x,x->x_pos_selected) + H_CELL, + x,x->x_color_grasp->s_name, GRUIX + 1); + canvas_fixlinesfor(glist_getcanvas(x->x_glist), (t_text*)x); + } +} + +/* v 0.2 -- mètode de la classe que dispara l'element del taules en la posicio N [seek N( */ +void videogrid_seek(t_videogrid *x, t_floatarg postauler) +{ + /* post("seek a %d\n",postauler); */ + path pathSortida; + Node *actual; + int contador = 0; + int maxim = x->x_num_fil * x->x_num_col; + /* obtenir el path per enviar a la sortida */ + if((!cuaBuida(&x->x_cua))&&(postauler < numNodes(&x->x_cua))&&(postauler >= 0 )){ + if(x->x_tauler_primer){ + actual = x->x_tauler_primer; + while(contador <= postauler){ + if(contador == postauler){ + strcpy(pathSortida,actual->pathFitxer); + } + if(actual->seguent == NULL){ + actual = x->x_cua.davanter; + }else{ + actual = actual->seguent; + } + contador++; + } + outlet_symbol(x->x_sortida, gensym(pathSortida)); + /* post("Esta a videogrid_click amb %d %d a la posicio %d\n", x_pos, y_pos, postauler);*/ + /* v 0.2 -- marcar casella */ + videogrid_grasp_selected(x, postauler); + } + } +} + +static int videogrid_click(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) +{ + t_videogrid* x = (t_videogrid *)z; + int x_pos = xpix - text_xpix(&x->x_obj, x->x_glist); + int y_pos = ypix - text_ypix(&x->x_obj, x->x_glist); + int xa, ya, postauler; + if (doit) + { + /* obtenir la posicio en el tauler */ + // -- v 0.2 -- midoficacio pel gruix del marc // + xa = ((x_pos) / (W_CELL + GRUIX + 1)); + ya = ((y_pos) / (H_CELL + GRUIX + 1)) * x->x_num_col; + postauler = ya + xa; + // -- v 0.2 -- seleciona la casella disparant el path // + videogrid_seek(x, postauler); + } + return (1); +} + +/* v 0.2 -- mètode de la classe que buida el tauler amb el missatge [clear ( */ +void videogrid_clear(t_videogrid *x) +{ + videogrid_erase(x, x->x_glist,1); + eliminarCua(&x->x_cua); + x->x_ultima_img = 0; + x->x_dir_pos = 0; + x->x_tauler_primer = NULL; + videogrid_drawme(x, x->x_glist, 0); +} + + +static void videogrid_getrect(t_gobj *z, t_glist *glist,int *xp1, int *yp1, int *xp2, int *yp2) +{ + int cols, fils; + t_videogrid* x = (t_videogrid*)z; + cols = x->x_num_col; + fils = x->x_num_fil; + *xp1 = text_xpix(&x->x_obj, glist); + *yp1 = text_ypix(&x->x_obj, glist); + *xp2 = text_xpix(&x->x_obj, glist) + (cols*W_CELL) + ((cols + 1) * GRUIX); + *yp2 = text_ypix(&x->x_obj, glist) + (fils*H_CELL) + ((fils + 1) * GRUIX); + /* post("Esta amb el ratoli en el punt %d %d %d %d o son els vetexs de la caixa... es/bd", xp1, yp1, xp2, yp2); */ +} + +static void videogrid_displace(t_gobj *z, t_glist *glist,int dx, int dy) +{ + /* post("Entra a displace amb dx %d i dy %d", dx, dy); */ + t_videogrid *x = (t_videogrid *)z; + x->x_obj.te_xpix += dx; + x->x_obj.te_ypix += dy; + sys_vgui(".x%x.c coords %xGRID %d %d %d %d\n", + glist_getcanvas(glist), x, + text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), + text_xpix(&x->x_obj, glist) + (x->x_num_col*W_CELL) + 1 + (x->x_num_col * GRUIX) + GRUIX, text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL) + 1 + (x->x_num_fil * GRUIX) + GRUIX); + videogrid_drawme(x, glist, 0); + canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); +} + +static void videogrid_select(t_gobj *z, t_glist *glist, int state) +{ + /* post("Entra select amb state %d", state); */ + t_videogrid *x = (t_videogrid *)z; + if (state) { + /* post("Videogrid seleccionat"); */ + sys_vgui(".x%x.c itemconfigure %xGRID -outline #0000FF\n", glist_getcanvas(glist), x); + } + else { + /* post("Videogrid deseleccionat"); */ + sys_vgui(".x%x.c itemconfigure %xGRID -outline %s\n", glist_getcanvas(glist), x, x->x_color_marc->s_name); + } +} + +static void videogrid_delete(t_gobj *z, t_glist *glist) +{ + /* post("Entra a delete"); */ + t_text *x = (t_text *)z; + canvas_deletelinesfor(glist_getcanvas(glist), x); +} + +static void videogrid_vis(t_gobj *z, t_glist *glist, int vis) +{ + /* post("Entra a vist amb vis %d", vis); */ + t_videogrid* s = (t_videogrid*)z; + if (vis) + videogrid_drawme(s, glist, 1); + else + videogrid_erase(s,glist,0); +} + + +static void videogrid_save(t_gobj *z, t_binbuf *b) +{ + /* post("Entra a save"); */ + t_videogrid *x = (t_videogrid *)z; + /* crea la cadena de paths per desar */ + /* 100 possibles paths com a màxim a 512 cada path*/ + /* char cadenaPaths[51200];*/ + char *cadenaPaths, *cadenaPathsInicials; + path ultimPath = ""; + cadenaPaths = (char *)malloc(51200*sizeof(char)); + strcpy(cadenaPaths,""); + cadenaPathsInicials = (char *)malloc(51200*sizeof(char)); + strcpy(cadenaPathsInicials,""); + /*strcpy(cadenaPaths,(char *)argv[5].a_w.w_symbol->s_name);*/ + if(!cuaBuida(&x->x_cua)) + { + Node *actual; + int maxim = x->x_num_fil * x->x_num_col; + int contador = x->x_ultima_img + 1; + + if (contador > maxim) { + contador = 0; + } + /* printf("\n contador %d i maxim %d i laultimaPOS %d \n", contador, maxim, x->x_ultima_img); */ + /* + strcat(cadenaPaths, actual->pathFitxer); + strcat(cadenaPaths, "1|\n"); + contador ++; + */ + /* prenem el davanter de la cua */ + actual=x->x_cua.davanter; + + while(contador < numNodes(&x->x_cua)){ + /* afegim els paths del davanter fins a l'ultim node al tauler */ + strcat(cadenaPaths, actual->pathFitxer); + strcat(cadenaPaths, "|"); + actual = actual->seguent; + contador ++; + } + if(actual != x->x_cua.final){ + /* ara resten els de de l'inici del tauler fins al final de la cua */ + while(actual != x->x_cua.final){ + strcat(cadenaPathsInicials, actual->pathFitxer); + strcat(cadenaPathsInicials, "|"); + actual = actual->seguent; + } + /* afegeix l'últim */ + strcat(ultimPath, actual->pathFitxer); + strcat(ultimPath, "|"); + /* afegeix l'ultim de la cua */ + strcat(cadenaPathsInicials, ultimPath); + }else{ + if(x->x_ultima_img == 0){ + strcat(ultimPath, actual->pathFitxer); + strcat(ultimPath, "|"); + strcat(cadenaPathsInicials, ultimPath); + } + } + /* ordena el paths segons aparicio en el tauler */ + strcat(cadenaPathsInicials, cadenaPaths); + /* DE MOMENT NO DESA ELS PATHS */ + strcat(cadenaPathsInicials, ""); + /* printf("%s",cadenaPathsInicials); */ + } + + binbuf_addv(b, "ssiissiisss", gensym("#X"),gensym("obj"), + x->x_obj.te_xpix, x->x_obj.te_ypix, + atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)), + x->x_name,x->x_num_fil,x->x_num_col,x->x_color_fons,x->x_color_marc,x->x_color_grasp,gensym(cadenaPathsInicials)); + binbuf_addv(b, ";"); +} + +static void videogrid_properties(t_gobj *z, t_glist *owner) +{ + char buf[900]; + t_videogrid *x=(t_videogrid *)z; + + /* post("Es crida a pdtk_videogrid dialog passant nom = %s\n fils = %d \t cols = %d \t color fons = %s \t color marc = %s\n", x->x_name->s_name, x->x_num_fil, x->x_num_col, x->x_color_fons->s_name, x->x_color_marc->s_name); */ + sprintf(buf, "pdtk_videogrid_dialog %%s %s %d %d %s %s %s\n", + x->x_name->s_name, x->x_num_fil, x->x_num_col, x->x_color_fons->s_name, x->x_color_marc->s_name, x->x_color_grasp->s_name); + /* post("videogrid_properties : %s", buf ); */ + gfxstub_new(&x->x_obj.ob_pd, x, buf); +} + +static void videogrid_dialog(t_videogrid *x, t_symbol *s, int argc, t_atom *argv) +{ + int maxim, maxdigit; + int nfil = 0; + int ncol = 0; + if ( !x ) { + post("Videogrid: error_ Attempt to alter the properties of an object that does not exist.\n"); + } + switch (argc) { + case 3: + /* versio inicial */ + if (argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT || argv[2].a_type != A_FLOAT) + { + post("Videogrid: error_ Some of the values are inconsistent in its data type.\n"); + return; + } + x->x_name = argv[0].a_w.w_symbol; + nfil = (int)argv[1].a_w.w_float; + ncol = (int)argv[2].a_w.w_float; + break; + case 5: + /* versio 0.1 */ + if (argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT || argv[2].a_type != A_FLOAT || argv[3].a_type != A_SYMBOL || argv[4].a_type != A_SYMBOL) + { + post("Videogrid: error_ Some of the values are inconsistent in its data type.\n"); + return; + } + x->x_name = argv[0].a_w.w_symbol; + nfil = (int)argv[1].a_w.w_float; + ncol = (int)argv[2].a_w.w_float; + x->x_color_fons = argv[3].a_w.w_symbol; + x->x_color_marc = argv[4].a_w.w_symbol; + break; + case 6: + /* versio 0.2 */ + if (argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT || argv[2].a_type != A_FLOAT || argv[3].a_type != A_SYMBOL || argv[4].a_type != A_SYMBOL || argv[5].a_type != A_SYMBOL) + { + post("Videogrid: error_ Some of the values are inconsistent in its data type.\n"); + return; + } + x->x_name = argv[0].a_w.w_symbol; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9875] trunk/externals/pdvjtools/imagegrid
by sergi_ll＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9875 http://pure-data.svn.sourceforge.net/pure-data/?rev=9875&view=rev Author: sergi_ll Date: 2008-05-23 15:39:49 -0700 (Fri, 23 May 2008) Log Message: ----------- delete unused files Removed Paths: ------------- trunk/externals/pdvjtools/imagegrid/cua.c trunk/externals/pdvjtools/imagegrid/cua.h trunk/externals/pdvjtools/imagegrid/imagegrid.tk trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c trunk/externals/pdvjtools/imagegrid/magickconverter.c trunk/externals/pdvjtools/imagegrid/magickconverter.h trunk/externals/pdvjtools/imagegrid/tk2c.sh Deleted: trunk/externals/pdvjtools/imagegrid/cua.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/cua.c 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/cua.c 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,164 +0,0 @@ -/* -cue for imagegrid external -Copyright (C) 2007 Sergi Lario - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "cua.h" - -/* -- compilació: - $ gcc -c -ansi -O -Wall -Wmissing-prototypes cua.c -- muntatge: - $ gcc cua.o -o cua -- execució: - $ ./cua -*/ -/* programa principal de prova */ -/* -int main() -{ - - int opc=8; - char path[BYTESNOMFITXER]; - int ok; - Cua cua; - crearCua(&cua); - - while(opc!=5) - { - printf("\t\t\tMENU PRINCIPAL\n\n\n"); - printf("\t 1. Encuar\n"); - printf("\t 2. Desencuar\n"); - printf("\t 3. Nombre de nodes\n"); - printf("\t 4. Contingut de la cua\n"); - printf("\t 5. Sortir\n"); - - scanf("%d", &opc); - - switch(opc) - { - case 1: - printf("path a introduir:\n"); - scanf("%s", path); - encuar(&cua, path); - break; - - case 2: - ok = desencuar(&cua); - if(ok) printf("node eliminat de la cua\n"); - break; - - case 3: - printf("nombre de nodes de la cua %d\n", numNodes(&cua)); - break; - case 4: - escriuCua(&cua); - break; - case 5: - eliminarCua(&cua); - break; - } - } - getchar(); - return 0; -} -*/ -/* implementació de les funcions */ -void crearCua(Cua *cua) -{ - cua->davanter=cua->final=NULL; -} - -/* funció que encua el node al final de la cua */ -void encuar (Cua *cua, path x) -{ - Node *nou; - nou=(Node*)malloc(sizeof(Node)); - strcpy(nou->pathFitxer,x); - nou->seguent=NULL; - if(cuaBuida(cua)) - { - cua->davanter=nou; - } - else - cua->final->seguent=nou; - cua->final=nou; -} - -/* elimina l'element del principi de la cua */ -int desencuar (Cua *cua) -{ - if(!cuaBuida(cua)) - { - Node *nou; - nou=cua->davanter; - cua->davanter=cua->davanter->seguent; - free(nou); - return 1; - } - else - { - /* printf("Cua buida\a\n"); */ - return 0; - } - -} - -/* funció que retorna si la cua és buida */ -int cuaBuida(Cua *cua) -{ - return (cua->davanter==NULL); -} - -/* elimina el contingut de la cua */ -void eliminarCua(Cua *cua) -{ - while (!cuaBuida(cua)) desencuar(cua); - printf("Cua eliminada\n"); -} - -/* funció que retorna el nombre de nodes de la cua */ -int numNodes(Cua *cua) -{ - int contador=0; - Node *actual; - actual=cua->davanter; - if(actual) contador=1; - while((actual)&&(actual != cua->final)){ - contador ++; - actual = actual->seguent; - } - return (contador); -} - -/* funció que escriu la cua de nodes per la sortida estàndard */ -void escriuCua(Cua *cua) -{ - if(!cuaBuida(cua)) - { - Node *actual; - actual=cua->davanter; - printf("CUA DE NODES\n["); - do{ - printf("#%s#",actual->pathFitxer); - actual = actual->seguent; - }while(actual); - printf("]\n"); - - } - else - printf("Cua buida\n"); -} Deleted: trunk/externals/pdvjtools/imagegrid/cua.h =================================================================== --- trunk/externals/pdvjtools/imagegrid/cua.h 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/cua.h 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,47 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* nombre de caracters per el nom del path del fitxer */ -#define BYTESNOMFITXER 512 - -typedef char path[BYTESNOMFITXER]; - -/* estructures i tipus de dades de la cua */ - -/* estructura de dades: un node de la cua */ -struct node -{ - /* nom del path de la imatge */ - path pathFitxer; - /* apuntador al següent node en cua */ - struct node *seguent; -}; - -/* definició del tipus node */ -typedef struct node Node; - -/* definició del tipus de cua */ -typedef struct -{ - Node *davanter; - Node *final; -}Cua; - - -/* declaracions de les funcions */ - -/* crea una cua */ -void crearCua(Cua *cua); -/* encuara un element al final de la cua */ -void encuar (Cua *cua, path x); -/* elimina un element de la cua */ -int desencuar (Cua *cua); -/* retorna si la cua és buida */ -int cuaBuida(Cua *cua); -/* elimina el contingut de la cua */ -void eliminarCua(Cua *cua); -/* retorna el nombre de nodes de la cua */ -int numNodes(Cua *cua); -/* escriu el contingut de la cua */ -void escriuCua(Cua *cua); Deleted: trunk/externals/pdvjtools/imagegrid/imagegrid.tk =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.tk 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.tk 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,157 +0,0 @@ -############ procediments per imagegrid -- slario(at)gmail.com [a partir del codi del grid de l'Ives: ydegoyon(at)free.fr] ######### - -proc imagegrid_apply {id} { -# strip "." from the TK id to make a variable name suffix - set vid [string trimleft $id .] - -# for each variable, make a local variable to hold its name... - set var_graph_name [concat graph_name_$vid] - global $var_graph_name - set var_graph_num_fil [concat graph_num_fil_$vid] - global $var_graph_num_fil - set var_graph_num_col [concat graph_num_col_$vid] - global $var_graph_num_col - set var_graph_color_fons [concat graph_color_fons_$vid] - global $var_graph_color_fons - set var_graph_color_marc [concat graph_color_marc_$vid] - global $var_graph_color_marc - set var_graph_color_grasp [concat graph_color_grasp_$vid] - global $var_graph_color_grasp - - set cmd [concat $id dialog \ - [eval concat $$var_graph_name] \ - [eval concat $$var_graph_num_fil] \ - [eval concat $$var_graph_num_col] \ - [eval concat $$var_graph_color_fons] \ - [eval concat $$var_graph_color_marc] \ - [eval concat $$var_graph_color_grasp] \ - \;] -#puts stderr $cmd - pd $cmd -} - -proc imagegrid_cancel {id} { - set cmd [concat $id cancel \;] -#puts stderr $cmd - pd $cmd -} - -proc imagegrid_ok {id} { - imagegrid_apply $id - imagegrid_cancel $id -} - -proc pdtk_imagegrid_dialog {id name num_fil num_col color_fons color_marc color_grasp} { - set vid [string trimleft $id .] - set var_graph_name [concat graph_name_$vid] - global $var_graph_name - set var_graph_num_fil [concat graph_num_fil_$vid] - global $var_graph_num_fil - set var_graph_num_col [concat graph_num_col_$vid] - global $var_graph_num_col - set var_graph_color_fons [concat graph_color_fons_$vid] - global $var_graph_color_fons - set var_graph_color_marc [concat graph_color_marc_$vid] - global $var_graph_color_marc - set var_graph_color_grasp [concat graph_color_grasp_$vid] - global $var_graph_color_grasp - - set $var_graph_name $name - set $var_graph_num_fil $num_fil - set $var_graph_num_col $num_col - set $var_graph_color_fons $color_fons - set $var_graph_color_marc $color_marc - set $var_graph_color_grasp $color_grasp - - toplevel $id - wm title $id {imagegrid} - wm protocol $id WM_DELETE_WINDOW [concat imagegrid_cancel $id] - - label $id.label -text {IMAGEGRID PROPERTIES} - pack $id.label -side top - - frame $id.buttonframe - pack $id.buttonframe -side bottom -fill x -pady 2m - button $id.buttonframe.cancel -text {Cancel}\ - -command "imagegrid_cancel $id" - button $id.buttonframe.apply -text {Apply}\ - -command "imagegrid_apply $id" - button $id.buttonframe.ok -text {OK}\ - -command "imagegrid_ok $id" - pack $id.buttonframe.cancel -side left -expand 1 - pack $id.buttonframe.apply -side left -expand 1 - pack $id.buttonframe.ok -side left -expand 1 - - frame $id.1rangef - pack $id.1rangef -side top - label $id.1rangef.lname -text "Name :" - entry $id.1rangef.name -textvariable $var_graph_name -width 7 - pack $id.1rangef.lname $id.1rangef.name -side left - - frame $id.2rangef - pack $id.2rangef -side top - label $id.2rangef.lnum_fil -text "Rows :" - entry $id.2rangef.num_fil -textvariable $var_graph_num_fil -width 7 - pack $id.2rangef.lnum_fil $id.2rangef.num_fil -side left - - frame $id.3rangef - pack $id.3rangef -side top - label $id.3rangef.lnum_col -text "Cols :" - entry $id.3rangef.num_col -textvariable $var_graph_num_col -width 7 - pack $id.3rangef.lnum_col $id.3rangef.num_col -side left - - frame $id.4rangef - pack $id.4rangef -side top - label $id.4rangef.lcolor_fons -text "Bg Color :" - entry $id.4rangef.color_fons -textvariable $var_graph_color_fons -width 7 - pack $id.4rangef.lcolor_fons $id.4rangef.color_fons -side left - - frame $id.5rangef - pack $id.5rangef -side top - label $id.5rangef.lcolor_marc -text "Border Color :" - entry $id.5rangef.color_marc -textvariable $var_graph_color_marc -width 7 - pack $id.5rangef.lcolor_marc $id.5rangef.color_marc -side left - - frame $id.6rangef - pack $id.6rangef -side top - label $id.6rangef.lcolor_grasp -text "Sel Color :" - entry $id.6rangef.color_grasp -textvariable $var_graph_color_grasp -width 7 - pack $id.6rangef.lcolor_grasp $id.6rangef.color_grasp -side left - - bind $id.1rangef.name <KeyPress-Return> [concat imagegrid_ok $id] - bind $id.2rangef.num_fil <KeyPress-Return> [concat imagegrid_ok $id] - bind $id.3rangef.num_col <KeyPress-Return> [concat imagegrid_ok $id] - bind $id.4rangef.color_fons <KeyPress-Return> [concat imagegrid_ok $id] - bind $id.5rangef.color_marc <KeyPress-Return> [concat imagegrid_ok $id] - bind $id.6rangef.color_grasp <KeyPress-Return> [concat imagegrid_ok $id] - - focus $id.1rangef.name -} - -proc table {w content args} { - frame $w -bg black - set r 0 - foreach row $content { - set fields {} - set c 0 - foreach col $row { - # lappend fields [label $w.$r/$c -text $col] - set img [image create photo -file $col] - lappend fields [label $w.$r/$c -image $img] - incr c - } - eval grid $fields -sticky news -padx 1 -pady 1 - incr r - } - set w -} - -proc pdtk_imagegrid_table {id name num_fil num_col} { - table .tauler { - {sll80x60.gif 3160x120.gif sll80x60.gif} - {sll80x60.gif sll80x60.gif sll80x60.gif} - {sll80x60.ppm sll80x60.gif 3160x120.gif} - } - pack .tauler -} -############ FINAL procediments per imagegrid -- slario(at)gmail.com [a partir del codi del grid de l'Ives: ydegoyon(at)free.fr] ######### \ No newline at end of file Deleted: trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,126 +0,0 @@ -// ########### procediments per imagegrid -- slario(at)gmail.com [a partir del codi del grid de l'Ives: ydegoyon(at)free.fr] ######### -sys_gui("proc imagegrid_apply {id} {\n"); -// strip "." from the TK id to make a variable name suffix -sys_gui("set vid [string trimleft $id .]\n"); -// for each variable, make a local variable to hold its name... -sys_gui("set var_graph_name [concat graph_name_$vid]\n"); -sys_gui("global $var_graph_name\n"); -sys_gui("set var_graph_num_fil [concat graph_num_fil_$vid]\n"); -sys_gui("global $var_graph_num_fil\n"); -sys_gui("set var_graph_num_col [concat graph_num_col_$vid]\n"); -sys_gui("global $var_graph_num_col\n"); -sys_gui("set var_graph_color_fons [concat graph_color_fons_$vid]\n"); -sys_gui("global $var_graph_color_fons\n"); -sys_gui("set var_graph_color_marc [concat graph_color_marc_$vid]\n"); -sys_gui("global $var_graph_color_marc\n"); -sys_gui("set var_graph_color_grasp [concat graph_color_grasp_$vid]\n"); -sys_gui("global $var_graph_color_grasp\n"); -sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_name] [eval concat $$var_graph_num_fil] [eval concat $$var_graph_num_col] [eval concat $$var_graph_color_fons] [eval concat $$var_graph_color_marc] [eval concat $$var_graph_color_grasp] \\;]\n"); -// puts stderr $cmd -sys_gui("pd $cmd\n"); -sys_gui("}\n"); -sys_gui("proc imagegrid_cancel {id} {\n"); -sys_gui("set cmd [concat $id cancel \\;]\n"); -// puts stderr $cmd -sys_gui("pd $cmd\n"); -sys_gui("}\n"); -sys_gui("proc imagegrid_ok {id} {\n"); -sys_gui("imagegrid_apply $id\n"); -sys_gui("imagegrid_cancel $id\n"); -sys_gui("}\n"); -sys_gui("proc pdtk_imagegrid_dialog {id name num_fil num_col color_fons color_marc color_grasp} {\n"); -sys_gui("set vid [string trimleft $id .]\n"); -sys_gui("set var_graph_name [concat graph_name_$vid]\n"); -sys_gui("global $var_graph_name\n"); -sys_gui("set var_graph_num_fil [concat graph_num_fil_$vid]\n"); -sys_gui("global $var_graph_num_fil\n"); -sys_gui("set var_graph_num_col [concat graph_num_col_$vid]\n"); -sys_gui("global $var_graph_num_col\n"); -sys_gui("set var_graph_color_fons [concat graph_color_fons_$vid]\n"); -sys_gui("global $var_graph_color_fons\n"); -sys_gui("set var_graph_color_marc [concat graph_color_marc_$vid]\n"); -sys_gui("global $var_graph_color_marc\n"); -sys_gui("set var_graph_color_grasp [concat graph_color_grasp_$vid]\n"); -sys_gui("global $var_graph_color_grasp\n"); -sys_gui("set $var_graph_name $name\n"); -sys_gui("set $var_graph_num_fil $num_fil\n"); -sys_gui("set $var_graph_num_col $num_col\n"); -sys_gui("set $var_graph_color_fons $color_fons\n"); -sys_gui("set $var_graph_color_marc $color_marc\n"); -sys_gui("set $var_graph_color_grasp $color_grasp\n"); -sys_gui("toplevel $id\n"); -sys_gui("wm title $id {imagegrid}\n"); -sys_gui("wm protocol $id WM_DELETE_WINDOW [concat imagegrid_cancel $id]\n"); -sys_gui("label $id.label -text {IMAGEGRID PROPERTIES}\n"); -sys_gui("pack $id.label -side top\n"); -sys_gui("frame $id.buttonframe\n"); -sys_gui("pack $id.buttonframe -side bottom -fill x -pady 2m\n"); -sys_gui("button $id.buttonframe.cancel -text {Cancel} -command \"imagegrid_cancel $id\"\n"); -sys_gui("button $id.buttonframe.apply -text {Apply} -command \"imagegrid_apply $id\"\n"); -sys_gui("button $id.buttonframe.ok -text {OK} -command \"imagegrid_ok $id\"\n"); -sys_gui("pack $id.buttonframe.cancel -side left -expand 1\n"); -sys_gui("pack $id.buttonframe.apply -side left -expand 1\n"); -sys_gui("pack $id.buttonframe.ok -side left -expand 1\n"); -sys_gui("frame $id.1rangef\n"); -sys_gui("pack $id.1rangef -side top\n"); -sys_gui("label $id.1rangef.lname -text \"Nom :\"\n"); -sys_gui("entry $id.1rangef.name -textvariable $var_graph_name -width 7\n"); -sys_gui("pack $id.1rangef.lname $id.1rangef.name -side left\n"); -sys_gui("frame $id.2rangef\n"); -sys_gui("pack $id.2rangef -side top\n"); -sys_gui("label $id.2rangef.lnum_fil -text \"Fils :\"\n"); -sys_gui("entry $id.2rangef.num_fil -textvariable $var_graph_num_fil -width 7\n"); -sys_gui("pack $id.2rangef.lnum_fil $id.2rangef.num_fil -side left\n"); -sys_gui("frame $id.3rangef\n"); -sys_gui("pack $id.3rangef -side top\n"); -sys_gui("label $id.3rangef.lnum_col -text \"Cols :\"\n"); -sys_gui("entry $id.3rangef.num_col -textvariable $var_graph_num_col -width 7\n"); -sys_gui("pack $id.3rangef.lnum_col $id.3rangef.num_col -side left\n"); -sys_gui("frame $id.4rangef\n"); -sys_gui("pack $id.4rangef -side top\n"); -sys_gui("label $id.4rangef.lcolor_fons -text \"Color fons :\"\n"); -sys_gui("entry $id.4rangef.color_fons -textvariable $var_graph_color_fons -width 7\n"); -sys_gui("pack $id.4rangef.lcolor_fons $id.4rangef.color_fons -side left\n"); -sys_gui("frame $id.5rangef\n"); -sys_gui("pack $id.5rangef -side top\n"); -sys_gui("label $id.5rangef.lcolor_marc -text \"Color marc :\"\n"); -sys_gui("entry $id.5rangef.color_marc -textvariable $var_graph_color_marc -width 7\n"); -sys_gui("pack $id.5rangef.lcolor_marc $id.5rangef.color_marc -side left\n"); -sys_gui("frame $id.6rangef\n"); -sys_gui("pack $id.6rangef -side top\n"); -sys_gui("label $id.6rangef.lcolor_grasp -text \"Color grasp :\"\n"); -sys_gui("entry $id.6rangef.color_grasp -textvariable $var_graph_color_grasp -width 7\n"); -sys_gui("pack $id.6rangef.lcolor_grasp $id.6rangef.color_grasp -side left\n"); -sys_gui("bind $id.1rangef.name <KeyPress-Return> [concat imagegrid_ok $id]\n"); -sys_gui("bind $id.2rangef.num_fil <KeyPress-Return> [concat imagegrid_ok $id]\n"); -sys_gui("bind $id.3rangef.num_col <KeyPress-Return> [concat imagegrid_ok $id]\n"); -sys_gui("bind $id.4rangef.color_fons <KeyPress-Return> [concat imagegrid_ok $id]\n"); -sys_gui("bind $id.5rangef.color_marc <KeyPress-Return> [concat imagegrid_ok $id]\n"); -sys_gui("bind $id.6rangef.color_grasp <KeyPress-Return> [concat imagegrid_ok $id]\n"); -sys_gui("focus $id.1rangef.name\n"); -sys_gui("}\n"); -sys_gui("proc table {w content args} {\n"); -sys_gui("frame $w -bg black\n"); -sys_gui("set r 0\n"); -sys_gui("foreach row $content {\n"); -sys_gui("set fields {}\n"); -sys_gui("set c 0\n"); -sys_gui("foreach col $row {\n"); -// lappend fields [label $w.$r/$c -text $col] -sys_gui("set img [image create photo -file $col]\n"); -sys_gui("lappend fields [label $w.$r/$c -image $img]\n"); -sys_gui("incr c\n"); -sys_gui("}\n"); -sys_gui("eval grid $fields -sticky news -padx 1 -pady 1\n"); -sys_gui("incr r\n"); -sys_gui("}\n"); -sys_gui("set w\n"); -sys_gui("}\n"); -sys_gui("proc pdtk_imagegrid_table {id name num_fil num_col} {\n"); -sys_gui("table .tauler {\n"); -sys_gui("{sll80x60.gif 3160x120.gif sll80x60.gif}\n"); -sys_gui("{sll80x60.gif sll80x60.gif sll80x60.gif}\n"); -sys_gui("{sll80x60.ppm sll80x60.gif 3160x120.gif}\n"); -sys_gui("}\n"); -sys_gui("pack .tauler\n"); -sys_gui("}\n"); Deleted: trunk/externals/pdvjtools/imagegrid/magickconverter.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/magickconverter.c 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/magickconverter.c 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,52 +0,0 @@ -#include "magickconverter.h" - -void convertir(pathimage pathFitxer, tipus_format f, int W, int H, int posi){ - - MagickBooleanType - status; - MagickWand - *magick_wand; - pathimage ig_path = PATH_TEMPORAL; - char posi_str[BYTES_NUM_TEMP]; - - /*printf("\nEl path %s i el format %s\n",pathFitxer,f);*/ - - /* - Read an image. - */ - MagickWandGenesis(); - magick_wand=NewMagickWand(); - status=MagickReadImage(magick_wand,pathFitxer); - if (status == MagickFalse) - ThrowWandException(magick_wand); - /* - Turn the images into a thumbnail sequence. - */ - MagickResetIterator(magick_wand); - while (MagickNextImage(magick_wand) != MagickFalse) - MagickResizeImage(magick_wand,W,H,LanczosFilter,1.0); - /* - Write the image as 'f' and destroy it. - */ - sprintf(posi_str, "%d", posi); - strcat(ig_path,posi_str); - strcat(ig_path,"."); - strcat(ig_path,f); - - /* printf("\nEl nou path %s i el format %s\n",ig_path,f); */ - status=MagickWriteImages(magick_wand,ig_path,MagickTrue); - if (status == MagickFalse) - ThrowWandException(magick_wand); - magick_wand=DestroyMagickWand(magick_wand); - MagickWandTerminus(); -} - -/* -int main(void){ - pathimage imatge = "/usr/lib/pd/extra/imagegrid/gifpmmimages/3160x120.gif"; - format fo = "ppm"; - int numi = 1; - convertir(imatge,fo,60,40,1); - return(0); -} -*/ Deleted: trunk/externals/pdvjtools/imagegrid/magickconverter.h =================================================================== --- trunk/externals/pdvjtools/imagegrid/magickconverter.h 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/magickconverter.h 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,32 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -/*#include <wand/MagickWand.h>*/ -#include <wand/magick-wand.h> - -#define BYTESNOMFITXERIMATGE 512 -#define BYTESTIPUSFROMAT 4 - -#define FORMAT_MINIATURA "ppm" -#define PATH_TEMPORAL "/tmp/imgrid_" -#define BYTES_NUM_TEMP 4 - -#define ThrowWandException(wand) \ -{ \ - char \ - *description; \ - \ - ExceptionType \ - severity; \ - \ - description=MagickGetException(wand,&severity); \ - (void) fprintf(stderr,"%s %s %ld %s\n",GetMagickModule(),description); \ - description=(char *) MagickRelinquishMemory(description); \ - exit(-1); \ -} - -typedef char pathimage[BYTESNOMFITXERIMATGE]; - -typedef char tipus_format[BYTESTIPUSFROMAT]; - -void convertir(pathimage pathFitxer, tipus_format f, int W, int H, int posi); Deleted: trunk/externals/pdvjtools/imagegrid/tk2c.sh =================================================================== --- trunk/externals/pdvjtools/imagegrid/tk2c.sh 2008-05-23 22:34:00 UTC (rev 9874) +++ trunk/externals/pdvjtools/imagegrid/tk2c.sh 2008-05-23 22:39:49 UTC (rev 9875) @@ -1,25 +0,0 @@ -#!/bin/bash - -#set -x - -while read line -do - for word in $line - do - if [ "X"$word != "X"${word#\#} ] - then - echo // ${line#\#} - break - else - line=${line//\'/\\\'} -#useless, slashes never gets in - line=${line//\\/\\\\} -#this one's dirty, i know - line=${line//;/\\\\;} - line=${line//\"/\\\"} - echo 'sys_gui("'$line'\n");' - break - fi - done -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9874] trunk/externals/pdvjtools/videogrid
by lluisbigorda＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9874 http://pure-data.svn.sourceforge.net/pure-data/?rev=9874&view=rev Author: lluisbigorda Date: 2008-05-23 15:34:00 -0700 (Fri, 23 May 2008) Log Message: ----------- change the code to be in single file added ffmpeg support Modified Paths: -------------- trunk/externals/pdvjtools/videogrid/Makefile trunk/externals/pdvjtools/videogrid/videogrid-help.pd Modified: trunk/externals/pdvjtools/videogrid/Makefile =================================================================== --- trunk/externals/pdvjtools/videogrid/Makefile 2008-05-23 21:17:06 UTC (rev 9873) +++ trunk/externals/pdvjtools/videogrid/Makefile 2008-05-23 22:34:00 UTC (rev 9874) @@ -1,4 +1,5 @@ -PD_SRC=../../src +PD_SRC=../../../pd/src +FFMPEG_HEADERS=-I/usr/include/ffmpeg NAME=videogrid CSYM=videogrid @@ -19,19 +20,15 @@ LINUXINCLUDE = -I$(PD_SRC) -I/usr/include/ .c.pd_linux: - cc -fPIC -c -ansi -O -Wall -Wmissing-prototypes cua.c - cc -fPIC -c -O -Wall -Wmissing-prototypes -o qtconverter.o -c qtconverter.c + g++ $(FFMPEG_HEADERS) -fPIC -c -O -o videogrid.o videogrid.cpp # ./tk2c.bash < $*.tk > $*.tk2c - cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c - ld -export_dynamic -shared -o $*.pd_linux $*.o cua.o qtconverter.o -lc -lm -lquicktime - strip --strip-unneeded $*.pd_linux - rm -f $*.o ../$*.pd_linux - ln -s $*/$*.pd_linux .. + g++ $(FFMPEG_HEADERS) -export_dynamic -shared -o videogrid.pd_linux videogrid.o -lavformat -lavcodec -lavutil -lavcodec -lavutil -lquicktime -lgsm -lz -lm + rm -f $*.o # ---------------------------------------------------------- install: - cp *-help.pd ../../doc/5.reference + cp *-help.pd ../../../doc/5.reference clean: rm -f *.o *.pd_* so_locations Modified: trunk/externals/pdvjtools/videogrid/videogrid-help.pd =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid-help.pd 2008-05-23 21:17:06 UTC (rev 9873) +++ trunk/externals/pdvjtools/videogrid/videogrid-help.pd 2008-05-23 22:34:00 UTC (rev 9874) @@ -3,19 +3,22 @@ #X obj 26 110 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 24 13 VIDEOGRID; -#X obj 72 178 videogrid videogrid1 3 5 #F0F0F0 #0F0F0F /usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov| -; #X text 154 63 ADD VIDEO; #X text 154 113 ADD VIDEOS FROM FOLDER; #X text 25 29 Object to select the path location of a video quiktime added in the grid \, in form of image of its first frame.; #X text 74 344 LOCATION OF THE SELECTED VIDEO; #X text 24 93 LIST STDOUT; -#X msg 156 77 putvideo /usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov -; #X msg 156 127 putvideodir /usr/local/lib/pd/extra/videogrid/videos ; -#X connect 1 0 3 0; -#X connect 3 0 0 0; -#X connect 9 0 3 0; -#X connect 10 0 3 0; +#X obj 83 159 videogrid videogrid2 3 5 #F0F0F0 #0F0F0F #F1882B; +#X msg 156 77 putvideo \$1; +#X obj 268 74 openpanel; +#X obj 348 73 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X connect 1 0 9 0; +#X connect 8 0 9 0; +#X connect 9 0 0 0; +#X connect 10 0 9 0; +#X connect 11 0 10 0; +#X connect 12 0 11 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9873] trunk/externals/pdvjtools/imagegrid
by sergi_ll＠users.sourceforge.net 23 May '08

23 May '08

Revision: 9873 http://pure-data.svn.sourceforge.net/pure-data/?rev=9873&view=rev Author: sergi_ll Date: 2008-05-23 14:17:06 -0700 (Fri, 23 May 2008) Log Message: ----------- All code in a single file Modified Paths: -------------- trunk/externals/pdvjtools/imagegrid/Makefile trunk/externals/pdvjtools/imagegrid/imagegrid.c Modified: trunk/externals/pdvjtools/imagegrid/Makefile =================================================================== --- trunk/externals/pdvjtools/imagegrid/Makefile 2008-05-23 21:13:15 UTC (rev 9872) +++ trunk/externals/pdvjtools/imagegrid/Makefile 2008-05-23 21:17:06 UTC (rev 9873) @@ -1,4 +1,4 @@ -PD_SRC=../../src +PD_SRC=../../../pd/src NAME=imagegrid CSYM=imagegrid @@ -19,11 +19,12 @@ LINUXINCLUDE = -I$(PD_SRC) -I/usr/include/ .c.pd_linux: - cc -fPIC -c -ansi -O -Wall -Wmissing-prototypes cua.c - cc -fPIC -c -ansi -O -Wall -Wmissing-prototypes magickconverter.c -# ./tk2c.bash < $*.tk > $*.tk2c +# cc -fPIC -c -ansi -O -Wall -Wmissing-prototypes cua.c +# cc -fPIC -c -ansi -O -Wall -Wmissing-prototypes magickconverter.c +# ./tk2c.sh < $*.tk > $*.tk2c cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c - ld -export_dynamic -shared -o $*.pd_linux $*.o cua.o magickconverter.o -lc -lm -lMagick `Wand-config --ldflags --libs` +# ld -export_dynamic -shared -o $*.pd_linux $*.o cua.o magickconverter.o -lc -lm -lMagick `Wand-config --ldflags --libs` + ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm -lMagick `Wand-config --ldflags --libs` strip --strip-unneeded $*.pd_linux rm -f $*.o ../$*.pd_linux ln -s $*/$*.pd_linux .. @@ -31,7 +32,7 @@ # ---------------------------------------------------------- install: - cp *-help.pd ../../doc/5.reference + cp *-help.pd ../../../doc/5.reference clean: rm -f *.o *.pd_* so_locations Modified: trunk/externals/pdvjtools/imagegrid/imagegrid.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-23 21:13:15 UTC (rev 9872) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-23 21:17:06 UTC (rev 9873) @@ -30,9 +30,224 @@ /* incloure estructures de dades i capceleres de funcions gàfiques bàsiques de pd */ #include "g_canvas.h" /* incloure estructures de dades i capceleres de funcions per a gestionar una cua */ -#include "cua.h" +/*#include "cua.h"*/ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* nombre de caracters per el nom del path del fitxer */ +#define BYTESNOMFITXER 512 + +typedef char path[BYTESNOMFITXER]; + +/* estructures i tipus de dades de la cua */ + +/* estructura de dades: un node de la cua */ +struct node +{ + /* nom del path de la imatge */ + path pathFitxer; + /* apuntador al següent node en cua */ + struct node *seguent; +}; + +/* definició del tipus node */ +typedef struct node Node; + +/* definició del tipus de cua */ +typedef struct +{ + Node *davanter; + Node *final; +}Cua; + + +/* declaracions de les funcions */ + +/* crea una cua */ +void crearCua(Cua *cua); +/* encuara un element al final de la cua */ +void encuar (Cua *cua, path x); +/* elimina un element de la cua */ +int desencuar (Cua *cua); +/* retorna si la cua és buida */ +int cuaBuida(Cua *cua); +/* elimina el contingut de la cua */ +void eliminarCua(Cua *cua); +/* retorna el nombre de nodes de la cua */ +int numNodes(Cua *cua); +/* escriu el contingut de la cua */ +void escriuCua(Cua *cua); + +/* funcions cua */ +/* implementació de les funcions */ +void crearCua(Cua *cua) +{ + cua->davanter=cua->final=NULL; +} + +/* funció que encua el node al final de la cua */ +void encuar (Cua *cua, path x) +{ + Node *nou; + nou=(Node*)malloc(sizeof(Node)); + strcpy(nou->pathFitxer,x); + nou->seguent=NULL; + if(cuaBuida(cua)) + { + cua->davanter=nou; + } + else + cua->final->seguent=nou; + cua->final=nou; +} + +/* elimina l'element del principi de la cua */ +int desencuar (Cua *cua) +{ + if(!cuaBuida(cua)) + { + Node *nou; + nou=cua->davanter; + cua->davanter=cua->davanter->seguent; + free(nou); + return 1; + } + else + { + /* printf("Cua buida\a\n"); */ + return 0; + } + +} + +/* funció que retorna si la cua és buida */ +int cuaBuida(Cua *cua) +{ + return (cua->davanter==NULL); +} + +/* elimina el contingut de la cua */ +void eliminarCua(Cua *cua) +{ + while (!cuaBuida(cua)) desencuar(cua); + printf("Cua eliminada\n"); +} + +/* funció que retorna el nombre de nodes de la cua */ +int numNodes(Cua *cua) +{ + int contador=0; + Node *actual; + actual=cua->davanter; + if(actual) contador=1; + while((actual)&&(actual != cua->final)){ + contador ++; + actual = actual->seguent; + } + return (contador); +} + +/* funció que escriu la cua de nodes per la sortida estàndard */ +void escriuCua(Cua *cua) +{ + if(!cuaBuida(cua)) + { + Node *actual; + actual=cua->davanter; + printf("CUA DE NODES\n["); + do{ + printf("#%s#",actual->pathFitxer); + actual = actual->seguent; + }while(actual); + printf("]\n"); + + } + else + printf("Cua buida\n"); +} + + /* incloure estructures de dades i capceleres de funcions per convertir imatges a diferents formats */ -#include "magickconverter.h" +/*#include "magickconverter.h"*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +/*#include <wand/MagickWand.h>*/ +#include <wand/magick-wand.h> + +#define BYTESNOMFITXERIMATGE 512 +#define BYTESTIPUSFROMAT 4 + +#define FORMAT_MINIATURA "ppm" +#define PATH_TEMPORAL "/tmp/imgrid_" +#define BYTES_NUM_TEMP 4 + +#define ThrowWandException(wand) \ +{ \ + char \ + *description; \ + \ + ExceptionType \ + severity; \ + \ + description=MagickGetException(wand,&severity); \ + (void) fprintf(stderr,"%s %s %ld %s\n",GetMagickModule(),description); \ + description=(char *) MagickRelinquishMemory(description); \ + exit(-1); \ +} + +typedef char pathimage[BYTESNOMFITXERIMATGE]; + +typedef char tipus_format[BYTESTIPUSFROMAT]; + +void convertir(pathimage pathFitxer, tipus_format f, int W, int H, int posi); + +/* funcions per convertir */ + + +void convertir(pathimage pathFitxer, tipus_format f, int W, int H, int posi){ + + MagickBooleanType + status; + MagickWand + *magick_wand; + pathimage ig_path = PATH_TEMPORAL; + char posi_str[BYTES_NUM_TEMP]; + + /*printf("\nEl path %s i el format %s\n",pathFitxer,f);*/ + + /* + Read an image. + */ + MagickWandGenesis(); + magick_wand=NewMagickWand(); + status=MagickReadImage(magick_wand,pathFitxer); + if (status == MagickFalse) + ThrowWandException(magick_wand); + /* + Turn the images into a thumbnail sequence. + */ + MagickResetIterator(magick_wand); + while (MagickNextImage(magick_wand) != MagickFalse) + MagickResizeImage(magick_wand,W,H,LanczosFilter,1.0); + /* + Write the image as 'f' and destroy it. + */ + sprintf(posi_str, "%d", posi); + strcat(ig_path,posi_str); + strcat(ig_path,"."); + strcat(ig_path,f); + + /* printf("\nEl nou path %s i el format %s\n",ig_path,f); */ + status=MagickWriteImages(magick_wand,ig_path,MagickTrue); + if (status == MagickFalse) + ThrowWandException(magick_wand); + magick_wand=DestroyMagickWand(magick_wand); + MagickWandTerminus(); +} + /* incloure estructures de dades i capceleres de funcions per traballar amb threads */ #include "pthread.h" @@ -90,6 +305,136 @@ } t_imagegrid; +void load_tkprocs(void){ + // ########### procediments per imagegrid -- slario(at)gmail.com [a partir del codi del grid de l'Ives: ydegoyon(at)free.fr] ######### + sys_gui("proc imagegrid_apply {id} {\n"); + // strip "." from the TK id to make a variable name suffix + sys_gui("set vid [string trimleft $id .]\n"); + // for each variable, make a local variable to hold its name... + sys_gui("set var_graph_name [concat graph_name_$vid]\n"); + sys_gui("global $var_graph_name\n"); + sys_gui("set var_graph_num_fil [concat graph_num_fil_$vid]\n"); + sys_gui("global $var_graph_num_fil\n"); + sys_gui("set var_graph_num_col [concat graph_num_col_$vid]\n"); + sys_gui("global $var_graph_num_col\n"); + sys_gui("set var_graph_color_fons [concat graph_color_fons_$vid]\n"); + sys_gui("global $var_graph_color_fons\n"); + sys_gui("set var_graph_color_marc [concat graph_color_marc_$vid]\n"); + sys_gui("global $var_graph_color_marc\n"); + sys_gui("set var_graph_color_grasp [concat graph_color_grasp_$vid]\n"); + sys_gui("global $var_graph_color_grasp\n"); + sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_name] [eval concat $$var_graph_num_fil] [eval concat $$var_graph_num_col] [eval concat $$var_graph_color_fons] [eval concat $$var_graph_color_marc] [eval concat $$var_graph_color_grasp] \\;]\n"); + // puts stderr $cmd + sys_gui("pd $cmd\n"); + sys_gui("}\n"); + sys_gui("proc imagegrid_cancel {id} {\n"); + sys_gui("set cmd [concat $id cancel \\;]\n"); + // puts stderr $cmd + sys_gui("pd $cmd\n"); + sys_gui("}\n"); + sys_gui("proc imagegrid_ok {id} {\n"); + sys_gui("imagegrid_apply $id\n"); + sys_gui("imagegrid_cancel $id\n"); + sys_gui("}\n"); + sys_gui("proc pdtk_imagegrid_dialog {id name num_fil num_col color_fons color_marc color_grasp} {\n"); + sys_gui("set vid [string trimleft $id .]\n"); + sys_gui("set var_graph_name [concat graph_name_$vid]\n"); + sys_gui("global $var_graph_name\n"); + sys_gui("set var_graph_num_fil [concat graph_num_fil_$vid]\n"); + sys_gui("global $var_graph_num_fil\n"); + sys_gui("set var_graph_num_col [concat graph_num_col_$vid]\n"); + sys_gui("global $var_graph_num_col\n"); + sys_gui("set var_graph_color_fons [concat graph_color_fons_$vid]\n"); + sys_gui("global $var_graph_color_fons\n"); + sys_gui("set var_graph_color_marc [concat graph_color_marc_$vid]\n"); + sys_gui("global $var_graph_color_marc\n"); + sys_gui("set var_graph_color_grasp [concat graph_color_grasp_$vid]\n"); + sys_gui("global $var_graph_color_grasp\n"); + sys_gui("set $var_graph_name $name\n"); + sys_gui("set $var_graph_num_fil $num_fil\n"); + sys_gui("set $var_graph_num_col $num_col\n"); + sys_gui("set $var_graph_color_fons $color_fons\n"); + sys_gui("set $var_graph_color_marc $color_marc\n"); + sys_gui("set $var_graph_color_grasp $color_grasp\n"); + sys_gui("toplevel $id\n"); + sys_gui("wm title $id {imagegrid}\n"); + sys_gui("wm protocol $id WM_DELETE_WINDOW [concat imagegrid_cancel $id]\n"); + sys_gui("label $id.label -text {IMAGEGRID PROPERTIES}\n"); + sys_gui("pack $id.label -side top\n"); + sys_gui("frame $id.buttonframe\n"); + sys_gui("pack $id.buttonframe -side bottom -fill x -pady 2m\n"); + sys_gui("button $id.buttonframe.cancel -text {Cancel} -command \"imagegrid_cancel $id\"\n"); + sys_gui("button $id.buttonframe.apply -text {Apply} -command \"imagegrid_apply $id\"\n"); + sys_gui("button $id.buttonframe.ok -text {OK} -command \"imagegrid_ok $id\"\n"); + sys_gui("pack $id.buttonframe.cancel -side left -expand 1\n"); + sys_gui("pack $id.buttonframe.apply -side left -expand 1\n"); + sys_gui("pack $id.buttonframe.ok -side left -expand 1\n"); + sys_gui("frame $id.1rangef\n"); + sys_gui("pack $id.1rangef -side top\n"); + sys_gui("label $id.1rangef.lname -text \"Nom :\"\n"); + sys_gui("entry $id.1rangef.name -textvariable $var_graph_name -width 7\n"); + sys_gui("pack $id.1rangef.lname $id.1rangef.name -side left\n"); + sys_gui("frame $id.2rangef\n"); + sys_gui("pack $id.2rangef -side top\n"); + sys_gui("label $id.2rangef.lnum_fil -text \"Fils :\"\n"); + sys_gui("entry $id.2rangef.num_fil -textvariable $var_graph_num_fil -width 7\n"); + sys_gui("pack $id.2rangef.lnum_fil $id.2rangef.num_fil -side left\n"); + sys_gui("frame $id.3rangef\n"); + sys_gui("pack $id.3rangef -side top\n"); + sys_gui("label $id.3rangef.lnum_col -text \"Cols :\"\n"); + sys_gui("entry $id.3rangef.num_col -textvariable $var_graph_num_col -width 7\n"); + sys_gui("pack $id.3rangef.lnum_col $id.3rangef.num_col -side left\n"); + sys_gui("frame $id.4rangef\n"); + sys_gui("pack $id.4rangef -side top\n"); + sys_gui("label $id.4rangef.lcolor_fons -text \"Color fons :\"\n"); + sys_gui("entry $id.4rangef.color_fons -textvariable $var_graph_color_fons -width 7\n"); + sys_gui("pack $id.4rangef.lcolor_fons $id.4rangef.color_fons -side left\n"); + sys_gui("frame $id.5rangef\n"); + sys_gui("pack $id.5rangef -side top\n"); + sys_gui("label $id.5rangef.lcolor_marc -text \"Color marc :\"\n"); + sys_gui("entry $id.5rangef.color_marc -textvariable $var_graph_color_marc -width 7\n"); + sys_gui("pack $id.5rangef.lcolor_marc $id.5rangef.color_marc -side left\n"); + sys_gui("frame $id.6rangef\n"); + sys_gui("pack $id.6rangef -side top\n"); + sys_gui("label $id.6rangef.lcolor_grasp -text \"Color grasp :\"\n"); + sys_gui("entry $id.6rangef.color_grasp -textvariable $var_graph_color_grasp -width 7\n"); + sys_gui("pack $id.6rangef.lcolor_grasp $id.6rangef.color_grasp -side left\n"); + sys_gui("bind $id.1rangef.name <KeyPress-Return> [concat imagegrid_ok $id]\n"); + sys_gui("bind $id.2rangef.num_fil <KeyPress-Return> [concat imagegrid_ok $id]\n"); + sys_gui("bind $id.3rangef.num_col <KeyPress-Return> [concat imagegrid_ok $id]\n"); + sys_gui("bind $id.4rangef.color_fons <KeyPress-Return> [concat imagegrid_ok $id]\n"); + sys_gui("bind $id.5rangef.color_marc <KeyPress-Return> [concat imagegrid_ok $id]\n"); + sys_gui("bind $id.6rangef.color_grasp <KeyPress-Return> [concat imagegrid_ok $id]\n"); + sys_gui("focus $id.1rangef.name\n"); + sys_gui("}\n"); + sys_gui("proc table {w content args} {\n"); + sys_gui("frame $w -bg black\n"); + sys_gui("set r 0\n"); + sys_gui("foreach row $content {\n"); + sys_gui("set fields {}\n"); + sys_gui("set c 0\n"); + sys_gui("foreach col $row {\n"); + // lappend fields [label $w.$r/$c -text $col] + sys_gui("set img [image create photo -file $col]\n"); + sys_gui("lappend fields [label $w.$r/$c -image $img]\n"); + sys_gui("incr c\n"); + sys_gui("}\n"); + sys_gui("eval grid $fields -sticky news -padx 1 -pady 1\n"); + sys_gui("incr r\n"); + sys_gui("}\n"); + sys_gui("set w\n"); + sys_gui("}\n"); + sys_gui("proc pdtk_imagegrid_table {id name num_fil num_col} {\n"); + sys_gui("table .tauler {\n"); + sys_gui("{sll80x60.gif 3160x120.gif sll80x60.gif}\n"); + sys_gui("{sll80x60.gif sll80x60.gif sll80x60.gif}\n"); + sys_gui("{sll80x60.ppm sll80x60.gif 3160x120.gif}\n"); + sys_gui("}\n"); + sys_gui("pack .tauler\n"); + sys_gui("}\n"); + +} + /* calcula la posició x del tauler a partir de la posició de l'element de la cua (d'esquerra a dreta) */ int getX(t_imagegrid* x, int posCua){ int c = x->x_num_col; @@ -917,7 +1262,8 @@ void imagegrid_setup(void) { /* post("Entra a setup per generar la classe imagegrid"); */ - #include "imagegrid.tk2c" + /* #include "imagegrid.tk2c" */ + load_tkprocs(); /* sense pas d'arguments imagegrid_class = class_new(gensym("imagegrid"), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9872] trunk/externals/pdvjtools/colorgrid/Makefile
by lluisbigorda＠users.sourceforge.net 23 May '08

23 May '08

Revision: 9872 http://pure-data.svn.sourceforge.net/pure-data/?rev=9872&view=rev Author: lluisbigorda Date: 2008-05-23 14:13:15 -0700 (Fri, 23 May 2008) Log Message: ----------- Makefile updated Modified Paths: -------------- trunk/externals/pdvjtools/colorgrid/Makefile Modified: trunk/externals/pdvjtools/colorgrid/Makefile =================================================================== --- trunk/externals/pdvjtools/colorgrid/Makefile 2008-05-23 20:46:28 UTC (rev 9871) +++ trunk/externals/pdvjtools/colorgrid/Makefile 2008-05-23 21:13:15 UTC (rev 9872) @@ -3,57 +3,7 @@ current: pd_linux -# ----------------------- NT ----------------------- -pd_nt: $(NAME).dll - -.SUFFIXES: .dll - -PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo -VC="C:\Program Files\Microsoft Visual Studio\Vc98" - -PDNTINCLUDE = /I. /I\tcl\include /I\ftp\pd\src /I$(VC)\include - -PDNTLDIR = $(VC)\lib -PDNTLIB = $(PDNTLDIR)\libc.lib \ - $(PDNTLDIR)\oldnames.lib \ - $(PDNTLDIR)\kernel32.lib \ - \ftp\pd\bin\pd.lib - -.c.dll: - cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c - link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) - -# ----------------------- IRIX 5.x ----------------------- - -pd_irix5: $(NAME).pd_irix5 - -.SUFFIXES: .pd_irix5 - -SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 - -SGIINCLUDE = -I../../src - -.c.pd_irix5: - cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c - ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o - rm $*.o - -# ----------------------- IRIX 6.x ----------------------- - -pd_irix6: $(NAME).pd_irix6 - -.SUFFIXES: .pd_irix6 - -SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ - -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ - -Ofast=ip32 - -.c.pd_irix6: - cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c - ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o - rm $*.o - # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux @@ -67,7 +17,6 @@ LINUXINCLUDE = -I../../src -I/usr/src/pd-0.40-2/src .c.pd_linux: - ./tk2c.bash < $*.tk > $*.tk2c cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9871] trunk/externals/pdvjtools/colorgrid
by lluisbigorda＠users.sourceforge.net 23 May '08

23 May '08

Revision: 9871 http://pure-data.svn.sourceforge.net/pure-data/?rev=9871&view=rev Author: lluisbigorda Date: 2008-05-23 13:46:28 -0700 (Fri, 23 May 2008) Log Message: ----------- changed the code to be in a single file colorgrid.c moved the help patch to a more common name Modified Paths: -------------- trunk/externals/pdvjtools/colorgrid/colorgrid.c Added Paths: ----------- trunk/externals/pdvjtools/colorgrid/colorgrid-help.pd Removed Paths: ------------- trunk/externals/pdvjtools/colorgrid/base64.tcl trunk/externals/pdvjtools/colorgrid/colorgrid.tk trunk/externals/pdvjtools/colorgrid/colorgrid.tk2c trunk/externals/pdvjtools/colorgrid/g_colorgrid.h trunk/externals/pdvjtools/colorgrid/help-colorgrid.pd trunk/externals/pdvjtools/colorgrid/tk2c.bash Deleted: trunk/externals/pdvjtools/colorgrid/base64.tcl =================================================================== --- trunk/externals/pdvjtools/colorgrid/base64.tcl 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/base64.tcl 2008-05-23 20:46:28 UTC (rev 9871) @@ -1,29 +0,0 @@ - package require base64 - - proc encode {} { - .txt delete 1.0 end - set fileID [open [tk_getOpenFile] RDONLY] - fconfigure $fileID -translation binary - set rawData [read $fileID] - close $fileID - set encodedData [base64::encode $rawData] - .txt insert 1.0 $encodedData - } - - proc clipcopy {} { - clipboard clear - clipboard append [.txt get 1.0 end] - } - - wm title . "Base64 Gif Encoder" - text .txt -wrap none -font "Courier 10" - menu .mbar - . configure -menu .mbar - .mbar add command -label "Encode File" -command encode - .mbar add command -label "Copy2Clipboard" -command clipcopy - .mbar add command -label "Exit" -command {destroy .; exit} - - pack .txt -expand 1 -fill both - - encode - ### End of Script Added: trunk/externals/pdvjtools/colorgrid/colorgrid-help.pd =================================================================== --- trunk/externals/pdvjtools/colorgrid/colorgrid-help.pd (rev 0) +++ trunk/externals/pdvjtools/colorgrid/colorgrid-help.pd 2008-05-23 20:46:28 UTC (rev 9871) @@ -0,0 +1,47 @@ +#N canvas 26 1 762 514 10; +#X floatatom 93 434 5 0 0 0 - - -; +#X floatatom 217 434 5 0 0 0 - - -; +#X floatatom 430 220 5 0 0 0 - - -; +#X floatatom 496 220 5 0 0 0 - - -; +#X obj 430 245 pack f f; +#X text 471 221 X; +#X text 537 220 Y; +#X msg 93 131 bang; +#X floatatom 342 431 5 0 0 0 - - -; +#X text 93 451 R; +#X text 217 450 G; +#X text 342 445 B; +#X text 39 12 Grid is a 2-dimensional color picker; +#X text 39 25 Written by Lluis Gomez i Bigorda ( lluis(a)artefacte.org +); +#X text 39 39 ( inspired by the grid object written by Yves Degoyon +); +#X msg 339 246 xgoto \$1 \$2; +#X text 330 195 Set position without changing output:; +#X obj 496 246 t b f; +#X floatatom 430 133 5 0 0 0 - - -; +#X floatatom 496 133 5 0 0 0 - - -; +#X obj 430 158 pack f f; +#X text 471 134 X; +#X text 537 133 Y; +#X obj 496 159 t b f; +#X text 330 108 Set position :; +#X msg 339 159 goto \$1 \$2; +#X obj 90 376 colorgrid colorgrid1 256 0 256 50 0 50 0 1 1 10 10 147 +392.06; +#X connect 2 0 4 0; +#X connect 3 0 17 0; +#X connect 4 0 15 0; +#X connect 7 0 26 0; +#X connect 15 0 26 0; +#X connect 17 0 4 0; +#X connect 17 1 4 1; +#X connect 18 0 20 0; +#X connect 19 0 23 0; +#X connect 20 0 25 0; +#X connect 23 0 20 0; +#X connect 23 1 20 1; +#X connect 25 0 26 0; +#X connect 26 0 0 0; +#X connect 26 1 1 0; +#X connect 26 2 8 0; Property changes on: trunk/externals/pdvjtools/colorgrid/colorgrid-help.pd ___________________________________________________________________ Name: svn:executable + * Modified: trunk/externals/pdvjtools/colorgrid/colorgrid.c =================================================================== --- trunk/externals/pdvjtools/colorgrid/colorgrid.c 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/colorgrid.c 2008-05-23 20:46:28 UTC (rev 9871) @@ -16,7 +16,6 @@ #include "m_imp.h" #include "g_canvas.h" #include "t_tk.h" -#include "g_colorgrid.h" #ifdef NT #include <io.h> @@ -29,6 +28,103 @@ #define DEFAULT_COLORGRID_HEIGHT 50 #define DEFAULT_COLORGRID_NBLINES 10 +typedef struct _colorgrid +{ + t_object x_obj; + t_glist *x_glist; + t_symbol *x_name; + t_outlet *x_xoutlet; + t_outlet *x_youtlet; + t_outlet *x_zoutlet; + int x_null; /* To dissable resize */ + int x_height; /* height of the colorgrid */ + t_float x_min; /* minimum value of x */ + t_float x_max; /* max value of x */ + int x_width; /* width of the colorgrid */ + t_float y_min; /* minimum value of y */ + t_float y_max; /* max value of y */ + t_float x_current; /* x coordinate of current position */ + t_float y_current; /* y coordinate of current position */ + int x_selected; /* stores selected state */ + int x_point; /* indicates if a point is plotted */ + int x_colorgrid; /* indicates if a colorgrid is requested */ + t_float x_xstep; /* sets the step ( grain ) for x */ + t_float x_ystep; /* sets the step ( grain ) for y */ + int x_xlines; /* number of vertical lines */ + int x_ylines; /* number of horizontal lines */ + t_symbol* x_fname; +} t_colorgrid; + +void load_tk_procs () { + // ########### colorgrid procedures -- ydegoyon(a)free.fr ######### + // package require Img + sys_gui("package require base64\n"); + sys_gui("proc colorgrid_apply {id} {\n"); + // strip "." from the TK id to make a variable name suffix + sys_gui("set vid [string trimleft $id .]\n"); + // for each variable, make a local variable to hold its name... + sys_gui("set var_graph_colorgrid [concat graph_colorgrid_$vid]\n"); + sys_gui("global $var_graph_colorgrid\n"); + sys_gui("set var_graph_xlines [concat graph_xlines_$vid]\n"); + sys_gui("global $var_graph_xlines\n"); + sys_gui("set var_graph_ylines [concat graph_ylines_$vid]\n"); + sys_gui("global $var_graph_ylines\n"); + sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_xlines] [eval concat $$var_graph_ylines] [eval concat $$var_graph_colorgrid] \\;]\n"); + // puts stderr $cmd + sys_gui("pd $cmd\n"); + sys_gui("}\n"); + sys_gui("proc colorgrid_cancel {id} {\n"); + sys_gui("set cmd [concat $id cancel \\;]\n"); + // puts stderr $cmd + sys_gui("pd $cmd\n"); + sys_gui("}\n"); + sys_gui("proc colorgrid_ok {id} {\n"); + sys_gui("colorgrid_apply $id\n"); + sys_gui("colorgrid_cancel $id\n"); + sys_gui("}\n"); + sys_gui("proc pdtk_colorgrid_dialog {id xlines ylines colorgrid} {\n"); + sys_gui("set vid [string trimleft $id .]\n"); + sys_gui("set var_graph_colorgrid [concat graph_colorgrid_$vid]\n"); + sys_gui("global $var_graph_colorgrid\n"); + sys_gui("set var_graph_xlines [concat graph_xlines_$vid]\n"); + sys_gui("global $var_graph_xlines\n"); + sys_gui("set var_graph_ylines [concat graph_ylines_$vid]\n"); + sys_gui("global $var_graph_ylines\n"); + sys_gui("set $var_graph_colorgrid $colorgrid\n"); + sys_gui("set $var_graph_xlines $xlines\n"); + sys_gui("set $var_graph_ylines $ylines\n"); + sys_gui("toplevel $id\n"); + sys_gui("wm title $id {colorgrid}\n"); + sys_gui("wm protocol $id WM_DELETE_WINDOW [concat colorgrid_cancel $id]\n"); + sys_gui("label $id.label -text {COLORGRID PROPERTIES}\n"); + sys_gui("pack $id.label -side top\n"); + sys_gui("frame $id.buttonframe\n"); + sys_gui("pack $id.buttonframe -side bottom -fill x -pady 2m\n"); + sys_gui("button $id.buttonframe.cancel -text {Cancel} -command \"colorgrid_cancel $id\"\n"); + sys_gui("button $id.buttonframe.apply -text {Apply} -command \"colorgrid_apply $id\"\n"); + sys_gui("button $id.buttonframe.ok -text {OK} -command \"colorgrid_ok $id\"\n"); + sys_gui("pack $id.buttonframe.cancel -side left -expand 1\n"); + sys_gui("pack $id.buttonframe.apply -side left -expand 1\n"); + sys_gui("pack $id.buttonframe.ok -side left -expand 1\n"); + sys_gui("frame $id.42rangef\n"); + sys_gui("pack $id.42rangef -side top\n"); + sys_gui("label $id.42rangef.lxlines -text \"X sections :\"\n"); + sys_gui("entry $id.42rangef.xlines -textvariable $var_graph_xlines -width 7\n"); + sys_gui("pack $id.42rangef.lxlines $id.42rangef.xlines -side left\n"); + sys_gui("frame $id.72rangef\n"); + sys_gui("pack $id.72rangef -side top\n"); + sys_gui("label $id.72rangef.lylines -text \"Y sections :\"\n"); + sys_gui("entry $id.72rangef.ylines -textvariable $var_graph_ylines -width 7\n"); + sys_gui("pack $id.72rangef.lylines $id.72rangef.ylines -side left\n"); + sys_gui("checkbutton $id.showcolorgrid -text {Show Grid} -variable $var_graph_colorgrid -anchor w\n"); + sys_gui("pack $id.showcolorgrid -side top\n"); + sys_gui("bind $id.42rangef.xlines <KeyPress-Return> [concat colorgrid_ok $id]\n"); + sys_gui("bind $id.72rangef.ylines <KeyPress-Return> [concat colorgrid_ok $id]\n"); + sys_gui("focus $id.42rangef.xlines\n"); + sys_gui("}\n"); + // ########### colorgrid procedures END -- lluis(a)artefacte.org ######### +} + t_widgetbehavior colorgrid_widgetbehavior; static t_class *colorgrid_class; static int colorgridcount=0; @@ -85,12 +181,12 @@ COLORGRID_SYS_VGUI3(".x%x.c delete %xPOINT\n", canvas, x); } - if ( x->x_current < text_xpix(&x->x_obj, x->x_glist) ) xpoint = text_xpix(&x->x_obj, x->x_glist); - if ( x->x_current > text_xpix(&x->x_obj, x->x_glist) + x->x_width - pointsize ) - xpoint = text_xpix(&x->x_obj, x->x_glist) + x->x_width - pointsize; - if ( x->y_current < text_ypix(&x->x_obj, x->x_glist) ) ypoint = text_ypix(&x->x_obj, x->x_glist); - if ( x->y_current > text_ypix(&x->x_obj, x->x_glist) + x->x_height - pointsize ) - ypoint = text_ypix(&x->x_obj, x->x_glist) + x->x_height - pointsize; + if ( x->x_current < x->x_obj.te_xpix ) xpoint = x->x_obj.te_xpix; + if ( x->x_current > x->x_obj.te_xpix + x->x_width - pointsize ) + xpoint = x->x_obj.te_xpix + x->x_width - pointsize; + if ( x->y_current < x->x_obj.te_ypix ) ypoint = x->x_obj.te_ypix; + if ( x->y_current > x->x_obj.te_ypix + x->x_height - pointsize ) + ypoint = x->x_obj.te_ypix + x->x_height - pointsize; // draw the selected point COLORGRID_SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -outline {} -fill #FF0000 -tags %xPOINT\n", canvas, xpoint, ypoint, xpoint+5, ypoint+5, x); @@ -970,46 +1066,46 @@ //post("%s",tagRoot); - COLORGRID_SYS_VGUI3("image create photo img%x -data {%s}\n",x,fdata); + COLORGRID_SYS_VGUI3("image create photo img%x -data [base64::decode {%s}]\n",x,fdata); COLORGRID_SYS_VGUI6(".x%x.c create image %d %d -image img%x -tags %sS\n", canvas,text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x,tagRoot); COLORGRID_SYS_VGUI5(".x%x.c coords %sS %d %d \n", canvas, tagRoot, - text_xpix(&x->x_obj, x->x_glist) + 128, text_ypix(&x->x_obj, x->x_glist) + 25); + x->x_obj.te_xpix + 128, x->x_obj.te_ypix + 25); COLORGRID_SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -tags %so0\n", - canvas, text_xpix(&x->x_obj, x->x_glist), text_ypix(&x->x_obj, x->x_glist) + x->x_height+1, - text_xpix(&x->x_obj, x->x_glist)+7, text_ypix(&x->x_obj, x->x_glist) + x->x_height+2, + canvas, x->x_obj.te_xpix, x->x_obj.te_ypix + x->x_height+1, + x->x_obj.te_xpix+7, x->x_obj.te_ypix + x->x_height+2, tagRoot); COLORGRID_SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -tags %so1\n", - canvas, text_xpix(&x->x_obj, x->x_glist)+x->x_width-7, text_ypix(&x->x_obj, x->x_glist) + x->x_height+1, - text_xpix(&x->x_obj, x->x_glist)+x->x_width, text_ypix(&x->x_obj, x->x_glist) + x->x_height+2, + canvas, x->x_obj.te_xpix+x->x_width-7, x->x_obj.te_ypix + x->x_height+1, + x->x_obj.te_xpix+x->x_width, x->x_obj.te_ypix + x->x_height+2, tagRoot); COLORGRID_SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -tags %so2\n", - canvas, text_xpix(&x->x_obj, x->x_glist)+x->x_width-131, text_ypix(&x->x_obj, x->x_glist) + x->x_height+1, - text_xpix(&x->x_obj, x->x_glist)+x->x_width-126, text_ypix(&x->x_obj, x->x_glist) + x->x_height+2, + canvas, x->x_obj.te_xpix+x->x_width-131, x->x_obj.te_ypix + x->x_height+1, + x->x_obj.te_xpix+x->x_width-126, x->x_obj.te_ypix + x->x_height+2, tagRoot); if ( x->x_colorgrid ) { - int xlpos = text_xpix(&x->x_obj, x->x_glist)+x->x_width/x->x_xlines; - int ylpos = text_ypix(&x->x_obj, x->x_glist)+x->x_height/x->x_ylines; + int xlpos = x->x_obj.te_xpix+x->x_width/x->x_xlines; + int ylpos = x->x_obj.te_ypix+x->x_height/x->x_ylines; int xcount = 1; int ycount = 1; - while ( xlpos < text_xpix(&x->x_obj, x->x_glist)+x->x_width ) + while ( xlpos < x->x_obj.te_xpix+x->x_width ) { COLORGRID_SYS_VGUI9(".x%x.c create line %d %d %d %d -fill #FFFFFF -tags %xLINE%d%d\n", - canvas, xlpos, text_ypix(&x->x_obj, x->x_glist), - xlpos, text_ypix(&x->x_obj, x->x_glist)+x->x_height, + canvas, xlpos, x->x_obj.te_ypix, + xlpos, x->x_obj.te_ypix+x->x_height, x, xcount, 0 ); xlpos+=x->x_width/x->x_xlines; xcount++; } - while ( ylpos < text_ypix(&x->x_obj, x->x_glist)+x->x_height ) + while ( ylpos < x->x_obj.te_ypix+x->x_height ) { COLORGRID_SYS_VGUI9(".x%x.c create line %d %d %d %d -fill #FFFFFF -tags %xLINE%d%d\n", - canvas, text_xpix(&x->x_obj, x->x_glist), ylpos, - text_xpix(&x->x_obj, x->x_glist)+x->x_width, ylpos, + canvas, x->x_obj.te_xpix, ylpos, + x->x_obj.te_xpix+x->x_width, ylpos, x, 0, ycount); ylpos+=x->x_height/x->x_ylines; ycount++; @@ -1026,46 +1122,46 @@ tagRoot = rtext_gettag(glist_findrtext(glist,(t_text *)x)); COLORGRID_SYS_VGUI7(".x%x.c coords %xCOLORGRID %d %d %d %d\n", canvas, x, - text_xpix(&x->x_obj, x->x_glist), text_ypix(&x->x_obj, x->x_glist), - text_xpix(&x->x_obj, x->x_glist)+x->x_width, text_ypix(&x->x_obj, x->x_glist)+x->x_height); + x->x_obj.te_xpix, x->x_obj.te_ypix, + x->x_obj.te_xpix+x->x_width, x->x_obj.te_ypix+x->x_height); COLORGRID_SYS_VGUI5(".x%x.c coords %sS %d %d \n", canvas, tagRoot, - text_xpix(&x->x_obj, x->x_glist) + 128, text_ypix(&x->x_obj, x->x_glist) + 25); + x->x_obj.te_xpix + 128, x->x_obj.te_ypix + 25); COLORGRID_SYS_VGUI7(".x%x.c coords %so0 %d %d %d %d\n", canvas, tagRoot, - text_xpix(&x->x_obj, x->x_glist), text_ypix(&x->x_obj, x->x_glist) + x->x_height+1, - text_xpix(&x->x_obj, x->x_glist)+7, text_ypix(&x->x_obj, x->x_glist) + x->x_height+2 ); + x->x_obj.te_xpix, x->x_obj.te_ypix + x->x_height+1, + x->x_obj.te_xpix+7, x->x_obj.te_ypix + x->x_height+2 ); COLORGRID_SYS_VGUI7(".x%x.c coords %so1 %d %d %d %d\n", canvas, tagRoot, - text_xpix(&x->x_obj, x->x_glist)+x->x_width-7, text_ypix(&x->x_obj, x->x_glist) + x->x_height+1, - text_xpix(&x->x_obj, x->x_glist)+x->x_width, text_ypix(&x->x_obj, x->x_glist) + x->x_height+2 ); + x->x_obj.te_xpix+x->x_width-7, x->x_obj.te_ypix + x->x_height+1, + x->x_obj.te_xpix+x->x_width, x->x_obj.te_ypix + x->x_height+2 ); COLORGRID_SYS_VGUI7(".x%x.c coords %so2 %d %d %d %d\n", canvas, tagRoot, - text_xpix(&x->x_obj, x->x_glist)+x->x_width-131, text_ypix(&x->x_obj, x->x_glist) + x->x_height+1, - text_xpix(&x->x_obj, x->x_glist)+x->x_width-126, text_ypix(&x->x_obj, x->x_glist) + x->x_height+2 ); + x->x_obj.te_xpix+x->x_width-131, x->x_obj.te_ypix + x->x_height+1, + x->x_obj.te_xpix+x->x_width-126, x->x_obj.te_ypix + x->x_height+2 ); if ( x->x_point ) { colorgrid_draw_update(x, glist); } if ( x->x_colorgrid ) { - int xlpos = text_xpix(&x->x_obj, x->x_glist)+x->x_width/x->x_xlines; - int ylpos = text_ypix(&x->x_obj, x->x_glist)+x->x_height/x->x_ylines; + int xlpos = x->x_obj.te_xpix+x->x_width/x->x_xlines; + int ylpos = x->x_obj.te_ypix+x->x_height/x->x_ylines; int xcount = 1; int ycount = 1; - while ( xlpos < text_xpix(&x->x_obj, x->x_glist)+x->x_width ) + while ( xlpos < x->x_obj.te_xpix+x->x_width ) { COLORGRID_SYS_VGUI9(".x%x.c coords %xLINE%d%d %d %d %d %d\n", - canvas, x, xcount, 0, xlpos, text_ypix(&x->x_obj, x->x_glist), - xlpos, text_ypix(&x->x_obj, x->x_glist) + x->x_height); + canvas, x, xcount, 0, xlpos, x->x_obj.te_ypix, + xlpos, x->x_obj.te_ypix + x->x_height); xlpos+=x->x_width/x->x_xlines; xcount++; } - while ( ylpos < text_ypix(&x->x_obj, x->x_glist)+x->x_height ) + while ( ylpos < x->x_obj.te_ypix+x->x_height ) { COLORGRID_SYS_VGUI9(".x%x.c coords %xLINE%d%d %d %d %d %d\n", - canvas, x, 0, ycount, text_xpix(&x->x_obj, x->x_glist), ylpos, - text_xpix(&x->x_obj, x->x_glist) + x->x_width, ylpos); + canvas, x, 0, ycount, x->x_obj.te_xpix, ylpos, + x->x_obj.te_xpix + x->x_width, ylpos); ylpos+=x->x_height/x->x_ylines; ycount++; } @@ -1195,12 +1291,12 @@ t_float xvalue, yvalue, rvalue, gvalue, bvalue; t_float xmodstep, ymodstep; - xvalue = x->x_min + (x->x_current - text_xpix(&x->x_obj, x->x_glist)) * (x->x_max-x->x_min) / x->x_width ; + xvalue = x->x_min + (x->x_current - x->x_obj.te_xpix) * (x->x_max-x->x_min) / x->x_width ; if (xvalue < x->x_min ) xvalue = x->x_min; if (xvalue > x->x_max ) xvalue = x->x_max; xmodstep = ((float)((int)(xvalue*10000) % (int)(x->x_xstep*10000))/10000.); xvalue = xvalue - xmodstep; - yvalue = x->y_max - (x->y_current - text_ypix(&x->x_obj, x->x_glist) ) * (x->y_max-x->y_min) / x->x_height ; + yvalue = x->y_max - (x->y_current - x->x_obj.te_ypix ) * (x->y_max-x->y_min) / x->x_height ; if (yvalue < x->y_min ) yvalue = x->y_min; if (yvalue > x->y_max ) yvalue = x->y_max; ymodstep = ((float)((int)(yvalue*10000) % (int)(x->x_ystep*10000))/10000.); @@ -1262,10 +1358,10 @@ { t_colorgrid* x = (t_colorgrid*)z; - *xp1 = text_xpix(&x->x_obj, x->x_glist); - *yp1 = text_ypix(&x->x_obj, x->x_glist); - *xp2 = text_xpix(&x->x_obj, x->x_glist)+x->x_width; - *yp2 = text_ypix(&x->x_obj, x->x_glist)+x->x_height; + *xp1 = x->x_obj.te_xpix; + *yp1 = x->x_obj.te_ypix; + *xp2 = x->x_obj.te_xpix+x->x_width; + *yp2 = x->x_obj.te_ypix+x->x_height; } static void colorgrid_save(t_gobj *z, t_binbuf *b) @@ -1275,8 +1371,7 @@ // post( "saving colorgrid : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"), (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, - atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)), - x->x_name, x->x_width, x->x_min, + gensym("colorgrid"), x->x_name, x->x_width, x->x_min, x->x_max, x->x_height, x->y_min, x->y_max, x->x_colorgrid, x->x_xstep, @@ -1346,8 +1441,8 @@ static void colorgrid_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_colorgrid *x = (t_colorgrid *)z; - int xold = text_xpix(&x->x_obj, x->x_glist); - int yold = text_ypix(&x->x_obj, x->x_glist); + int xold = x->x_obj.te_xpix; + int yold = x->x_obj.te_ypix; // post( "colorgrid_displace dx=%d dy=%d", dx, dy ); @@ -1355,7 +1450,7 @@ x->x_current += dx; x->x_obj.te_ypix += dy; x->y_current += dy; - if(xold != text_xpix(&x->x_obj, x->x_glist) || yold != text_ypix(&x->x_obj, x->x_glist)) + if(xold != x->x_obj.te_xpix || yold != x->x_obj.te_ypix) { colorgrid_draw_move(x, x->x_glist); } @@ -1407,8 +1502,8 @@ // post( "colorgrid_set x=%f y=%f", newx, newy ); - x->x_current = newx + text_xpix(&x->x_obj, x->x_glist); - x->y_current = newy + text_ypix(&x->x_obj, x->x_glist); + x->x_current = newx + x->x_obj.te_xpix; + x->y_current = newy + x->x_obj.te_ypix; if(xold != x->x_current || yold != x->y_current) { colorgrid_output_current(x); @@ -1428,8 +1523,8 @@ // post( "colorgrid_set x=%f y=%f", newx, newy ); - x->x_current = newx + text_xpix(&x->x_obj, x->x_glist); - x->y_current = newy + text_ypix(&x->x_obj, x->x_glist); + x->x_current = newx + x->x_obj.te_xpix; + x->y_current = newy + x->x_obj.te_ypix; if(xold != x->x_current || yold != x->y_current) { colorgrid_draw_update(x, x->x_glist); @@ -1538,7 +1633,7 @@ void colorgrid_setup(void) { -#include "colorgrid.tk2c" + load_tk_procs(); post ( colorgrid_version ); colorgrid_class = class_new(gensym("colorgrid"), (t_newmethod)colorgrid_new, (t_method)colorgrid_free, sizeof(t_colorgrid), 0, A_GIMME, 0); @@ -1558,5 +1653,5 @@ class_setwidget(colorgrid_class, &colorgrid_widgetbehavior); class_setpropertiesfn(colorgrid_class, colorgrid_properties); class_setsavefn(colorgrid_class, colorgrid_save); - class_sethelpsymbol(colorgrid_class, gensym("help-colorgrid.pd")); + class_sethelpsymbol(colorgrid_class, gensym("colorgrid-help.pd")); } Deleted: trunk/externals/pdvjtools/colorgrid/colorgrid.tk =================================================================== --- trunk/externals/pdvjtools/colorgrid/colorgrid.tk 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/colorgrid.tk 2008-05-23 20:46:28 UTC (rev 9871) @@ -1,88 +0,0 @@ -############ colorgrid procedures -- ydegoyon(a)free.fr ######### -package require Img - -proc colorgrid_apply {id} { -# strip "." from the TK id to make a variable name suffix - set vid [string trimleft $id .] -# for each variable, make a local variable to hold its name... - set var_graph_colorgrid [concat graph_colorgrid_$vid] - global $var_graph_colorgrid - set var_graph_xlines [concat graph_xlines_$vid] - global $var_graph_xlines - set var_graph_ylines [concat graph_ylines_$vid] - global $var_graph_ylines - - set cmd [concat $id dialog \ - [eval concat $$var_graph_xlines] \ - [eval concat $$var_graph_ylines] \ - [eval concat $$var_graph_colorgrid] \ - \;] - #puts stderr $cmd - pd $cmd -} - -proc colorgrid_cancel {id} { - set cmd [concat $id cancel \;] - #puts stderr $cmd - pd $cmd -} - -proc colorgrid_ok {id} { - colorgrid_apply $id - colorgrid_cancel $id -} - -proc pdtk_colorgrid_dialog {id xlines ylines colorgrid} { - set vid [string trimleft $id .] - set var_graph_colorgrid [concat graph_colorgrid_$vid] - global $var_graph_colorgrid - set var_graph_xlines [concat graph_xlines_$vid] - global $var_graph_xlines - set var_graph_ylines [concat graph_ylines_$vid] - global $var_graph_ylines - - set $var_graph_colorgrid $colorgrid - set $var_graph_xlines $xlines - set $var_graph_ylines $ylines - - toplevel $id - wm title $id {colorgrid} - wm protocol $id WM_DELETE_WINDOW [concat colorgrid_cancel $id] - - label $id.label -text {COLORGRID PROPERTIES} - pack $id.label -side top - - frame $id.buttonframe - pack $id.buttonframe -side bottom -fill x -pady 2m - button $id.buttonframe.cancel -text {Cancel}\ - -command "colorgrid_cancel $id" - button $id.buttonframe.apply -text {Apply}\ - -command "colorgrid_apply $id" - button $id.buttonframe.ok -text {OK}\ - -command "colorgrid_ok $id" - pack $id.buttonframe.cancel -side left -expand 1 - pack $id.buttonframe.apply -side left -expand 1 - pack $id.buttonframe.ok -side left -expand 1 - - frame $id.42rangef - pack $id.42rangef -side top - label $id.42rangef.lxlines -text "X sections :" - entry $id.42rangef.xlines -textvariable $var_graph_xlines -width 7 - pack $id.42rangef.lxlines $id.42rangef.xlines -side left - - frame $id.72rangef - pack $id.72rangef -side top - label $id.72rangef.lylines -text "Y sections :" - entry $id.72rangef.ylines -textvariable $var_graph_ylines -width 7 - pack $id.72rangef.lylines $id.72rangef.ylines -side left - - checkbutton $id.showcolorgrid -text {Show Grid} -variable $var_graph_colorgrid \ - -anchor w - pack $id.showcolorgrid -side top - - bind $id.42rangef.xlines <KeyPress-Return> [concat colorgrid_ok $id] - bind $id.72rangef.ylines <KeyPress-Return> [concat colorgrid_ok $id] - focus $id.42rangef.xlines -} - -############ colorgrid procedures END -- lluis(a)artefacte.org ######### Deleted: trunk/externals/pdvjtools/colorgrid/colorgrid.tk2c =================================================================== --- trunk/externals/pdvjtools/colorgrid/colorgrid.tk2c 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/colorgrid.tk2c 2008-05-23 20:46:28 UTC (rev 9871) @@ -1,66 +0,0 @@ -// ########### colorgrid procedures -- ydegoyon(a)free.fr ######### -sys_gui("package require Img\n"); -sys_gui("proc colorgrid_apply {id} {\n"); -// strip "." from the TK id to make a variable name suffix -sys_gui("set vid [string trimleft $id .]\n"); -// for each variable, make a local variable to hold its name... -sys_gui("set var_graph_colorgrid [concat graph_colorgrid_$vid]\n"); -sys_gui("global $var_graph_colorgrid\n"); -sys_gui("set var_graph_xlines [concat graph_xlines_$vid]\n"); -sys_gui("global $var_graph_xlines\n"); -sys_gui("set var_graph_ylines [concat graph_ylines_$vid]\n"); -sys_gui("global $var_graph_ylines\n"); -sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_xlines] [eval concat $$var_graph_ylines] [eval concat $$var_graph_colorgrid] \\;]\n"); -// puts stderr $cmd -sys_gui("pd $cmd\n"); -sys_gui("}\n"); -sys_gui("proc colorgrid_cancel {id} {\n"); -sys_gui("set cmd [concat $id cancel \\;]\n"); -// puts stderr $cmd -sys_gui("pd $cmd\n"); -sys_gui("}\n"); -sys_gui("proc colorgrid_ok {id} {\n"); -sys_gui("colorgrid_apply $id\n"); -sys_gui("colorgrid_cancel $id\n"); -sys_gui("}\n"); -sys_gui("proc pdtk_colorgrid_dialog {id xlines ylines colorgrid} {\n"); -sys_gui("set vid [string trimleft $id .]\n"); -sys_gui("set var_graph_colorgrid [concat graph_colorgrid_$vid]\n"); -sys_gui("global $var_graph_colorgrid\n"); -sys_gui("set var_graph_xlines [concat graph_xlines_$vid]\n"); -sys_gui("global $var_graph_xlines\n"); -sys_gui("set var_graph_ylines [concat graph_ylines_$vid]\n"); -sys_gui("global $var_graph_ylines\n"); -sys_gui("set $var_graph_colorgrid $colorgrid\n"); -sys_gui("set $var_graph_xlines $xlines\n"); -sys_gui("set $var_graph_ylines $ylines\n"); -sys_gui("toplevel $id\n"); -sys_gui("wm title $id {colorgrid}\n"); -sys_gui("wm protocol $id WM_DELETE_WINDOW [concat colorgrid_cancel $id]\n"); -sys_gui("label $id.label -text {COLORGRID PROPERTIES}\n"); -sys_gui("pack $id.label -side top\n"); -sys_gui("frame $id.buttonframe\n"); -sys_gui("pack $id.buttonframe -side bottom -fill x -pady 2m\n"); -sys_gui("button $id.buttonframe.cancel -text {Cancel} -command \"colorgrid_cancel $id\"\n"); -sys_gui("button $id.buttonframe.apply -text {Apply} -command \"colorgrid_apply $id\"\n"); -sys_gui("button $id.buttonframe.ok -text {OK} -command \"colorgrid_ok $id\"\n"); -sys_gui("pack $id.buttonframe.cancel -side left -expand 1\n"); -sys_gui("pack $id.buttonframe.apply -side left -expand 1\n"); -sys_gui("pack $id.buttonframe.ok -side left -expand 1\n"); -sys_gui("frame $id.42rangef\n"); -sys_gui("pack $id.42rangef -side top\n"); -sys_gui("label $id.42rangef.lxlines -text \"X sections :\"\n"); -sys_gui("entry $id.42rangef.xlines -textvariable $var_graph_xlines -width 7\n"); -sys_gui("pack $id.42rangef.lxlines $id.42rangef.xlines -side left\n"); -sys_gui("frame $id.72rangef\n"); -sys_gui("pack $id.72rangef -side top\n"); -sys_gui("label $id.72rangef.lylines -text \"Y sections :\"\n"); -sys_gui("entry $id.72rangef.ylines -textvariable $var_graph_ylines -width 7\n"); -sys_gui("pack $id.72rangef.lylines $id.72rangef.ylines -side left\n"); -sys_gui("checkbutton $id.showcolorgrid -text {Show Grid} -variable $var_graph_colorgrid -anchor w\n"); -sys_gui("pack $id.showcolorgrid -side top\n"); -sys_gui("bind $id.42rangef.xlines <KeyPress-Return> [concat colorgrid_ok $id]\n"); -sys_gui("bind $id.72rangef.ylines <KeyPress-Return> [concat colorgrid_ok $id]\n"); -sys_gui("focus $id.42rangef.xlines\n"); -sys_gui("}\n"); -// ########### colorgrid procedures END -- lluis(a)artefacte.org ######### Deleted: trunk/externals/pdvjtools/colorgrid/g_colorgrid.h =================================================================== --- trunk/externals/pdvjtools/colorgrid/g_colorgrid.h 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/g_colorgrid.h 2008-05-23 20:46:28 UTC (rev 9871) @@ -1,39 +0,0 @@ -/* Copyright (c) 2002 Yves Degoyon -* For information on usage and redistribution, and for a DISCLAIMER OF ALL -* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - -/* a header for colorgrid which enables to control -* 2 parameters with the mouse cursor -*/ - -#ifndef __G_COLORGRID_H -#define __G_COLORGRID_H - -typedef struct _colorgrid -{ - t_object x_obj; - t_glist *x_glist; - t_symbol *x_name; - t_outlet *x_xoutlet; - t_outlet *x_youtlet; - t_outlet *x_zoutlet; - int x_null; /* To dissable resize */ - int x_height; /* height of the colorgrid */ - t_float x_min; /* minimum value of x */ - t_float x_max; /* max value of x */ - int x_width; /* width of the colorgrid */ - t_float y_min; /* minimum value of y */ - t_float y_max; /* max value of y */ - t_float x_current; /* x coordinate of current position */ - t_float y_current; /* y coordinate of current position */ - int x_selected; /* stores selected state */ - int x_point; /* indicates if a point is plotted */ - int x_colorgrid; /* indicates if a colorgrid is requested */ - t_float x_xstep; /* sets the step ( grain ) for x */ - t_float x_ystep; /* sets the step ( grain ) for y */ - int x_xlines; /* number of vertical lines */ - int x_ylines; /* number of horizontal lines */ - t_symbol* x_fname; -} t_colorgrid; - -#endif Deleted: trunk/externals/pdvjtools/colorgrid/help-colorgrid.pd =================================================================== --- trunk/externals/pdvjtools/colorgrid/help-colorgrid.pd 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/help-colorgrid.pd 2008-05-23 20:46:28 UTC (rev 9871) @@ -1,47 +0,0 @@ -#N canvas 26 1 762 514 10; -#X floatatom 93 434 5 0 0 0 - - -; -#X floatatom 217 434 5 0 0 0 - - -; -#X floatatom 430 220 5 0 0 0 - - -; -#X floatatom 496 220 5 0 0 0 - - -; -#X obj 430 245 pack f f; -#X text 471 221 X; -#X text 537 220 Y; -#X msg 93 131 bang; -#X floatatom 342 431 5 0 0 0 - - -; -#X text 93 451 R; -#X text 217 450 G; -#X text 342 445 B; -#X text 39 12 Grid is a 2-dimensional color picker; -#X text 39 25 Written by Lluis Gomez i Bigorda ( lluis(a)artefacte.org -); -#X text 39 39 ( inspired by the grid object written by Yves Degoyon -); -#X msg 339 246 xgoto \$1 \$2; -#X text 330 195 Set position without changing output:; -#X obj 496 246 t b f; -#X floatatom 430 133 5 0 0 0 - - -; -#X floatatom 496 133 5 0 0 0 - - -; -#X obj 430 158 pack f f; -#X text 471 134 X; -#X text 537 133 Y; -#X obj 496 159 t b f; -#X text 330 108 Set position :; -#X msg 339 159 goto \$1 \$2; -#X obj 90 376 colorgrid colorgrid1 256 0 256 50 0 50 0 1 1 10 10 147 -392.06; -#X connect 2 0 4 0; -#X connect 3 0 17 0; -#X connect 4 0 15 0; -#X connect 7 0 26 0; -#X connect 15 0 26 0; -#X connect 17 0 4 0; -#X connect 17 1 4 1; -#X connect 18 0 20 0; -#X connect 19 0 23 0; -#X connect 20 0 25 0; -#X connect 23 0 20 0; -#X connect 23 1 20 1; -#X connect 25 0 26 0; -#X connect 26 0 0 0; -#X connect 26 1 1 0; -#X connect 26 2 8 0; Deleted: trunk/externals/pdvjtools/colorgrid/tk2c.bash =================================================================== --- trunk/externals/pdvjtools/colorgrid/tk2c.bash 2008-05-23 10:42:42 UTC (rev 9870) +++ trunk/externals/pdvjtools/colorgrid/tk2c.bash 2008-05-23 20:46:28 UTC (rev 9871) @@ -1,24 +0,0 @@ -#!/bin/bash - -#set -x - -while read line -do - for word in $line - do - if [ "X"$word != "X"${word#\#} ] - then - echo // ${line#\#} - break - else - line=${line//\'/\\\'} -#useless, slashes never gets in - line=${line//\\/\\\\} -#this one's dirty, i know - line=${line//;/\\\\;} - line=${line//\"/\\\"} - echo 'sys_gui("'$line'\n");' - break - fi - done -done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: /var/www/auto-build/2008-05-23/logs/2008-05-23_05.54.03_mingw32_nt-5.1_windowsxp-i386_pd-extended_run-automated-builder.txt
by pd＠debian-stable-i386.idmi.poly.edu 23 May '08

23 May '08

./pd-settings.reg: line 31: loadlib27=pan: command not found ./pd-settings.reg: line 32: loadlib28=freeverb: command not found ./pd-settings.reg: line 33: loadlib29=hcs: command not found ./pd-settings.reg: line 34: loadlib30=jmmmp: command not found ./pd-settings.reg: line 35: loadlib31=ext13: command not found ./pd-settings.reg: line 36: loadlib32=hardware: command not found ./pd-settings.reg: line 37: loadlib33=ggee: command not found ./pd-settings.reg: line 38: loadlib34=iem_anything: command not found ./pd-settings.reg: line 39: loadlib35=flib: command not found ./pd-settings.reg: line 40: loadlib36=ekext: command not found ./pd-settings.reg: line 41: loadlib37=flatspace: command not found ./pd-settings.reg: line 42: loadlib38=deprecated: command not found ./pd-settings.reg: line 43: nloadlib=38: command not found ./pd-settings.reg: line 44: syntax error near unexpected token `;' ./pd-settings.reg: line 44: `; delete any previous loadlib flags' C:\msys\1.0\home\pd\auto-build\pd-extended\packages\win32_inno>"bin\pd.exe" -font 10 -path "doc\vasp" -lib cyclone -lib Gem -lib OSC -lib vasp -lib xeq -lib xsample -listdev The system cannot find the path specified. ./pd.ico: ./pd.ico: cannot execute binary file ./pdpatch.ico: ./pdpatch.ico: cannot execute binary file

1 0

SF.net SVN: pure-data: [9870] branches/pd-extended/v0-40/pd/src/makefile. mingw
by eighthave＠users.sourceforge.net 23 May '08

23 May '08

Revision: 9870 http://pure-data.svn.sourceforge.net/pure-data/?rev=9870&view=rev Author: eighthave Date: 2008-05-23 03:42:42 -0700 (Fri, 23 May 2008) Log Message: ----------- oops, forgot to add import.c on MinGW Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/makefile.mingw Modified: branches/pd-extended/v0-40/pd/src/makefile.mingw =================================================================== --- branches/pd-extended/v0-40/pd/src/makefile.mingw 2008-05-23 08:38:28 UTC (rev 9869) +++ branches/pd-extended/v0-40/pd/src/makefile.mingw 2008-05-23 10:42:42 UTC (rev 9870) @@ -88,7 +88,7 @@ d_math.c d_fft.c d_fft_mayer.c d_fftroutine.c d_array.c d_global.c \ d_delay.c d_resample.c x_arithmetic.c x_connective.c x_interface.c \ x_midi.c x_misc.c x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c \ - x_list.c d_soundfile.c g_vslider.c g_vdial.c + x_list.c d_soundfile.c g_vslider.c g_vdial.c import.c SRSRC = u_pdsend.c u_pdreceive.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9869] trunk/externals/gem2pdp/gem2pdp.cpp
by zmoelnig＠users.sourceforge.net 23 May '08

23 May '08

Revision: 9869 http://pure-data.svn.sourceforge.net/pure-data/?rev=9869&view=rev Author: zmoelnig Date: 2008-05-23 01:38:28 -0700 (Fri, 23 May 2008) Log Message: ----------- this should make gem2pdp compile with older versions again (and with new versions too) Modified Paths: -------------- trunk/externals/gem2pdp/gem2pdp.cpp Modified: trunk/externals/gem2pdp/gem2pdp.cpp =================================================================== --- trunk/externals/gem2pdp/gem2pdp.cpp 2008-05-23 00:20:06 UTC (rev 9868) +++ trunk/externals/gem2pdp/gem2pdp.cpp 2008-05-23 08:38:28 UTC (rev 9869) @@ -14,12 +14,26 @@ #include "Base/GemMan.h" #include "Base/GemCache.h" +#if defined(GEM_VERSION_MAJOR) && defined (GEM_VERSION_MINOR) && (GEM_VERSION_MAJOR>0 || GEM_VERSION_MINOR>=91) +# define GEM2PDP_LEGACY_GEM 0 +#else +# define GEM2PDP_LEGACY_GEM 1 +#endif + + CPPEXTERN_NEW(gem2pdp) gem2pdp :: gem2pdp(void) { +#if GEM2PDP_LEGACY_GEM + m_x = GemMan::m_xoffset; + m_y = GemMan::m_yoffset; + m_width = GemMan::m_width; + m_height = GemMan::m_height; +#else GemMan::getOffset(&m_x, &m_y); GemMan::getDimen(&m_width, &m_height); +#endif m_image = NULL; m_pdpoutlet = outlet_new(this->x_obj, &s_anything); } @@ -45,8 +59,15 @@ } // update image dimensions +#if GEM2PDP_LEGACY_GEM + m_x = GemMan::m_xoffset; + m_y = GemMan::m_yoffset; + m_width = GemMan::m_width; + m_height = GemMan::m_height; +#else GemMan::getOffset(&m_x, &m_y); GemMan::getDimen(&m_width, &m_height); +#endif pbuffers = GemMan::m_buffer; GemMan::m_buffer = 1; GemMan::render(idontknowwhatitis); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9868] branches/pd-extended/v0-40/externals/Makefile
by eighthave＠users.sourceforge.net 23 May '08

23 May '08

Revision: 9868 http://pure-data.svn.sourceforge.net/pure-data/?rev=9868&view=rev Author: eighthave Date: 2008-05-22 17:20:06 -0700 (Thu, 22 May 2008) Log Message: ----------- added noise wavefile for partconv~ help patch Modified Paths: -------------- branches/pd-extended/v0-40/externals/Makefile Modified: branches/pd-extended/v0-40/externals/Makefile =================================================================== --- branches/pd-extended/v0-40/externals/Makefile 2008-05-22 18:25:27 UTC (rev 9867) +++ branches/pd-extended/v0-40/externals/Makefile 2008-05-23 00:20:06 UTC (rev 9868) @@ -414,7 +414,6 @@ #------------------------------------------------------------------------------# # BSAYLOR BSAYLOR_NAME=bsaylor -# partconv~.c requires fftw3, which is not part of the build system yet BSAYLOR_OBJECTS := $(wildcard $(externals_src)/bsaylor/*~.c) bsaylor: $(BSAYLOR_OBJECTS:.c=.$(EXTENSION)) @@ -429,6 +428,7 @@ install -d $(helpdir)/$(BSAYLOR_NAME) install -p $(externals_src)/bsaylor/help/*.pd \ $(helpdir)/$(BSAYLOR_NAME) + install -p $(externals_src)/bsaylor/*.wav $(helpdir)/$(BSAYLOR_NAME) # install -d $(manualsdir)/$(BSAYLOR_NAME) install -d $(readmesdir) install -p $(externals_src)/bsaylor/README.txt \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2008