Pd-cvs May 2008

pd-cvs@lists.iem.at

16 participants
271 discussions

SF.net SVN: pure-data: [9818] branches/pd-extended/v0-40/extensions/
by eighthave＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9818 http://pure-data.svn.sourceforge.net/pure-data/?rev=9818&view=rev Author: eighthave Date: 2008-05-16 05:05:21 -0700 (Fri, 16 May 2008) Log Message: ----------- adding extensions to the 0.40 release branch of Pd-extended Added Paths: ----------- branches/pd-extended/v0-40/extensions/ Copied: branches/pd-extended/v0-40/extensions (from rev 9817, trunk/extensions) 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: [9817] trunk
by eighthave＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9817 http://pure-data.svn.sourceforge.net/pure-data/?rev=9817&view=rev Author: eighthave Date: 2008-05-15 16:29:24 -0700 (Thu, 15 May 2008) Log Message: ----------- added npath and nloadlib to stop CPU spike at load; added ~/pd/ and ~/Library/Pd for user-specific install paths. What to do on Windows... Modified Paths: -------------- trunk/packages/darwin_app/org.puredata.pd.default.plist trunk/packages/linux_make/default.pdsettings trunk/packages/win32_inno/pd-inno.iss.in trunk/packages/win32_inno/pd-settings.reg trunk/scripts/generate-pd-settings-files.sh Modified: trunk/packages/darwin_app/org.puredata.pd.default.plist =================================================================== --- trunk/packages/darwin_app/org.puredata.pd.default.plist 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/darwin_app/org.puredata.pd.default.plist 2008-05-15 23:29:24 UTC (rev 9817) @@ -84,24 +84,30 @@ <string>pdp</string> <key>loadlib39</key> <string>pidip</string> + <key>nloadlib</key> + <string>39</string> <key>path1</key> + <string>~/Library/Pd</string> + <key>path2</key> <string>/Library/Pd</string> - <key>path2</key> + <key>path3</key> <string>/System/Library/Fonts</string> - <key>path3</key> + <key>path4</key> <string>/Library/Fonts</string> - <key>path4</key> + <key>path5</key> <string>~/Library/Fonts</string> - <key>path5</key> + <key>path6</key> <string>/usr/X11R6/lib/X11/fonts/TTF</string> - <key>path6</key> + <key>path7</key> <string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string> - <key>path7</key> + <key>path8</key> <string>/sw/lib/X11/fonts/msttf</string> - <key>path8</key> + <key>path9</key> <string>/sw/lib/X11/fonts/intl/TrueType</string> - <key>path9</key> + <key>path10</key> <string>/sw/lib/X11/fonts/applettf</string> + <key>npath</key> + <string>10</string> </dict> </plist> Modified: trunk/packages/linux_make/default.pdsettings =================================================================== --- trunk/packages/linux_make/default.pdsettings 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/linux_make/default.pdsettings 2008-05-15 23:29:24 UTC (rev 9817) @@ -41,6 +41,8 @@ loadlib37: deprecated loadlib38: pdp loadlib39: pidip -path1: /usr/share/pd -path2: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType nloadlib: 39 +path1: ~/pd +path2: /usr/share/pd +path3: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType +npath: 3 Modified: trunk/packages/win32_inno/pd-inno.iss.in =================================================================== --- trunk/packages/win32_inno/pd-inno.iss.in 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/win32_inno/pd-inno.iss.in 2008-05-15 23:29:24 UTC (rev 9817) @@ -66,7 +66,6 @@ Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: noerror uninsdeletekey; Tasks: fileassociations ; ; add pd-inno_registry after this comment: - Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: Gem; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: cyclone; Tasks: libs @@ -104,6 +103,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: ekext; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib36; ValueData: flatspace; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib37; ValueData: deprecated; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 37; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib38; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib39; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib40; Flags: deletevalue; Tasks: libs @@ -168,6 +168,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib99; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib100; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path1; ValueData: hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 1; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path2; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path3; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs Modified: trunk/packages/win32_inno/pd-settings.reg =================================================================== --- trunk/packages/win32_inno/pd-settings.reg 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/win32_inno/pd-settings.reg 2008-05-15 23:29:24 UTC (rev 9817) @@ -38,6 +38,7 @@ "loadlib35"="ekext" "loadlib36"="flatspace" "loadlib37"="deprecated" +"nloadlib"=37 ; delete any previous loadlib flags "loadlib38"=- "loadlib39"=- @@ -103,6 +104,7 @@ "loadlib99"=- "loadlib100"=- "path1"=hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00 +"npath"=1 ; delete all existing path flags "path2"=- "path3"=- Modified: trunk/scripts/generate-pd-settings-files.sh =================================================================== --- trunk/scripts/generate-pd-settings-files.sh 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/scripts/generate-pd-settings-files.sh 2008-05-15 23:29:24 UTC (rev 9817) @@ -49,9 +49,10 @@ ((++i)) echo "path${i}: ${fontpath}" >> $GNULINUX_FILE done + echo "npath: ${i}" >> $GNULINUX_FILE } -print_gnulinux_footer () +print_gnulinux_nloadlib () { echo "nloadlib: $1" >> $GNULINUX_FILE } @@ -71,8 +72,16 @@ echo -e "\t<key>path${i}</key>" >> $MACOSX_FILE echo -e "\t<string>${fontpath}</string>" >> $MACOSX_FILE done + echo -e "\t<key>npath</key>" >> $MACOSX_FILE + echo -e "\t<string>${i}</string>" >> $MACOSX_FILE } +print_macosx_nloadlib () +{ + echo -e "\t<key>nloadlib</key>" >> $MACOSX_FILE + echo -e "\t<string>${1}</string>" >> $MACOSX_FILE +} + # Windows ---------------------------------------------------------------------# print_windows () { @@ -88,6 +97,8 @@ echo "\"path${j}\"=${fontpath}" >> $WINDOWS_FILE echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path${j}; ValueData: ${fontpath}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE done + echo "\"npath\"=${j}" >> $WINDOWS_FILE + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE } print_windows_delete () @@ -96,6 +107,11 @@ echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_FILE } +print_windows_nloadlib () +{ + echo "\"nloadlib\"=${1}" >> $WINDOWS_FILE + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: ${1}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE +} #==============================================================================# echo "Running for GNU/Linux and Darwin:" @@ -108,8 +124,8 @@ done echo " " -# the .pdsettings file needs a terminator with the lib count -linux_end_count=$i +print_gnulinux_nloadlib $i +print_macosx_nloadlib $i # run separately so some libs can be excluded on Windows echo "Running for Windows:" @@ -126,6 +142,7 @@ esac done echo " " +print_windows_nloadlib $i # print lines to delete existing loadlib flags echo "; delete any previous loadlib flags" >> $WINDOWS_FILE @@ -144,9 +161,8 @@ print_windows_delete path $i done -# the .pd-settings file needs an end tag for the loadlib statements +# the .pd-settings file needs an end tag for the path statements print_gnulinux_fontpath -print_gnulinux_footer $linux_end_count print_macosx_fontpath echo -e $MACOSX_FOOTER >> $MACOSX_FILE 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: [9816] trunk/externals/pdvjtools/videogrid
by sergi_ll＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9816 http://pure-data.svn.sourceforge.net/pure-data/?rev=9816&view=rev Author: sergi_ll Date: 2008-05-15 15:58:01 -0700 (Thu, 15 May 2008) Log Message: ----------- seek and border adds + help file renamed + old files deleted Modified Paths: -------------- trunk/externals/pdvjtools/videogrid/Makefile trunk/externals/pdvjtools/videogrid/cua.c trunk/externals/pdvjtools/videogrid/videogrid.c trunk/externals/pdvjtools/videogrid/videogrid.tk trunk/externals/pdvjtools/videogrid/videogrid.tk2c Added Paths: ----------- trunk/externals/pdvjtools/videogrid/videogrid-help.pd Removed Paths: ------------- trunk/externals/pdvjtools/videogrid/cat-help-videogrid.pd trunk/externals/pdvjtools/videogrid/help-videogrid.pd Modified: trunk/externals/pdvjtools/videogrid/Makefile =================================================================== --- trunk/externals/pdvjtools/videogrid/Makefile 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/Makefile 2008-05-15 22:58:01 UTC (rev 9816) @@ -31,7 +31,7 @@ # ---------------------------------------------------------- install: - cp help-*.pd ../../doc/5.reference + cp *-help.pd ../../doc/5.reference clean: rm -f *.o *.pd_* so_locations Deleted: trunk/externals/pdvjtools/videogrid/cat-help-videogrid.pd =================================================================== --- trunk/externals/pdvjtools/videogrid/cat-help-videogrid.pd 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/cat-help-videogrid.pd 2008-05-15 22:58:01 UTC (rev 9816) @@ -1,20 +0,0 @@ -#N canvas 772 365 1148 655 10; -#X text 24 93 LLISTA STDOUT; -#X symbolatom 72 324 60 0 0 0 - - -; -#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 text 25 29 Objecte per seleccionar amb un sol clic la ubicacio d'un -video amb el frame afegit al tauler.; -#X text 154 63 AFEGIR VIDEO; -#X text 154 113 AFEGIR VIDEOS D'UN DIRECTORI; -#X text 74 344 PATH DEL VIDEO CLICAT; -#X obj 72 179 videogrid videogrid2 3 5 #F0F0F0 #0F0F0F /usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0243.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0243.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0243.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0243.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0243.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/lib/pd/extra/videogrid/videos/dscn0241.mov| -; -#X msg 156 127 putimgdir /usr/lib/pd/extra/videogrid/videos; -#X msg 156 77 putimg /usr/lib/pd/extra/videogrid/videos/dscn0241.mov -; -#X connect 2 0 8 0; -#X connect 8 0 1 0; -#X connect 9 0 8 0; -#X connect 10 0 8 0; Modified: trunk/externals/pdvjtools/videogrid/cua.c =================================================================== --- trunk/externals/pdvjtools/videogrid/cua.c 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/cua.c 2008-05-15 22:58:01 UTC (rev 9816) @@ -127,7 +127,7 @@ void eliminarCua(Cua *cua) { while (!cuaBuida(cua)) desencuar(cua); - printf("Cua eliminada\a\n"); + printf("Cua eliminada\n"); } /* funció que retorna el nombre de nodes de la cua */ @@ -160,5 +160,5 @@ } else - printf("Cua buida\a\n"); + printf("Cua buida\n"); } Deleted: trunk/externals/pdvjtools/videogrid/help-videogrid.pd =================================================================== --- trunk/externals/pdvjtools/videogrid/help-videogrid.pd 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/help-videogrid.pd 2008-05-15 22:58:01 UTC (rev 9816) @@ -1,21 +0,0 @@ -#N canvas 323 160 580 404 10; -#X symbolatom 72 324 60 0 0 0 - - -; -#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; Copied: trunk/externals/pdvjtools/videogrid/videogrid-help.pd (from rev 9812, trunk/externals/pdvjtools/videogrid/help-videogrid.pd) =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid-help.pd (rev 0) +++ trunk/externals/pdvjtools/videogrid/videogrid-help.pd 2008-05-15 22:58:01 UTC (rev 9816) @@ -0,0 +1,21 @@ +#N canvas 323 160 580 404 10; +#X symbolatom 72 324 60 0 0 0 - - -; +#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; Modified: trunk/externals/pdvjtools/videogrid/videogrid.c =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.c 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/videogrid.c 2008-05-15 22:58:01 UTC (rev 9816) @@ -1,3 +1,4 @@ + /* videogrid external for Puredata Copyright (C) 2007 Sergi Lario @@ -43,6 +44,9 @@ #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 */ @@ -80,6 +84,10 @@ 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; @@ -87,14 +95,14 @@ /* 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; + 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; + int ypos = (posCua / c) * H_CELL + ((posCua / c) + 1) * GRUIX; return(ypos + 1); } @@ -116,7 +124,7 @@ } contador++; } - post("Videogrid: Imatges temporals eliminades\n",path_total); + /* post("Videogrid: Imatges temporals eliminades\n",path_total); */ } int format_adequat_v(path nomF){ @@ -200,7 +208,7 @@ } /* printf("SURT de la creacio de la imatge %s ...",ig_path); */ }else{ - post("Videogrid: El format del fitxer %s és incompatible.",entrada); + post("Videogrid: Incompatible file format (%s).\n",entrada); } /* sys_vgui("image create photo img%x -file %s\n",x,entrada); @@ -219,7 +227,7 @@ 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, text_ypix(&x->x_obj, glist) + (x->x_num_fil * H_CELL) + 1, + 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); @@ -249,7 +257,7 @@ } } 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, text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL) + 1); + 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; @@ -265,19 +273,48 @@ 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 */ -void videogrid_erase(t_videogrid* x,t_glist* glist) +/* 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[2]; + 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); @@ -290,8 +327,16 @@ contador++; } - /* elimina el grid */ - sys_vgui(".x%x.c delete %xGRID\n", glist_getcanvas(glist), x); + /* 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); } @@ -313,7 +358,7 @@ fitxer = fopen(e,"r"); if (!fitxer) { - post("Videogrid: Problema amb l'obertura del fitxer %s\n",e); + post("Videogrid: Problem opening file %s.\n",e); } else { /* post("s'encua la imatge %s\n", e); */ @@ -333,14 +378,14 @@ int maxim; if ((dirp = opendir(x->x_dir_canvi)) == NULL) { - post("Videogrid: No es pot obrir el directori %s\n", x->x_dir_canvi); + 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); + /* 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)){ @@ -369,7 +414,7 @@ } }else{ /* directori diferent omple la cua començant pel primer fitxer */ - post("Videogrid: Nou directori %s \n", x->x_dir_actual); + /* 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)){ @@ -420,44 +465,97 @@ 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, contador, maxim; - path pathSortida; - Node *actual; + int xa, ya, postauler; if (doit) { - /* obtenir la posicio en el tauler */ - xa = x_pos / W_CELL; - ya = (y_pos / H_CELL) * x->x_num_col; - postauler = ya + xa; - /* obtenir el path per enviar a la sortida */ - if((!cuaBuida(&x->x_cua))&&(postauler < numNodes(&x->x_cua))){ - contador = 0; - maxim = x->x_num_fil * x->x_num_col; - 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)); - } - } + /* 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; @@ -466,8 +564,8 @@ 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); - *yp2 = text_ypix(&x->x_obj, glist) + (fils*H_CELL); + *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); */ } @@ -480,7 +578,7 @@ 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), text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL)); + 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); } @@ -513,7 +611,7 @@ if (vis) videogrid_drawme(s, glist, 1); else - videogrid_erase(s,glist); + videogrid_erase(s,glist,0); } @@ -585,43 +683,73 @@ 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,gensym(cadenaPathsInicials)); + 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[800]; + 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\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, nfil, ncol, maxdigit; + int maxim, maxdigit; + int nfil = 0; + int ncol = 0; if ( !x ) { - post("Videogrid: error_ intent de modificar le propietats d'un objecte inexistent\n"); + post("Videogrid: error_ Attempt to alter the properties of an object that does not exist.\n"); } - if ( argc != 5 ) - { - post("Videogrid: error_ sobre el nombre d'arguments ( 5 enlloc de %d )\n",argc); - return; + 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; } - 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_ algun dels arguments no es del tipus adequat\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; /* 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){ @@ -629,17 +757,16 @@ x->x_num_fil = nfil; x->x_num_col = ncol; }else{ - post("Videogrid: El nombre de files i columnes són inferiors al mímin permès: 1 casella\n",maxdigit); + post("Videogrid: The number of rows and columns is less than the minimum allowed: 1 cell.\n",maxdigit); } }else{ - post("Videogrid: El nombre de files i columnes excedeixen del màxim permès: un total de %d caselles\n",maxdigit); + post("Videogrid: The number of rows and columns exceeds the maximum allowed: a total of %d cells.\n",maxdigit); } - - post("Videogrid: Valors modificats_ nom = %s\n fils = %d \t cols = %d\n", x->x_name->s_name, x->x_num_fil, x->x_num_col); + /* 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); + 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 */ @@ -682,13 +809,13 @@ 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); @@ -698,59 +825,83 @@ pd_bind(&x->x_obj.ob_pd, x->x_name); /* crea la cua de nodes */ crearCua(&x->x_cua); - post("NOU videogrid: s'han entrat %d arguments\n", argc); - - if (argc != 0) - { - post("NOU videogrid: s'obre un objecte existent o amb arguments definits\n"); - /* x->x_name */ - 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; - post("!!!NOU videogrid: s'han entrat %d arguments\n", argc); - if(argc == 6){ - /* llegir la cadena de paths | afegir els paths a la cua */ - char *cadenaPaths; - cadenaPaths = (char *)malloc(51200*sizeof(char)); - strcpy(cadenaPaths,(char *)argv[5].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[5].a_w.w_symbol->s_name,"|"); - token != NULL; - token = strtok(NULL,"|") ){ - tt = gensym(token); - - /* printf("AFEGINT CARREGANT %s\n",tt->s_name); */ - /* videogrid_putvideo(x,tt); */ - /* DE MOMENT NO AFEGEIX ELS PATHS */ - /* videogrid_afegir_imatge(x,tt->s_name); */ - } - /* - token = strtok(cadenaPaths,"|"); - while(token){ - tt = gensym(token); - printf("AFEGINT CARREGANT %s\n",tt->s_name); - videogrid_putvideo(x,tt); - token = strtok(NULL,"|"); - } - */ - free(cadenaPaths); - } - }else{ - /* crea un objecte nou */ - post("NOU videogrid: es crea un objecte nou\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"); + 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); */ @@ -761,7 +912,7 @@ static void videogrid_destroy(t_videogrid *x){ /* elimina el contingut de la cua */ eliminarCua(&x->x_cua); - post("Videogrid eliminat"); + post("Videogrid destroyed.\n"); } /* generacio d'una nova classe */ @@ -814,6 +965,10 @@ 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(); Modified: trunk/externals/pdvjtools/videogrid/videogrid.tk =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.tk 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/videogrid.tk 2008-05-15 22:58:01 UTC (rev 9816) @@ -15,14 +15,16 @@ 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 @@ -39,7 +41,7 @@ videogrid_cancel $id } -proc pdtk_videogrid_dialog {id name num_fil num_col color_fons color_marc} { +proc pdtk_videogrid_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 @@ -51,12 +53,15 @@ 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 {videogrid} @@ -79,13 +84,13 @@ frame $id.1rangef pack $id.1rangef -side top - label $id.1rangef.lname -text "Nom :" + 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 "Fils :" + 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 @@ -97,22 +102,28 @@ frame $id.4rangef pack $id.4rangef -side top - label $id.4rangef.lcolor_fons -text "Color fons :" + 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 "Color marc :" + 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 videogrid_ok $id] bind $id.2rangef.num_fil <KeyPress-Return> [concat videogrid_ok $id] bind $id.3rangef.num_col <KeyPress-Return> [concat videogrid_ok $id] bind $id.4rangef.color_fons <KeyPress-Return> [concat videogrid_ok $id] bind $id.5rangef.color_marc <KeyPress-Return> [concat videogrid_ok $id] + bind $id.6rangef.color_grasp <KeyPress-Return> [concat videogrid_ok $id] focus $id.1rangef.name } Modified: trunk/externals/pdvjtools/videogrid/videogrid.tk2c =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.tk2c 2008-05-15 22:34:14 UTC (rev 9815) +++ trunk/externals/pdvjtools/videogrid/videogrid.tk2c 2008-05-15 22:58:01 UTC (rev 9816) @@ -13,7 +13,9 @@ 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 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] \\;]\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"); @@ -26,7 +28,7 @@ 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} {\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"); @@ -38,11 +40,14 @@ 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"); @@ -58,12 +63,12 @@ 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("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 \"Fils :\"\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"); @@ -73,19 +78,25 @@ 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("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 \"Color marc :\"\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"); 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: [9815] trunk/externals/pdvjtools/imagegrid/ imagegrid10x10.pd
by sergi_ll＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9815 http://pure-data.svn.sourceforge.net/pure-data/?rev=9815&view=rev Author: sergi_ll Date: 2008-05-15 15:34:14 -0700 (Thu, 15 May 2008) Log Message: ----------- delete another file Removed Paths: ------------- trunk/externals/pdvjtools/imagegrid/imagegrid10x10.pd Deleted: trunk/externals/pdvjtools/imagegrid/imagegrid10x10.pd =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid10x10.pd 2008-05-15 22:32:47 UTC (rev 9814) +++ trunk/externals/pdvjtools/imagegrid/imagegrid10x10.pd 2008-05-15 22:34:14 UTC (rev 9815) @@ -1,18 +0,0 @@ -#N canvas 329 265 823 708 10; -#X text 24 93 LLISTA STDOUT; -#X text 154 138 AFEGIR IMATGE; -#X text 154 183 AFEGIR IMATGES D'UN DIRECTORI; -#X symbolatom 26 650 60 0 0 0 - - -; -#X obj 26 110 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 --1; -#X obj 26 226 imagegrid imagegrid3 10 10 #F0F0F0 #0F0F0F ; -#X text 154 83 AFEGIR IMATGES D'UN DIRECTORI; -#X msg 156 96 putimgdir /home/sergi/vjgnulinux/media/imatges; -#X msg 156 152 putimg /usr/local/lib/pd/extra/imagegrid/images/logo100.gif -; -#X msg 156 197 putimgdir /usr/local/lib/pd/extra/imagegrid/images; -#X connect 4 0 5 0; -#X connect 5 0 3 0; -#X connect 7 0 5 0; -#X connect 8 0 5 0; -#X connect 9 0 5 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: [9814] trunk/externals/pdvjtools/imagegrid/ cat-help-imagegrid.pd
by sergi_ll＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9814 http://pure-data.svn.sourceforge.net/pure-data/?rev=9814&view=rev Author: sergi_ll Date: 2008-05-15 15:32:47 -0700 (Thu, 15 May 2008) Log Message: ----------- delete wrong example files Removed Paths: ------------- trunk/externals/pdvjtools/imagegrid/cat-help-imagegrid.pd Deleted: trunk/externals/pdvjtools/imagegrid/cat-help-imagegrid.pd =================================================================== --- trunk/externals/pdvjtools/imagegrid/cat-help-imagegrid.pd 2008-05-15 22:31:03 UTC (rev 9813) +++ trunk/externals/pdvjtools/imagegrid/cat-help-imagegrid.pd 2008-05-15 22:32:47 UTC (rev 9814) @@ -1,20 +0,0 @@ -#N canvas 258 588 984 601 10; -#X text 24 13 IMAGEGRID; -#X text 24 93 LLISTA STDOUT; -#X text 154 63 AFEGIR IMATGE; -#X text 154 113 AFEGIR IMATGES D'UN DIRECTORI; -#X symbolatom 72 324 60 0 0 0 - - -; -#X text 74 344 PATH DE LA IMATGE CLICADA; -#X obj 26 110 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 --1; -#X text 25 29 Objecte per seleccionar amb un sol clic la ubicacio d'una -imatge afegida al tauler.; -#X obj 72 183 imagegrid imagegrid2 3 5 #F0F0F0 #0F0F0F /usr/local/lib/pd/extra/imagegrid/images/logo100.gif|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.ppm|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.gif|/usr/local/lib/pd/extra/imagegrid/images/3160x120.gif|/usr/local/lib/pd/extra/imagegrid/images/logo100.gif|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.ppm|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.gif|/usr/local/lib/pd/extra/imagegrid/images/3160x120.gif|/usr/local/lib/pd/extra/imagegrid/images/logo100.gif|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.ppm|/usr/local/lib/pd/extra/imagegrid/images/3160x120.gif|/usr/local/lib/pd/extra/imagegrid/images/logo100.gif|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.ppm|/usr/local/lib/pd/extra/imagegrid/images/sll80x60.gif|/usr/local/lib/pd/extra/imagegrid/images/3160x120.gif| -; -#X msg 156 77 putimg /usr/local/lib/pd/extra/imagegrid/images/logo100.gif -; -#X msg 156 127 putimgdir /usr/local/lib/pd/extra/imagegrid/images; -#X connect 6 0 8 0; -#X connect 8 0 4 0; -#X connect 9 0 8 0; -#X connect 10 0 8 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: [9813] trunk/externals/pdvjtools/imagegrid
by sergi_ll＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9813 http://pure-data.svn.sourceforge.net/pure-data/?rev=9813&view=rev Author: sergi_ll Date: 2008-05-15 15:31:03 -0700 (Thu, 15 May 2008) Log Message: ----------- help file renamed Modified Paths: -------------- trunk/externals/pdvjtools/imagegrid/Makefile Added Paths: ----------- trunk/externals/pdvjtools/imagegrid/imagegrid-help.pd Removed Paths: ------------- trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd Modified: trunk/externals/pdvjtools/imagegrid/Makefile =================================================================== --- trunk/externals/pdvjtools/imagegrid/Makefile 2008-05-15 22:15:22 UTC (rev 9812) +++ trunk/externals/pdvjtools/imagegrid/Makefile 2008-05-15 22:31:03 UTC (rev 9813) @@ -31,7 +31,7 @@ # ---------------------------------------------------------- install: - cp help-*.pd ../../doc/5.reference + cp *-help.pd ../../doc/5.reference clean: rm -f *.o *.pd_* so_locations Deleted: trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd =================================================================== --- trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd 2008-05-15 22:15:22 UTC (rev 9812) +++ trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd 2008-05-15 22:31:03 UTC (rev 9813) @@ -1,25 +0,0 @@ -#N canvas 439 199 580 378 10; -#X text 24 13 IMAGEGRID; -#X symbolatom 79 304 60 0 0 0 - - -; -#X obj 79 67 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 --1; -#X text 184 110 ADD IMAGES FROM FOLDER; -#X text 184 60 ADD A IMAGE; -#X text 77 50 LIST STDOUT; -#X text 81 324 LOCATION OF THE SELECTED IMAGE; -#X text 25 29 Object to select the path location of an image added -in the grid.; -#X msg 185 124 putimgdir /usr/local/lib/pd/extra/imagegrid/images; -#X msg 186 74 putimg /usr/local/lib/pd/extra/imagegrid/images/logo100.gif -; -#X msg -19 98 clear; -#X obj 78 156 imagegrid imagegrid1 3 5 #F0F0F0 #0a0b0c #F1882B; -#X floatatom 27 77 5 0 0 0 - - -; -#X msg 27 97 seek \$1; -#X connect 2 0 11 0; -#X connect 8 0 11 0; -#X connect 9 0 11 0; -#X connect 10 0 11 0; -#X connect 11 0 1 0; -#X connect 12 0 13 0; -#X connect 13 0 11 0; Copied: trunk/externals/pdvjtools/imagegrid/imagegrid-help.pd (from rev 9812, trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd) =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid-help.pd (rev 0) +++ trunk/externals/pdvjtools/imagegrid/imagegrid-help.pd 2008-05-15 22:31:03 UTC (rev 9813) @@ -0,0 +1,25 @@ +#N canvas 439 199 580 378 10; +#X text 24 13 IMAGEGRID; +#X symbolatom 79 304 60 0 0 0 - - -; +#X obj 79 67 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X text 184 110 ADD IMAGES FROM FOLDER; +#X text 184 60 ADD A IMAGE; +#X text 77 50 LIST STDOUT; +#X text 81 324 LOCATION OF THE SELECTED IMAGE; +#X text 25 29 Object to select the path location of an image added +in the grid.; +#X msg 185 124 putimgdir /usr/local/lib/pd/extra/imagegrid/images; +#X msg 186 74 putimg /usr/local/lib/pd/extra/imagegrid/images/logo100.gif +; +#X msg -19 98 clear; +#X obj 78 156 imagegrid imagegrid1 3 5 #F0F0F0 #0a0b0c #F1882B; +#X floatatom 27 77 5 0 0 0 - - -; +#X msg 27 97 seek \$1; +#X connect 2 0 11 0; +#X connect 8 0 11 0; +#X connect 9 0 11 0; +#X connect 10 0 11 0; +#X connect 11 0 1 0; +#X connect 12 0 13 0; +#X connect 13 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: [9812] trunk/externals/pdvjtools/imagegrid
by sergi_ll＠users.sourceforge.net 16 May '08

16 May '08

Revision: 9812 http://pure-data.svn.sourceforge.net/pure-data/?rev=9812&view=rev Author: sergi_ll Date: 2008-05-15 15:15:22 -0700 (Thu, 15 May 2008) Log Message: ----------- seek and borders adds Modified Paths: -------------- trunk/externals/pdvjtools/imagegrid/cua.c trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd trunk/externals/pdvjtools/imagegrid/imagegrid.c trunk/externals/pdvjtools/imagegrid/imagegrid.tk trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c Modified: trunk/externals/pdvjtools/imagegrid/cua.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/cua.c 2008-05-15 17:25:09 UTC (rev 9811) +++ trunk/externals/pdvjtools/imagegrid/cua.c 2008-05-15 22:15:22 UTC (rev 9812) @@ -127,7 +127,7 @@ void eliminarCua(Cua *cua) { while (!cuaBuida(cua)) desencuar(cua); - printf("Cua eliminada\a\n"); + printf("Cua eliminada\n"); } /* funció que retorna el nombre de nodes de la cua */ @@ -160,5 +160,5 @@ } else - printf("Cua buida\a\n"); + printf("Cua buida\n"); } Modified: trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd =================================================================== --- trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd 2008-05-15 17:25:09 UTC (rev 9811) +++ trunk/externals/pdvjtools/imagegrid/help-imagegrid.pd 2008-05-15 22:15:22 UTC (rev 9812) @@ -1,19 +1,25 @@ -#N canvas 296 99 580 404 10; +#N canvas 439 199 580 378 10; #X text 24 13 IMAGEGRID; -#X symbolatom 72 324 60 0 0 0 - - -; -#X obj 26 110 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +#X symbolatom 79 304 60 0 0 0 - - -; +#X obj 79 67 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X obj 72 183 imagegrid imagegrid1 3 5 #F0F0F0 #0F0F0F ; -#X text 154 113 ADD IMAGES FROM FOLDER; -#X text 154 63 ADD A IMAGE; -#X text 24 93 LIST STDOUT; -#X text 74 344 LOCATION OF THE SELECTED IMAGE; +#X text 184 110 ADD IMAGES FROM FOLDER; +#X text 184 60 ADD A IMAGE; +#X text 77 50 LIST STDOUT; +#X text 81 324 LOCATION OF THE SELECTED IMAGE; #X text 25 29 Object to select the path location of an image added in the grid.; -#X msg 155 127 putimgdir /usr/local/lib/pd/extra/imagegrid/images; -#X msg 156 77 putimg /usr/local/lib/pd/extra/imagegrid/images/logo100.gif +#X msg 185 124 putimgdir /usr/local/lib/pd/extra/imagegrid/images; +#X msg 186 74 putimg /usr/local/lib/pd/extra/imagegrid/images/logo100.gif ; -#X connect 2 0 3 0; -#X connect 3 0 1 0; -#X connect 9 0 3 0; -#X connect 10 0 3 0; +#X msg -19 98 clear; +#X obj 78 156 imagegrid imagegrid1 3 5 #F0F0F0 #0a0b0c #F1882B; +#X floatatom 27 77 5 0 0 0 - - -; +#X msg 27 97 seek \$1; +#X connect 2 0 11 0; +#X connect 8 0 11 0; +#X connect 9 0 11 0; +#X connect 10 0 11 0; +#X connect 11 0 1 0; +#X connect 12 0 13 0; +#X connect 13 0 11 0; Modified: trunk/externals/pdvjtools/imagegrid/imagegrid.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-15 17:25:09 UTC (rev 9811) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-15 22:15:22 UTC (rev 9812) @@ -1,3 +1,4 @@ + /* imagegrid external for Puredata Copyright (C) 2007 Sergi Lario @@ -41,6 +42,9 @@ #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 *imagegrid_class; /* indica el nombre de imagegrid creats - utilitzat per diferenciar el nom d'instàncies d'objectes del mateix tipus */ @@ -78,6 +82,10 @@ 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_imagegrid; @@ -85,14 +93,14 @@ /* 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; - int xpos = (posCua % c) * W_CELL; + 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_imagegrid* x, int posCua){ int c = x->x_num_col; - int ypos = (posCua / c) * H_CELL; + int ypos = (posCua / c) * H_CELL + ((posCua / c) + 1) * GRUIX; return(ypos + 1); } @@ -114,7 +122,7 @@ } contador++; } - post("Imagegrid: Imatges temporals eliminades\n",path_total); + /* post("Imagegrid: Imatges temporals eliminades\n",path_total); */ } int format_adequat(path nomF){ @@ -181,22 +189,20 @@ strcat(ig_path,nNstr); strcat(ig_path,"."); strcat(ig_path,FORMAT_MINIATURA); - /*printf("Creacio de la imatge %s ...",ig_path);*/ + /* post("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_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("Imagegrid: El format del fitxer %s és incompatible.",entrada); + post("Imagegrid: Incompatible file format (%s).\n",entrada); } /* sys_vgui("image create photo img%x -file %s\n",x,entrada); @@ -215,7 +221,7 @@ 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, text_ypix(&x->x_obj, glist) + (x->x_num_fil * H_CELL) + 1, + 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); @@ -242,10 +248,10 @@ 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, text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL) + 1); + 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; @@ -261,33 +267,71 @@ sprintf(buf, "pdtk_imagegrid_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 imagegrid */ -void imagegrid_erase(t_imagegrid* x,t_glist* glist) +/* borra imagegrid v 0.2 -- int toclear */ +void imagegrid_erase(t_imagegrid* x,t_glist* glist, int toclear) { int maxim = x->x_num_fil * x->x_num_col; path path_total; - char contador_str[2]; + 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); + strcat(path_total,FORMAT_MINIATURA); if(unlink(path_total)){ /* post("Imatge temporal %s eliminada\n",path_total); */ - } + } contador++; } - /* elimina el grid */ - sys_vgui(".x%x.c delete %xGRID\n", glist_getcanvas(glist), x); + /* 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); } @@ -309,7 +353,7 @@ fitxer = fopen(e,"r"); if (!fitxer) { - post("Imagegrid: Problema amb l'obertura del fitxer %s\n",e); + post("Imagegrid: Problem opening file %s.\n",e); } else { /* post("s'encua la imatge %s\n", e); */ @@ -329,14 +373,14 @@ int maxim; if ((dirp = opendir(x->x_dir_canvi)) == NULL) { - post("Imagegrid: No es pot obrir el directori %s\n", x->x_dir_canvi); + post("Imagegrid: 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("Imagegrid: Repeteix directori %s\n", x->x_dir_actual); + /* post("Imagegrid: 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)){ @@ -365,7 +409,7 @@ } }else{ /* directori diferent omple la cua començant pel primer fitxer */ - post("Imagegrid: Nou directori %s \n", x->x_dir_actual); + /* post("Imagegrid: 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)){ @@ -416,44 +460,97 @@ pthread_mutex_destroy(&x->x_lock); } + +/* v 0.2 -- mètode de la classe que desmarca la cel·la seleccionada */ +static void imagegrid_ungrasp_selected(t_imagegrid *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 imagegrid_grasp_selected(t_imagegrid *x, int pos) +{ + /*printf("Grasp selected thumb %d", pos);*/ + if(pos != x->x_pos_selected) { + imagegrid_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 imagegrid_seek(t_imagegrid *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 imagegrid_click amb %d %d a la posicio %d\n", x_pos, y_pos, postauler);*/ + /* v 0.2 -- marcar casella */ + imagegrid_grasp_selected(x, postauler); + } + } +} + static int imagegrid_click(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) { t_imagegrid* x = (t_imagegrid *)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, contador, maxim; - path pathSortida; - Node *actual; + int xa, ya, postauler; if (doit) { - /* obtenir la posicio en el tauler */ - xa = x_pos / W_CELL; - ya = (y_pos / H_CELL) * x->x_num_col; - postauler = ya + xa; - /* obtenir el path per enviar a la sortida */ - if((!cuaBuida(&x->x_cua))&&(postauler < numNodes(&x->x_cua))){ - contador = 0; - maxim = x->x_num_fil * x->x_num_col; - 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)); - } - } + /* 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 // + imagegrid_seek(x, postauler); } return (1); } +/* v 0.2 -- mètode de la classe que buida el tauler amb el missatge [clear ( */ +void imagegrid_clear(t_imagegrid *x) +{ + imagegrid_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; + imagegrid_drawme(x, x->x_glist, 0); +} + + static void imagegrid_getrect(t_gobj *z, t_glist *glist,int *xp1, int *yp1, int *xp2, int *yp2) { int cols, fils; @@ -462,9 +559,9 @@ 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); - *yp2 = text_ypix(&x->x_obj, glist) + (fils*H_CELL); - /* 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); */ + *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 imagegrid_displace(t_gobj *z, t_glist *glist,int dx, int dy) @@ -476,7 +573,7 @@ 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), text_ypix(&x->x_obj, glist) + (x->x_num_fil*H_CELL)); + 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); imagegrid_drawme(x, glist, 0); canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); } @@ -509,7 +606,7 @@ if (vis) imagegrid_drawme(s, glist, 1); else - imagegrid_erase(s,glist); + imagegrid_erase(s,glist,0); } @@ -581,61 +678,90 @@ 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,gensym(cadenaPathsInicials)); + 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 imagegrid_properties(t_gobj *z, t_glist *owner) { - char buf[800]; + char buf[900]; t_imagegrid *x=(t_imagegrid *)z; /* post("Es crida a pdtk_imagegrid 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_imagegrid_dialog %%s %s %d %d %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); + sprintf(buf, "pdtk_imagegrid_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("imagegrid_properties : %s", buf ); */ gfxstub_new(&x->x_obj.ob_pd, x, buf); } static void imagegrid_dialog(t_imagegrid *x, t_symbol *s, int argc, t_atom *argv) { - int maxim, nfil, ncol, maxdigit; + int maxim, maxdigit; + int nfil = 0; + int ncol = 0; if ( !x ) { - post("Imagegrid: error_ intent de modificar le propietats d'un objecte inexistent\n"); + post("Imagegrid: error_ Attempt to alter the properties of an object that does not exist.\n"); } - if ( argc != 5 ) - { - post("Imagegrid: error_ sobre el nombre d'arguments ( 5 enlloc de %d )\n",argc); - return; + 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("Imagegrid: 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("Imagegrid: 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("Imagegrid: 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; } - 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("Imagegrid: error_ algun dels arguments no es del tipus adequat\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; /* 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){ + if((nfil*ncol) > 0){ x->x_num_fil = nfil; x->x_num_col = ncol; }else{ - post("Imagegrid: El nombre de files i columnes són inferiors al mímin permès: 1 casella\n",maxdigit); + post("Imagegrid: The number of rows and columns is less than the minimum allowed: 1 cell.\n",maxdigit); } }else{ - post("Imagegrid: El nombre de files i columnes excedeixen del màxim permès: un total de %d caselles\n",maxdigit); + post("Imagegrid: The number of rows and columns exceeds the maximum allowed: a total of %d cells.\n",maxdigit); } - - post("Imagegrid: Valors modificats_ nom = %s\n fils = %d \t cols = %d\n", x->x_name->s_name, x->x_num_fil, x->x_num_col); + /* post("Imagegrid: 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; - imagegrid_erase(x, x->x_glist); + imagegrid_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 */ @@ -678,13 +804,13 @@ 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, "imagegrid%d", ++imagegridcount); @@ -694,59 +820,83 @@ pd_bind(&x->x_obj.ob_pd, x->x_name); /* crea la cua de nodes */ crearCua(&x->x_cua); - post("NOU imagegrid: s'han entrat %d arguments\n", argc); - - if (argc != 0) - { - post("NOU imagegrid: s'obre un objecte existent o amb arguments definits\n"); - /* x->x_name */ - 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; - post("!!!NOU imagegrid: s'han entrat %d arguments\n", argc); - if(argc == 6){ - /* llegir la cadena de paths | afegir els paths a la cua */ - char *cadenaPaths; - cadenaPaths = (char *)malloc(51200*sizeof(char)); - strcpy(cadenaPaths,(char *)argv[5].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[5].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); */ - /* DE MOMENT 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); - } - }else{ - /* crea un objecte nou */ - post("NOU imagegrid: es crea un objecte nou\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"); + post("NEW imagegrid: 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 imagegrid 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); */ @@ -757,7 +907,7 @@ static void imagegrid_destroy(t_imagegrid *x){ /* elimina el contingut de la cua */ eliminarCua(&x->x_cua); - post("Imagegrid eliminat"); + post("Imagegrid destroyed.\n"); } /* generacio d'una nova classe */ @@ -810,6 +960,10 @@ class_addmethod(imagegrid_class, (t_method)imagegrid_dialog, gensym("dialog"), A_GIMME, 0); /* afegeix un metode per l'obtencio de la posicio del clic del ratolí */ class_addmethod(imagegrid_class, (t_method)imagegrid_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(imagegrid_class, (t_method)imagegrid_clear, gensym("clear"), 0); + /* v 0.2 -- afegeix un metode seek #num per disparar */ + class_addmethod(imagegrid_class, (t_method)imagegrid_seek, gensym("seek"), A_FLOAT, 0); /* inicia el comportament de imagegrid */ imagegrid_setwidget(); Modified: trunk/externals/pdvjtools/imagegrid/imagegrid.tk =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.tk 2008-05-15 17:25:09 UTC (rev 9811) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.tk 2008-05-15 22:15:22 UTC (rev 9812) @@ -15,14 +15,16 @@ 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 @@ -39,7 +41,7 @@ imagegrid_cancel $id } -proc pdtk_imagegrid_dialog {id name num_fil num_col color_fons color_marc} { +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 @@ -51,12 +53,15 @@ 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} @@ -79,13 +84,13 @@ frame $id.1rangef pack $id.1rangef -side top - label $id.1rangef.lname -text "Nom :" + 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 "Fils :" + 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 @@ -97,22 +102,28 @@ frame $id.4rangef pack $id.4rangef -side top - label $id.4rangef.lcolor_fons -text "Color fons :" + 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 "Color marc :" + 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 } Modified: trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c 2008-05-15 17:25:09 UTC (rev 9811) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.tk2c 2008-05-15 22:15:22 UTC (rev 9812) @@ -13,7 +13,9 @@ 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 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] \\;]\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"); @@ -26,7 +28,7 @@ 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} {\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"); @@ -38,11 +40,14 @@ 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"); @@ -81,11 +86,17 @@ 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"); 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: [9811] trunk/packages/linux_make/debian/control
by eighthave＠users.sourceforge.net 15 May '08

15 May '08

Revision: 9811 http://pure-data.svn.sourceforge.net/pure-data/?rev=9811&view=rev Author: eighthave Date: 2008-05-15 10:25:09 -0700 (Thu, 15 May 2008) Log Message: ----------- added xdg-utils to the recommends list since it provides xdg-open, which is very useful for opening URLs of all types Modified Paths: -------------- trunk/packages/linux_make/debian/control Modified: trunk/packages/linux_make/debian/control =================================================================== --- trunk/packages/linux_make/debian/control 2008-05-15 14:22:00 UTC (rev 9810) +++ trunk/packages/linux_make/debian/control 2008-05-15 17:25:09 UTC (rev 9811) @@ -9,7 +9,7 @@ Replaces: puredata, pd-externals, gem, pd-pdp, pd-zexy Conflicts: pd, pd-externals, gem, pd-pdp, pd-zexy Provides: pd -Recommends: liblame0, qjackctl +Recommends: liblame0, qjackctl, xdg-utils Suggests: xmms Description: Pure Data with patches and a large collection of externals Pd (aka Pure Data) is a real-time graphical programming environment for 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: [9810] trunk/externals/hcs/examples/move_pd_window. pd
by eighthave＠users.sourceforge.net 15 May '08

15 May '08

Revision: 9810 http://pure-data.svn.sourceforge.net/pure-data/?rev=9810&view=rev Author: eighthave Date: 2008-05-15 07:22:00 -0700 (Thu, 15 May 2008) Log Message: ----------- created example using [sys_gui] and [window_name] to move the windows around, including the Pd window Added Paths: ----------- trunk/externals/hcs/examples/move_pd_window.pd Added: trunk/externals/hcs/examples/move_pd_window.pd =================================================================== --- trunk/externals/hcs/examples/move_pd_window.pd (rev 0) +++ trunk/externals/hcs/examples/move_pd_window.pd 2008-05-15 14:22:00 UTC (rev 9810) @@ -0,0 +1,39 @@ +#N canvas 532 145 637 496 10; +#X symbolatom 247 208 0 0 0 0 - - -; +#X obj 232 155 pack 0 0; +#X text 72 -108 move the Pd window around; +#X text 29 337 You can do lots of things using Tcl/Tk commands:; +#X obj 328 338 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/wm.htm +; +#X obj 246 130 trigger bang float; +#X obj 53 -76 unauthorized/grid pdwin 200 0 800 150 0 600 0 4 5 10 +10 65 -53; +#X obj 232 186 zexy/makesymbol +%s+%s; +#X obj 246 109 -; +#X msg 246 86 600 \$1; +#X text 412 234 "." means the Pd window; +#X obj 232 259 pack symbol symbol; +#X msg 232 281 wm geometry \$2 \$1; +#X obj 337 238 symbol; +#X msg 395 206 .; +#X obj 395 182 loadbang; +#X obj 471 205 hcs/window_name; +#X obj 231 308 hcs/sys_gui; +#X msg 471 181 bang; +#X text 503 178 current window; +#X connect 1 0 7 0; +#X connect 5 0 1 0; +#X connect 5 1 1 1; +#X connect 6 0 1 0; +#X connect 6 1 9 0; +#X connect 7 0 0 0; +#X connect 7 0 11 0; +#X connect 8 0 5 0; +#X connect 9 0 8 0; +#X connect 11 0 12 0; +#X connect 12 0 17 0; +#X connect 13 0 11 1; +#X connect 14 0 13 0; +#X connect 15 0 14 0; +#X connect 16 0 13 0; +#X connect 18 0 16 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: [9809] branches/pd-extended/v0-40/pd/src/u_main.tk
by eighthave＠users.sourceforge.net 15 May '08

15 May '08

Revision: 9809 http://pure-data.svn.sourceforge.net/pure-data/?rev=9809&view=rev Author: eighthave Date: 2008-05-15 06:58:06 -0700 (Thu, 15 May 2008) Log Message: ----------- oops, forgot to add the Ctrl-b Help Browser binding to the Pd window Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/u_main.tk Modified: branches/pd-extended/v0-40/pd/src/u_main.tk =================================================================== --- branches/pd-extended/v0-40/pd/src/u_main.tk 2008-05-15 13:49:39 UTC (rev 9808) +++ branches/pd-extended/v0-40/pd/src/u_main.tk 2008-05-15 13:58:06 UTC (rev 9809) @@ -3648,23 +3648,24 @@ global pd_nt # puts stderr [concat key $key shift $shift] # .dummy itemconfig goo -text [concat ---> control-key event $key]; - if {$shift == 1} { + if {$shift == 1} { if {$key == "l" || $key == "L"} {menu_clear_console} - if {$key == "q" || $key == "Q"} {menu_really_quit} + if {$key == "q" || $key == "Q"} {menu_really_quit} if {$key == "r" || $key == "R"} {menu_toggle_console} - } else { - if {$key == "n" || $key == "N"} {menu_new} - if {$key == "o" || $key == "O"} {menu_open} - if {$key == "q" || $key == "Q"} {menu_quit} + } else { + if {$key == "b" || $key == "B"} {menu_doc_browser} + if {$key == "n" || $key == "N"} {menu_new} + if {$key == "o" || $key == "O"} {menu_open} + if {$key == "q" || $key == "Q"} {menu_quit} if {$key == "r" || $key == "R"} {menu_raise_console} - if {$pd_nt != 2} { - # Cmd-m is minimize window on Mac OS X - if {$key == "m" || $key == "M"} {menu_send} + if {$pd_nt != 2} { + # Cmd-m is minimize window on Mac OS X + if {$key == "m" || $key == "M"} {menu_send} } else { - if {$key == "m" || $key == "M"} {menu_minimize} + if {$key == "m" || $key == "M"} {menu_minimize} } - if {$key == "slash"} {menu_audio 1} - if {$key == "period"} {menu_audio 0} + if {$key == "slash"} {menu_audio 1} + if {$key == "period"} {menu_audio 0} } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
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