From: <cd...@us...> - 2012-08-04 20:59:40
|
Revision: 10821 http://octave.svn.sourceforge.net/octave/?rev=10821&view=rev Author: cdf Date: 2012-08-04 20:59:31 +0000 (Sat, 04 Aug 2012) Log Message: ----------- prepare for release Modified Paths: -------------- trunk/octave-forge/extra/fpl/DESCRIPTION trunk/octave-forge/extra/fpl/INDEX trunk/octave-forge/extra/fpl/src/array_to_uint8.cc Added Paths: ----------- trunk/octave-forge/extra/fpl/inst/deprecated/ trunk/octave-forge/extra/fpl/inst/deprecated/FPL2coloredgradient.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2coloredrubbersheet.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2dxappenddata.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2dxoutputdata.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2dxoutputtimeseries.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2pdequiver.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2pdequiver.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2pdeshowmesh.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2pdeshowmesh.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2pdesurf.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2ptcquiver.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2ptcquiver.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2ptcshowmesh.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2ptcshowmesh.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2ptcsurf.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2ptcsurf.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2showmesh.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2trspdesurf.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2trspdesurf.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2trsptcsurf.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL2trsptcsurf.net trunk/octave-forge/extra/fpl/inst/deprecated/FPL2vtkoutputdata.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL3dxoutputfield.m trunk/octave-forge/extra/fpl/inst/deprecated/FPL3dxoutputmesh.m Removed Paths: ------------- trunk/octave-forge/extra/fpl/inst/FPL2coloredgradient.net trunk/octave-forge/extra/fpl/inst/FPL2coloredrubbersheet.net trunk/octave-forge/extra/fpl/inst/FPL2dxappenddata.m trunk/octave-forge/extra/fpl/inst/FPL2dxoutputdata.m trunk/octave-forge/extra/fpl/inst/FPL2dxoutputtimeseries.m trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.m trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.net trunk/octave-forge/extra/fpl/inst/FPL2pdeshowmesh.m trunk/octave-forge/extra/fpl/inst/FPL2pdeshowmesh.net trunk/octave-forge/extra/fpl/inst/FPL2pdesurf.m trunk/octave-forge/extra/fpl/inst/FPL2ptcquiver.m trunk/octave-forge/extra/fpl/inst/FPL2ptcquiver.net trunk/octave-forge/extra/fpl/inst/FPL2ptcshowmesh.m trunk/octave-forge/extra/fpl/inst/FPL2ptcshowmesh.net trunk/octave-forge/extra/fpl/inst/FPL2ptcsurf.m trunk/octave-forge/extra/fpl/inst/FPL2ptcsurf.net trunk/octave-forge/extra/fpl/inst/FPL2showmesh.net trunk/octave-forge/extra/fpl/inst/FPL2trspdesurf.m trunk/octave-forge/extra/fpl/inst/FPL2trspdesurf.net trunk/octave-forge/extra/fpl/inst/FPL2trsptcsurf.m trunk/octave-forge/extra/fpl/inst/FPL2trsptcsurf.net trunk/octave-forge/extra/fpl/inst/FPL2vtkoutputdata.m trunk/octave-forge/extra/fpl/inst/FPL3dxoutputfield.m trunk/octave-forge/extra/fpl/inst/FPL3dxoutputmesh.m Modified: trunk/octave-forge/extra/fpl/DESCRIPTION =================================================================== --- trunk/octave-forge/extra/fpl/DESCRIPTION 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/DESCRIPTION 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,12 +1,12 @@ Name: fpl -Version: 1.2.0 -Date: 2010-06-12 -Author: Carlo de Falco, Massimiliano Culpo +Version: 1.3.0 +Date: 2012-08-04 +Author: Carlo de Falco, Massimiliano Culpo and others Maintainer: Carlo de Falco, Massimiliano Culpo Title: Fem PLotting Description: Collection of routines to save data in different graphical formats. Categories: Graphics Depends: octave ( >= 3.0.0 ) License: GNU/GPL -SystemRequirements: dx ( >= 4.3.2), sed, bash -SVNRelease: 7425 \ No newline at end of file +SystemRequirements: +SVNRelease: 10821 Modified: trunk/octave-forge/extra/fpl/INDEX =================================================================== --- trunk/octave-forge/extra/fpl/INDEX 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/INDEX 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,28 +1,10 @@ FPL >> FEM Plotting -Functions to save data in DX format - fpl_dx_write_field.m - fpl_dx_write_series.m Functions to save data in VTK format fpl_vtk_write_field.m + fpl_vtk_b64_write_field.m fpl_vtk_assemble_series.m savevtk savevtkvector Pdetool compatible plotting functions pdesurf pdemesh -Legacy DX export functions - FPL2dxappenddata - FPL2dxoutputdata - FPL2dxoutputtimeseries - FPL3dxoutputmesh - FPL3dxoutputfield -Legacy DX wrappers - FPL2pdeshowmesh - FPL2ptcshowmesh - FPL2pdesurf - FPL2ptcsurf - FPL2trspdesurf - FPL2trsptcsurf - FPL2pdequiver - FPL2ptcquiver - FPL2vtkoutputdata Deleted: trunk/octave-forge/extra/fpl/inst/FPL2coloredgradient.net =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2coloredgradient.net 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2coloredgradient.net 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,635 +0,0 @@ -// -// time: Wed Jun 13 18:54:22 2007 -// -// version: 3.2.0 (format), 4.4.4 (DX) -// -// -// MODULE main -// workspace: width = 459, height = 507 -// layout: snap = 0, width = 50, height = 50, align = NN -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 28, y = 29, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "__FILE__DX__" - // output[2]: visible = 1, type = 32, value = "__FILE__DX__" - // - // - // node Import[1]: x = 34, y = 109, inputs = 6, label = Import - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Post[1]: x = 124, y = 167, inputs = 2, label = Post - // input[2]: defaulting = 0, visible = 1, type = 32, value = "positions" - // -main_Post_1_out_1 = - Post( - main_Import_1_out_1, - main_Post_1_in_2 - ) [instance: 1, cache: 1]; - // - // node Gradient[1]: x = 227, y = 144, inputs = 2, label = Gradient - // -main_Gradient_1_out_1 = - Gradient( - main_Post_1_out_1, - main_Gradient_1_in_2 - ) [instance: 1, cache: 1]; - // - // node AutoGlyph[1]: x = 241, y = 215, inputs = 7, label = AutoGlyph - // -main_AutoGlyph_1_out_1 = - AutoGlyph( - main_Gradient_1_out_1, - main_AutoGlyph_1_in_2, - main_AutoGlyph_1_in_3, - main_AutoGlyph_1_in_4, - main_AutoGlyph_1_in_5, - main_AutoGlyph_1_in_6, - main_AutoGlyph_1_in_7 - ) [instance: 1, cache: 1]; - // - // node AutoColor[1]: x = 253, y = 283, inputs = 10, label = AutoColor - // -main_AutoColor_1_out_1, -main_AutoColor_1_out_2 = - AutoColor( - main_AutoGlyph_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node ShowConnections[1]: x = 39, y = 242, inputs = 1, label = ShowConnections - // -main_ShowConnections_1_out_1 = - ShowConnections( - main_Post_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Color[1]: x = 72, y = 328, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // input[3]: defaulting = 0, visible = 1, type = 5, value = .5 - // -main_Color_1_out_1 = - Color( - main_ShowConnections_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node ColorBar[1]: x = 339, y = 285, inputs = 16, label = ColorBar - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_ColorBar_1_in_6, - main_ColorBar_1_in_7, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[1]: x = 280, y = 393, inputs = 3, label = Collect - // -main_Collect_1_out_1 = - Collect( - main_Color_1_out_1, - main_AutoColor_1_out_1, - main_ColorBar_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Image[1]: x = 188, y = 445, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [0.182894 0.102434 0] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [0.182894 0.102434 3.60504] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 0.460265 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 772 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.791 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 1, visible = 0, type = 5, value = 7.30519 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "snow" - // input[25]: defaulting = 0, visible = 0, type = 32, value = "/Users/carlo/Desktop/COMSONDEMO/CoMSON DP/doping.tif" - // input[26]: defaulting = 0, visible = 0, type = 32, value = "tiff" - // input[29]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[31]: defaulting = 0, visible = 0, type = 1, value = -5 - // input[33]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[34]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[36]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[37]: defaulting = 0, visible = 0, type = 16777248, value = {"clear", "black", "blue", "blue"} - // input[38]: defaulting = 0, visible = 0, type = 16777248, value = {"background", "grid", "ticks", "labels"} - // input[39]: defaulting = 0, visible = 0, type = 5, value = 0.65 - // input[40]: defaulting = 0, visible = 0, type = 32, value = "roman_d" - // input[41]: defaulting = 0, visible = 0, type = 32, value = "panzoom" - // depth: value = 24 - // window: position = (0.0000,0.0000), size = 0.6141x0.6396 - // internal caching: 1 - // -main_Image_1_out_1, -main_Image_1_out_2, -main_Image_1_out_3 = - Image( - main_Image_1_in_1, - main_Collect_1_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = "/tmp/SECS2D.6003912.dx"; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Post_1_in_2 = "positions"; -main_Post_1_out_1 = NULL; -main_Gradient_1_in_2 = NULL; -main_Gradient_1_out_1 = NULL; -main_AutoGlyph_1_in_2 = NULL; -main_AutoGlyph_1_in_3 = NULL; -main_AutoGlyph_1_in_4 = NULL; -main_AutoGlyph_1_in_5 = NULL; -main_AutoGlyph_1_in_6 = NULL; -main_AutoGlyph_1_in_7 = NULL; -main_AutoGlyph_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = NULL; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_ShowConnections_1_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = .5; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_ColorBar_1_in_2 = NULL; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = NULL; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_6 = NULL; -main_ColorBar_1_in_7 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = NULL; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_1_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X24,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [0.182894 0.102434 0]; -main_Image_1_in_6 = [0.182894 0.102434 3.60504]; -main_Image_1_in_7 = 0.460265; -main_Image_1_in_8 = 772; -main_Image_1_in_9 = 0.791; -main_Image_1_in_10 = [0 1 0]; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "snow"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = "/Users/carlo/Desktop/COMSONDEMO/CoMSON DP/doping.tif"; -main_Image_1_in_26 = "tiff"; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = 1; -main_Image_1_in_30 = NULL; -main_Image_1_in_31 = -5; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = 1; -main_Image_1_in_34 = 0; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = 1; -main_Image_1_in_37 = {"clear", "black", "blue", "blue"}; -main_Image_1_in_38 = {"background", "grid", "ticks", "labels"}; -main_Image_1_in_39 = 0.65; -main_Image_1_in_40 = "roman_d"; -main_Image_1_in_41 = "panzoom"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 4 4"); -$sync -main(); Deleted: trunk/octave-forge/extra/fpl/inst/FPL2coloredrubbersheet.net =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2coloredrubbersheet.net 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2coloredrubbersheet.net 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,619 +0,0 @@ -// -// time: Wed Jun 13 17:16:01 2007 -// -// version: 3.2.0 (format), 4.4.4 (DX) -// -// -// MODULE main -// workspace: width = 533, height = 507 -// layout: snap = 0, width = 50, height = 50, align = NN -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 51, y = 31, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "__FILE__DX__" - // output[2]: visible = 1, type = 32, value = "__FILE__DX__" - // - // - // node Import[1]: x = 104, y = 118, inputs = 6, label = Import - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Post[1]: x = 249, y = 57, inputs = 2, label = Post - // input[2]: defaulting = 0, visible = 1, type = 32, value = "__DATA_DEPENDENCY__" - // -main_Post_1_out_1 = - Post( - main_Import_1_out_1, - main_Post_1_in_2 - ) [instance: 1, cache: 1]; - // - // node RubberSheet[1]: x = 228, y = 142, inputs = 4, label = RubberSheet - // -main_RubberSheet_1_out_1 = - RubberSheet( - main_Post_1_out_1, - main_RubberSheet_1_in_2, - main_RubberSheet_1_in_3, - main_RubberSheet_1_in_4 - ) [instance: 1, cache: 1]; - // - // node AutoColor[1]: x = 253, y = 283, inputs = 10, label = AutoColor - // -main_AutoColor_1_out_1, -main_AutoColor_1_out_2 = - AutoColor( - main_RubberSheet_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node ShowConnections[1]: x = 49, y = 232, inputs = 1, label = ShowConnections - // -main_ShowConnections_1_out_1 = - ShowConnections( - main_RubberSheet_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Color[1]: x = 72, y = 328, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // input[3]: defaulting = 0, visible = 1, type = 5, value = .5 - // -main_Color_1_out_1 = - Color( - main_ShowConnections_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node ColorBar[1]: x = 413, y = 290, inputs = 16, label = ColorBar - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_ColorBar_1_in_6, - main_ColorBar_1_in_7, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[1]: x = 280, y = 393, inputs = 3, label = Collect - // -main_Collect_1_out_1 = - Collect( - main_Color_1_out_1, - main_AutoColor_1_out_1, - main_ColorBar_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Image[1]: x = 188, y = 445, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [0.466889 0.863877 0.166499] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [0.466889 0.863877 4.74189] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 1.01623 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 1254 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.730064 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 1, visible = 0, type = 5, value = 12.6739 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "snow" - // input[25]: defaulting = 0, visible = 0, type = 32, value = "/Users/carlo/Desktop/COMSONDEMO/CoMSON DP/doping.tif" - // input[26]: defaulting = 0, visible = 0, type = 32, value = "tiff" - // input[29]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[31]: defaulting = 0, visible = 0, type = 1, value = -5 - // input[33]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[34]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[36]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[37]: defaulting = 0, visible = 0, type = 16777248, value = {"clear", "black", "blue", "blue"} - // input[38]: defaulting = 0, visible = 0, type = 16777248, value = {"background", "grid", "ticks", "labels"} - // input[39]: defaulting = 0, visible = 0, type = 5, value = 0.65 - // input[40]: defaulting = 0, visible = 0, type = 32, value = "roman_d" - // input[41]: defaulting = 0, visible = 0, type = 32, value = "panzoom" - // depth: value = 24 - // window: position = (0.0000,0.0283), size = 0.9906x0.9375 - // internal caching: 1 - // -main_Image_1_out_1, -main_Image_1_out_2, -main_Image_1_out_3 = - Image( - main_Image_1_in_1, - main_Collect_1_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = "__FILE__DX__"; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Post_1_in_2 = "positions"; -main_Post_1_out_1 = NULL; -main_RubberSheet_1_in_2 = NULL; -main_RubberSheet_1_in_3 = NULL; -main_RubberSheet_1_in_4 = NULL; -main_RubberSheet_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = NULL; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_ShowConnections_1_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = .5; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_ColorBar_1_in_2 = NULL; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = NULL; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_6 = NULL; -main_ColorBar_1_in_7 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = NULL; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_1_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X24,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [0.466889 0.863877 0.166499]; -main_Image_1_in_6 = [0.466889 0.863877 4.74189]; -main_Image_1_in_7 = 1.01623; -main_Image_1_in_8 = 1254; -main_Image_1_in_9 = 0.730064; -main_Image_1_in_10 = [0 1 0]; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "snow"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = "/Users/carlo/Desktop/COMSONDEMO/CoMSON DP/doping.tif"; -main_Image_1_in_26 = "tiff"; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = 1; -main_Image_1_in_30 = NULL; -main_Image_1_in_31 = -5; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = 1; -main_Image_1_in_34 = 0; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = 1; -main_Image_1_in_37 = {"clear", "black", "blue", "blue"}; -main_Image_1_in_38 = {"background", "grid", "ticks", "labels"}; -main_Image_1_in_39 = 0.65; -main_Image_1_in_40 = "roman_d"; -main_Image_1_in_41 = "panzoom"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 4 4"); -$sync -main(); Deleted: trunk/octave-forge/extra/fpl/inst/FPL2dxappenddata.m =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2dxappenddata.m 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2dxappenddata.m 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,90 +0,0 @@ -## Copyright (C) 2004-2008 Carlo de Falco, Massimiliano Culpo -## -## This file is part of -## -## FPL - Fem PLotting package for octave -## -## FPL is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## FPL is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with FPL; If not, see <http://www.gnu.org/licenses/>. -## -## -## AUTHORS: -## Carlo de Falco <cdf _AT_ users.sourceforge.net> -## -## Culpo Massimiliano -## Bergische Universitaet Wuppertal -## Fachbereich C - Mathematik und Naturwissenschaften -## Arbeitsgruppe fuer Angewandte MathematD-42119 Wuppertal Gaussstr. 20 -## D-42119 Wuppertal, Germany - -## -*- texinfo -*- -## @deftypefn {Function File} {} FPL2dxappenddata ( @var{filename}, -## @var{p}, @var{t}, @var{u}, @var{attr_name}, @var{attr_rank}, -## @var{attr_shape}, @var{endflie} ) -## -## Apends data to a file in DX form. -## Only one variable can be written to the file -## variable must be a scalar, vector or tensor of doubles -## mesh data in the file must be consistent with this variable -## -## Variable must be a scalar, vector or tensor of doubles -## -## @itemize @minus -## @item @var{filename}= name of file to save (type string) -## @item @var{p}, @var{t} = mesh -## @item @var{u} = variable to save -## @item @var{attr_name} = name of the variable (type string) -## @item @var{attr_rank} = rank of variable data (0 for scalar, 1 for vector, etc.) -## @item @var{attr_shape} = number of components of variable data (assumed 1 for scalar) -## @item @var{endfile} = 0 if you want to add other variables to the -## same file, 1 otherwise -## @end itemize -## @end deftypefn - -function FPL2dxappenddata(filename,p,t,u,attr_name,attr_rank,attr_shape,endfile) - - p = p'; - t = t'; - t = t(:,1:3); - - fid=fopen (filename,'a'); - Nnodi = size(p,1); - Ntriangoli = size(t,1); - - fprintf(fid,'\nattribute "element type" string "triangles"\nattribute "ref" string "positions"\n\n'); - - if ((attr_rank==0) & (min(size(u))==1)) - fprintf(fid,'object "%s.data"\nclass array type double rank 0 items %d data follows',attr_name,Nnodi); - fprintf(fid,'\n %1.7e',u); - else - fprintf(fid,'object "%s.data"\nclass array type double rank %d shape %d items %d data follows', ... - attr_name,attr_rank,attr_shape,Nnodi); - for i=1:Nnodi - fprintf(fid,'\n'); - fprintf(fid,' %1.7e',u(i,:)); - endfor - endif - fprintf(fid,['\nattribute "dep" string "positions"\n\n' ... - 'object "%s" class field\n'... - 'component "positions" value "pos"\n'... - 'component "connections" value "con"\n'... - 'component "data" value "%s.data"\n'],... - attr_name,attr_name); - - if(endfile) - fprintf(fid,'\nend\n'); - endif - - fclose (fid); - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/fpl/inst/FPL2dxoutputdata.m =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2dxoutputdata.m 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2dxoutputdata.m 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,126 +0,0 @@ -## Copyright (C) 2004-2008,2009 Carlo de Falco, Massimiliano Culpo -## -## This file is part of -## -## FPL - Fem PLotting package for octave -## -## FPL is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## FPL is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with FPL; If not, see <http://www.gnu.org/licenses/>. -## -## -## AUTHORS: -## Carlo de Falco <cdf _AT_ users.sourceforge.net> -## -## Culpo Massimiliano -## Bergische Universitaet Wuppertal -## Fachbereich C - Mathematik und Naturwissenschaften -## Arbeitsgruppe fuer Angewandte MathematD-42119 Wuppertal Gaussstr. 20 -## D-42119 Wuppertal, Germany - -## -*- texinfo -*- -## @deftypefn {Function File} {} FPL2dxoutputdata ( @var{filename}, @ -## @var{p}, @var{t}, @var{u}, @var{attr_name}, @var{attr_rank}, @ -## @var{attr_shape}, @var{endfile} ) -## -## Outputs data in DX form. -## -## Variable must be a scalar, vector or tensor of doubles -## -## @itemize @minus -## @item @var{filename}= name of file to save (type string) -## @item @var{p}, @var{t} = mesh -## @item @var{u} = variable to save -## @item @var{attr_name} = name of the variable (type string) -## @item @var{attr_rank} = rank of variable data (0 for scalar, 1 for vector, etc.) -## @item @var{attr_shape} = number of components of variable data (assumed 1 for scalar) -## @item @var{endfile} = 0 if you want to add other variables to the -## same file, 1 otherwise -## @end itemize -## @end deftypefn - -function FPL2dxoutputdata(filename,p,t,u,attr_name,attr_rank,attr_shape,endfile) - - p = p'; - t = t'; - t = t(:,1:3); - - fid=fopen (filename,'w'); - Nnodi = size(p,1); - Ntriangoli = size(t,1); - Ndati = size(u,1); - - fprintf(fid,"object ""pos""\nclass array type float rank 1 shape 2 items %d data follows",Nnodi); - - for i=1:Nnodi - fprintf(fid,"\n"); - fprintf(fid," %1.7e",p(i,:)); - endfor - - if (min(min(t))==1) - t=t-1; - elseif(min(min(t))~=0) - disp('WARNING: check triangle structure') - endif - ## In DX format nodes are - ## numbered starting from zero, - ## instead we want to number - ## them starting from 1! - ## Here we restore the DX - ## format - - fprintf(fid,"\n\nobject ""con""\nclass array type int rank 1 shape 3 items %d data follows",Ntriangoli); - for i=1:Ntriangoli - fprintf(fid,"\n"); - fprintf(fid," %d",t(i,:)); - endfor - - fprintf(fid,"\nattribute ""element type"" string ""triangles""\nattribute ""ref"" string ""positions""\n\n"); - - if ((attr_rank==0) && (min(size(u))==1)) - fprintf(fid,"object ""%s.data""\nclass array type double rank 0 items %d data follows",attr_name,Ndati); - fprintf(fid,"\n %1.7e",u); - - else - fprintf(fid,"object ""%s.data""\nclass array type double rank %d shape %d items %d data follows", ... - attr_name,attr_rank,attr_shape,Ndati); - for i=1:Ndati - fprintf(fid,"\n"); - fprintf(fid," %1.7e",u(i,:)); - endfor - - endif - - if Ndati==Nnodi - fprintf(fid,["\nattribute ""dep"" string ""positions""\n\n" ... - "object ""%s"" class field\n"... - "component ""positions"" value ""pos""\n"... - "component ""connections"" value ""con""\n"... - "component ""data"" value ""%s.data""\n"],... - attr_name,attr_name); - elseif Ndati==Ntriangoli - fprintf(fid,["\nattribute ""dep"" string ""connections""\n\n" ... - "object ""%s"" class field\n"... - "component ""positions"" value ""pos""\n"... - "component ""connections"" value ""con""\n"... - "component ""data"" value ""%s.data""\n"],... - attr_name,attr_name); - endif - - if(endfile) - fprintf(fid,"\nend\n"); - endif - - fclose (fid); - - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/fpl/inst/FPL2dxoutputtimeseries.m =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2dxoutputtimeseries.m 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2dxoutputtimeseries.m 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,71 +0,0 @@ -## Copyright (C) 2004-2008 Carlo de Falco, Massimiliano Culpo -## -## This file is part of -## -## FPL - Fem PLotting package for octave -## -## FPL is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## FPL is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with FPL; If not, see <http://www.gnu.org/licenses/>. -## -## -## AUTHORS: -## Carlo de Falco <cdf _AT_ users.sourceforge.net> -## -## Culpo Massimiliano -## Bergische Universitaet Wuppertal -## Fachbereich C - Mathematik und Naturwissenschaften -## Arbeitsgruppe fuer Angewandte MathematD-42119 Wuppertal Gaussstr. 20 -## D-42119 Wuppertal, Germany - -## -*- texinfo -*- -## @deftypefn {Function File} {} FPL2dxoutputtimeseries ( @var{filename}, @var{p}, @var{t}, @var{u}, @var{attr_name}, @var{attr_rank}, @var{attr_shape}, @var{time} ) -## -## Outputs a time series in DX form. -## variable must be a scalar, vector or tensor of doubles -## @itemize @minus -## @item @var{filename}= name of file to save (type string) -## @item @var{p}, @var{t} = mesh -## @item @var{u} = variable to save -## @item @var{attr_name} = name of the variable (type string) -## @item @var{attr_rank} = rank of variable data (0 for scalar, 1 for vector, etc.) -## @item @var{attr_shape} = number of components of variable data (assumed 1 for scalar) -## @item @var{time} = time instants -## @end itemize -## @end deftypefn - -function FPL2dxoutputtimeseries(filename,p,t,u,attr_name,attr_rank,attr_shape,time) - - Nsteps = length(time); - if (Nsteps<=1) - endfile = 1; - else - endfile = 0; - endif - - FPL2dxoutputdata(filename,p,t,u(:,1:attr_shape),[attr_name "1"],attr_rank,attr_shape,endfile); - - for it = 2:Nsteps - FPL2dxappenddata(filename,p,t,u(:,[1:attr_shape]+attr_shape*(it-1)),... - [attr_name num2str(it)],attr_rank,attr_shape,endfile); - endfor - - fid=fopen(filename,"a"); - - fprintf (fid, "object \"%s_series\" class series\n",attr_name); - for it = 1:Nsteps - fprintf (fid,"member %d position %g value \"%s\"\n",it-1,time(it),[attr_name num2str(it)]); - endfor - fprintf (fid, "\nend\n"); - fclose(fid); - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.m =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.m 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.m 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,92 +0,0 @@ -## Copyright (C) 2004-2008 Carlo de Falco, Massimiliano Culpo -## -## This file is part of -## -## FPL - Fem PLotting package for octave -## -## FPL is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## FPL is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with FPL; If not, see <http://www.gnu.org/licenses/>. -## -## -## AUTHORS: -## Carlo de Falco <cdf _AT_ users.sourceforge.net> -## -## Culpo Massimiliano -## Bergische Universitaet Wuppertal -## Fachbereich C - Mathematik und Naturwissenschaften -## Arbeitsgruppe fuer Angewandte MathematD-42119 Wuppertal Gaussstr. 20 -## D-42119 Wuppertal, Germany - -## -*- texinfo -*- -## @deftypefn {Function File} {} FPL2pdequiver (@var{mesh}, @ -## @var{vx}, @var{vy}, [ @var{property}, @var{value} ...]) -## -## Plots the 2D vector field @var{vx}, @var{vy} -## defined on the triangulation @var{mesh} using opendx. -## -## Options (default values): -## @var{sample_density} (100) -## -## @seealso{FPL2pdesurf, FPL2ptcsurf, FPL2ptcquiver} -## @end deftypefn - -function FPL2pdequiver(mesh,vecfieldx,vecfieldy,varargin); - - sample_density = "100"; - - if( (nargin >= 3) && (rem(nargin,2)==1) ) - for ii=1:2:length(varargin) - [ varargin{ii} " = " varargin{ii+1} ";" ] - eval([ varargin{ii} " = """ varargin{ii+1} """;" ]); - endfor - else - error(["wrong number of parameters " num2str (nargin)]) - endif - - JX = sum(vecfieldx,1)'/3; - JY = sum(vecfieldy,1)'/3; - - dataname = mktemp("/tmp",".dx"); - scriptname = mktemp("/tmp",".net"); - - FPL2dxoutputdata(dataname,mesh.p,mesh.t,[ JX JY],'J',1,2,1); - - showmesh = file_in_path(path,"FPL2pdequiver.net"); - - system (["cp " showmesh " " scriptname]); - system (["sed -i \'s|__FILE__DX__|" dataname "|g\' " scriptname]); - system (["sed -i \'s|__SAMPLE__DENSITY__|" sample_density "|g\' " scriptname]); - - command = ["dx -noConfirmedQuit -program " scriptname " -execute -image >& /dev/null & "]; - - system(command); - - -endfunction - -function filename = mktemp (direct,ext); - - if (~exist(direct,"dir")) - error("trying to save temporary file to non existing directory") - endif - - done=false; - - while ~done - filename = [direct,"/FPL.",num2str(floor(rand*1e7)),ext]; - if ~exist(filename,"file") - done =true; - endif - endwhile - -endfunction Deleted: trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.net =================================================================== --- trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.net 2012-08-04 19:47:21 UTC (rev 10820) +++ trunk/octave-forge/extra/fpl/inst/FPL2pdequiver.net 2012-08-04 20:59:31 UTC (rev 10821) @@ -1,613 +0,0 @@ -// -// time: Fri Jun 15 19:24:56 2007 -// -// version: 3.2.0 (format), 4.4.4 (DX) -// -// -// MODULE main -// workspace: width = 481, height = 614 -// layout: snap = 0, width = 50, height = 50, align = NN -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 173, y = 81, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "__FILE__DX__" - // output[2]: visible = 1, type = 32, value = "__FILE__DX__" - // - // - // node Import[1]: x = 203, y = 177, inputs = 6, label = Import - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Sample[1]: x = 89, y = 238, inputs = 2, label = Sample - // input[2]: defaulting = 0, visible = 1, type = 1, value = __SAMPLE__DENSITY__ - // -main_Sample_1_out_1 = - Sample( - main_Import_1_out_1, - main_Sample_1_in_2 - ) [instance: 1, cache: 1]; - // - // node AutoGlyph[1]: x = 64, y = 323, inputs = 7, label = AutoGlyph - // -main_AutoGlyph_1_out_1 = - AutoGlyph( - main_Sample_1_out_1, - main_AutoGlyph_1_in_2, - main_AutoGlyph_1_in_3, - main_AutoGlyph_1_in_4, - main_AutoGlyph_1_in_5, - main_AutoGlyph_1_in_6, - main_AutoGlyph_1_in_7 - ) [instance: 1, cache: 1]; - // - // node AutoColor[1]: x = 76, y = 415, inputs = 10, label = AutoColor - // -main_AutoColor_1_out_1, -main_AutoColor_1_out_2 = - AutoColor( - main_AutoGlyph_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node ColorBar[1]: x = 238, y = 367, inputs = 16, label = ColorBar - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_ColorBar_1_in_6, - main_ColorBar_1_in_7, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node ShowConnections[1]: x = 348, y = 295, inputs = 1, label = ShowConnections - // -main_ShowConnections_1_ou... [truncated message content] |