Menu
▾
▴
octaviz-cvsupdate — CVS update notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(14) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(1) |
Mar
(8) |
Apr
(6) |
May
(5) |
Jun
(2) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(2) |
Dec
(21) |
| 2007 |
Jan
(9) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
|
Dec
(15) |
| 2008 |
Jan
(6) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/Widgets In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Widgets Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Widgets/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 29 Dec 2006 03:33:37 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 @@ -1,5 +1,5 @@ SET(KIT_WRAP_DEPS Rendering) -OCTAVE_WRAP_VTK(Widgets WIDGETS "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK(Widgets "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( Widgets ALL COMMAND touch Widgets DEPENDS ${all_oct} ) INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkWidgets.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907 Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- CMakeLists.txt 17 Jan 2007 21:09:34 -0000 1.10 +++ CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.11 @@ -66,7 +66,8 @@ #ENDFOREACH(kit) # Macro to create Octave wrapper functions -MACRO(OCTAVE_WRAP_VTK kit ukit deps) +MACRO(OCTAVE_WRAP_VTK kit deps) + STRING(TOUPPER ${kit} ukit) # Hack for symbolic links # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}") |
|
From: Thomas W. <tho...@us...> - 2007-02-25 19:29:54
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26704/Scripts Modified Files: vtkGetDataRoot.m Log Message: Use vktGetDataRoot() instead of hard-coded paths Use @VTK_DATA_ROOT for configuration via cmake at build time Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtkGetDataRoot.m 3 Feb 2007 19:51:26 -0000 1.4 +++ vtkGetDataRoot.m 25 Feb 2007 19:29:52 -0000 1.5 @@ -37,10 +37,10 @@ env_data_root = getenv("VTK_DATA_ROOT"); ## set at Octaviz's compile time - oct_data_root = ""; + oct_data_root = "@VTK_DATA_ROOT@"; ## locally set path - local_data_root = "/usr/share/vtkdata"; + local_data_root = "/usr/share/VTKData"; data_root_path = [ env_data_root; local_data_root; oct_data_root ]; |
|
From: Thomas W. <tho...@us...> - 2007-02-25 19:29:54
|
Update of /cvsroot/octaviz/octaviz/Examples In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26704/Examples Modified Files: PolyCut.m vtk_image_demo.m xyPlot.m Log Message: Use vktGetDataRoot() instead of hard-coded paths Use @VTK_DATA_ROOT for configuration via cmake at build time Index: PolyCut.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Examples/PolyCut.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- PolyCut.m 21 Sep 2004 22:50:41 -0000 1.1.1.1 +++ PolyCut.m 25 Feb 2007 19:29:50 -0000 1.2 @@ -6,7 +6,8 @@ % First start by reading a cow model. We also generate surface normals for; % prettier rendering.; cow = vtkBYUReader(); -cow.SetGeometryFileName("/usr/share/vtkdata/Data/Viewpoint/cow.g"); +VTK_DATA_ROOT = vtkGetDataRoot(); +cow.SetGeometryFileName(strcat(VTK_DATA_ROOT,"/Data/Viewpoint/cow.g")); cowNormals = vtkPolyDataNormals(); cowNormals.SetInput(cow.GetOutput()); @@ -103,4 +104,4 @@ %renWin.SetSize(300, 300); -vtk_update(f); \ No newline at end of file +vtk_update(f); Index: xyPlot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Examples/xyPlot.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- xyPlot.m 21 Sep 2004 22:50:41 -0000 1.1.1.1 +++ xyPlot.m 25 Feb 2007 19:29:51 -0000 1.2 @@ -14,10 +14,11 @@ vtk_init +VTK_DATA_ROOT = vtkGetDataRoot(); % Create a PLOT3D reader and load the data. pl3d = vtkPLOT3DReader("New"); - pl3d.SetXYZFileName("/usr/share/vtkdata/Data/combxyz.bin") - pl3d.SetQFileName("/usr/share/vtkdata/Data/combq.bin") + pl3d.SetXYZFileName(strcat(VTK_DATA_ROOT,"/Data/combxyz.bin")); + pl3d.SetQFileName(strcat(VTK_DATA_ROOT,"/Data/combq.bin")); pl3d.SetScalarFunctionNumber(100) pl3d.SetVectorFunctionNumber(202) pl3d.Update() Index: vtk_image_demo.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Examples/vtk_image_demo.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- vtk_image_demo.m 21 Sep 2004 22:50:43 -0000 1.1.1.1 +++ vtk_image_demo.m 25 Feb 2007 19:29:51 -0000 1.2 @@ -18,7 +18,8 @@ reader = vtkPNGReader(); reader.SetDataSpacing(0.8, 0.8, 1.5) -reader.SetFileName("/usr/share/vtkdata/Data/fullhead15.png") +VTK_DATA_ROOT = vtkGetDataRoot(); +reader.SetFileName(strcat(VTK_DATA_ROOT,"/Data/fullhead15.png")); shiftScale = vtkImageShiftScale(); shiftScale.SetInput(reader.GetOutput()) shiftScale.SetShift(0) |
|
From: Jonathan S. <jjs...@us...> - 2007-02-03 19:51:43
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21062 Modified Files: vtkGetDataRoot.m vtk_quiver3.m Log Message: minor edits Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtkGetDataRoot.m 29 Dec 2006 03:24:59 -0000 1.3 +++ vtkGetDataRoot.m 3 Feb 2007 19:51:26 -0000 1.4 @@ -1,3 +1,28 @@ +## Copyright (C) 2004 Dragan Tubic +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this file. If not, write to the Free Software Foundation, +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +## -*- texinfo -*- +## @deftypefn {Function File} {@var{f} =} vtkGetDataRoot () +## Internal function for many of the examples. Determines the path for +## VTK example data. +## @end deftypefn + +## Author: Jonathan Stickel + + function f = vtkGetDataRoot() ## I guess this is a locally set variable; should put this in documents Index: vtk_quiver3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_quiver3.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_quiver3.m 7 Mar 2005 02:05:00 -0000 1.2 +++ vtk_quiver3.m 3 Feb 2007 19:51:26 -0000 1.3 @@ -113,8 +113,8 @@ [nr nc] = size(pz); len = nr*nc*3; vect = zeros(len,1); - size(u) - len + ##size(u) + ##len vect(1:3:len) = u; vect(2:3:len) = v; vect(3:3:len) = w; |
|
From: Jonathan S. <jjs...@us...> - 2007-02-03 19:50:37
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20681 Removed Files: vtkColors.m Log Message: moved vtkColors.m --- vtkColors.m DELETED --- |
|
From: Jonathan S. <jjs...@us...> - 2007-02-03 19:49:28
|
Update of /cvsroot/octaviz/octaviz/Examples In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20238 Added Files: vtkColors.m Log Message: moved vtkColors.m --- NEW FILE: vtkColors.m --- % This module defines many standard colors that should be useful. % These colors should be exactly the same as the ones defined in % colors.tcl. % Whites antique_white = [0.9804, 0.9216, 0.8431]; azure = [0.9412, 1.0000, 1.0000]; bisque = [1.0000, 0.8941, 0.7686]; blanched_almond = [1.0000, 0.9216, 0.8039]; cornsilk = [1.0000, 0.9725, 0.8627]; eggshell = [0.9900, 0.9000, 0.7900]; floral_white = [1.0000, 0.9804, 0.9412]; gainsboro = [0.8627, 0.8627, 0.8627]; ghost_white = [0.9725, 0.9725, 1.0000]; honeydew = [0.9412, 1.0000, 0.9412]; ivory = [1.0000, 1.0000, 0.9412]; lavender = [0.9020, 0.9020, 0.9804]; lavender_blush = [1.0000, 0.9412, 0.9608]; lemon_chiffon = [1.0000, 0.9804, 0.8039]; linen = [0.9804, 0.9412, 0.9020]; mint_cream = [0.9608, 1.0000, 0.9804]; misty_rose = [1.0000, 0.8941, 0.8824]; moccasin = [1.0000, 0.8941, 0.7098]; navajo_white = [1.0000, 0.8706, 0.6784]; old_lace = [0.9922, 0.9608, 0.9020]; papaya_whip = [1.0000, 0.9373, 0.8353]; peach_puff = [1.0000, 0.8549, 0.7255]; seashell = [1.0000, 0.9608, 0.9333]; snow = [1.0000, 0.9804, 0.9804]; thistle = [0.8471, 0.7490, 0.8471]; titanium_white = [0.9900, 1.0000, 0.9400]; wheat = [0.9608, 0.8706, 0.7020]; white = [1.0000, 1.0000, 1.0000]; white_smoke = [0.9608, 0.9608, 0.9608]; zinc_white = [0.9900, 0.9700, 1.0000]; % Greys cold_grey = [0.5000, 0.5400, 0.5300]; dim_grey = [0.4118, 0.4118, 0.4118]; grey = [0.7529, 0.7529, 0.7529]; light_grey = [0.8275, 0.8275, 0.8275]; slate_grey = [0.4392, 0.5020, 0.5647]; slate_grey_dark = [0.1843, 0.3098, 0.3098]; slate_grey_light = [0.4667, 0.5333, 0.6000]; warm_grey = [0.5000, 0.5000, 0.4100]; % Blacks black = [0.0000, 0.0000, 0.0000]; ivory_black = [0.1600, 0.1400, 0.1300]; lamp_black = [0.1800, 0.2800, 0.2300]; % Reds alizarin_crimson = [0.8900, 0.1500, 0.2100]; brick = [0.6100, 0.4000, 0.1200]; cadmium_red_deep = [0.8900, 0.0900, 0.0500]; coral = [1.0000, 0.4980, 0.3137]; coral_light = [0.9412, 0.5020, 0.5020]; deep_pink = [1.0000, 0.0784, 0.5765]; english_red = [0.8300, 0.2400, 0.1000]; firebrick = [0.6980, 0.1333, 0.1333]; geranium_lake = [0.8900, 0.0700, 0.1900]; hot_pink = [1.0000, 0.4118, 0.7059]; indian_red = [0.6900, 0.0900, 0.1200]; light_salmon = [1.0000, 0.6275, 0.4784]; madder_lake_deep = [0.8900, 0.1800, 0.1900]; maroon = [0.6902, 0.1882, 0.3765]; pink = [1.0000, 0.7529, 0.7961]; pink_light = [1.0000, 0.7137, 0.7569]; raspberry = [0.5300, 0.1500, 0.3400]; red = [1.0000, 0.0000, 0.0000]; rose_madder = [0.8900, 0.2100, 0.2200]; salmon = [0.9804, 0.5020, 0.4471]; tomato = [1.0000, 0.3882, 0.2784]; venetian_red = [0.8300, 0.1000, 0.1200]; % Browns beige = [0.6400, 0.5800, 0.5000]; brown = [0.5000, 0.1647, 0.1647]; brown_madder = [0.8600, 0.1600, 0.1600]; brown_ochre = [0.5300, 0.2600, 0.1200]; burlywood = [0.8706, 0.7216, 0.5294]; burnt_sienna = [0.5400, 0.2100, 0.0600]; burnt_umber = [0.5400, 0.2000, 0.1400]; chocolate = [0.8235, 0.4118, 0.1176]; deep_ochre = [0.4500, 0.2400, 0.1000]; flesh = [1.0000, 0.4900, 0.2500]; flesh_ochre = [1.0000, 0.3400, 0.1300]; gold_ochre = [0.7800, 0.4700, 0.1500]; greenish_umber = [1.0000, 0.2400, 0.0500]; khaki = [0.9412, 0.9020, 0.5490]; khaki_dark = [0.7412, 0.7176, 0.4196]; light_beige = [0.9608, 0.9608, 0.8627]; peru = [0.8039, 0.5216, 0.2471]; rosy_brown = [0.7373, 0.5608, 0.5608]; raw_sienna = [0.7800, 0.3800, 0.0800]; raw_umber = [0.4500, 0.2900, 0.0700]; sepia = [0.3700, 0.1500, 0.0700]; sienna = [0.6275, 0.3216, 0.1765]; saddle_brown = [0.5451, 0.2706, 0.0745]; sandy_brown = [0.9569, 0.6431, 0.3765]; tan = [0.8235, 0.7059, 0.5490]; van_dyke_brown = [0.3700, 0.1500, 0.0200]; % Oranges cadmium_orange = [1.0000, 0.3800, 0.0100]; cadmium_red_light = [1.0000, 0.0100, 0.0500]; carrot = [0.9300, 0.5700, 0.1300]; dark_orange = [1.0000, 0.5490, 0.0000]; mars_orange = [0.5900, 0.2700, 0.0800]; mars_yellow = [0.8900, 0.4400, 0.1000]; orange = [1.0000, 0.5000, 0.0000]; orange_red = [1.0000, 0.2706, 0.0000]; yellow_ochre = [0.8900, 0.5100, 0.0900]; % Yellows aureoline_yellow = [1.0000, 0.6600, 0.1400]; banana = [0.8900, 0.8100, 0.3400]; cadmium_lemon = [1.0000, 0.8900, 0.0100]; cadmium_yellow = [1.0000, 0.6000, 0.0700]; cadmium_yellow_light = [1.0000, 0.6900, 0.0600]; gold = [1.0000, 0.8431, 0.0000]; goldenrod = [0.8549, 0.6471, 0.1255]; goldenrod_dark = [0.7216, 0.5255, 0.0431]; goldenrod_light = [0.9804, 0.9804, 0.8235]; goldenrod_pale = [0.9333, 0.9098, 0.6667]; light_goldenrod = [0.9333, 0.8667, 0.5098]; melon = [0.8900, 0.6600, 0.4100]; naples_yellow_deep = [1.0000, 0.6600, 0.0700]; yellow = [1.0000, 1.0000, 0.0000]; yellow_light = [1.0000, 1.0000, 0.8784]; % Greens chartreuse = [0.4980, 1.0000, 0.0000]; chrome_oxide_green = [0.4000, 0.5000, 0.0800]; cinnabar_green = [0.3800, 0.7000, 0.1600]; cobalt_green = [0.2400, 0.5700, 0.2500]; emerald_green = [0.0000, 0.7900, 0.3400]; forest_green = [0.1333, 0.5451, 0.1333]; green = [0.0000, 1.0000, 0.0000]; green_dark = [0.0000, 0.3922, 0.0000]; green_pale = [0.5961, 0.9843, 0.5961]; green_yellow = [0.6784, 1.0000, 0.1843]; lawn_green = [0.4863, 0.9882, 0.0000]; lime_green = [0.1961, 0.8039, 0.1961]; mint = [0.7400, 0.9900, 0.7900]; olive = [0.2300, 0.3700, 0.1700]; olive_drab = [0.4196, 0.5569, 0.1373]; olive_green_dark = [0.3333, 0.4196, 0.1843]; permanent_green = [0.0400, 0.7900, 0.1700]; sap_green = [0.1900, 0.5000, 0.0800]; sea_green = [0.1804, 0.5451, 0.3412]; sea_green_dark = [0.5608, 0.7373, 0.5608]; sea_green_medium = [0.2353, 0.7020, 0.4431]; sea_green_light = [0.1255, 0.6980, 0.6667]; spring_green = [0.0000, 1.0000, 0.4980]; spring_green_medium = [0.0000, 0.9804, 0.6039]; terre_verte = [0.2200, 0.3700, 0.0600]; viridian_light = [0.4300, 1.0000, 0.4400]; yellow_green = [0.6039, 0.8039, 0.1961]; % Cyans aquamarine = [0.4980, 1.0000, 0.8314]; aquamarine_medium = [0.4000, 0.8039, 0.6667]; cyan = [0.0000, 1.0000, 1.0000]; cyan_white = [0.8784, 1.0000, 1.0000]; turquoise = [0.2510, 0.8784, 0.8157]; turquoise_dark = [0.0000, 0.8078, 0.8196]; turquoise_medium = [0.2824, 0.8196, 0.8000]; turquoise_pale = [0.6863, 0.9333, 0.9333]; % Blues alice_blue = [0.9412, 0.9725, 1.0000]; blue = [0.0000, 0.0000, 1.0000]; blue_light = [0.6784, 0.8471, 0.9020]; blue_medium = [0.0000, 0.0000, 0.8039]; cadet = [0.3725, 0.6196, 0.6275]; cobalt = [0.2400, 0.3500, 0.6700]; cornflower = [0.3922, 0.5843, 0.9294]; cerulean = [0.0200, 0.7200, 0.8000]; dodger_blue = [0.1176, 0.5647, 1.0000]; indigo = [0.0300, 0.1800, 0.3300]; manganese_blue = [0.0100, 0.6600, 0.6200]; midnight_blue = [0.0980, 0.0980, 0.4392]; navy = [0.0000, 0.0000, 0.5020]; peacock = [0.2000, 0.6300, 0.7900]; powder_blue = [0.6902, 0.8784, 0.9020]; royal_blue = [0.2549, 0.4118, 0.8824]; slate_blue = [0.4157, 0.3529, 0.8039]; slate_blue_dark = [0.2824, 0.2392, 0.5451]; slate_blue_light = [0.5176, 0.4392, 1.0000]; slate_blue_medium = [0.4824, 0.4078, 0.9333]; sky_blue = [0.5294, 0.8078, 0.9216]; sky_blue_deep = [0.0000, 0.7490, 1.0000]; sky_blue_light = [0.5294, 0.8078, 0.9804]; steel_blue = [0.2745, 0.5098, 0.7059]; steel_blue_light = [0.6902, 0.7686, 0.8706]; turquoise_blue = [0.0000, 0.7800, 0.5500]; ultramarine = [0.0700, 0.0400, 0.5600]; % Magentas blue_violet = [0.5412, 0.1686, 0.8863]; cobalt_violet_deep = [0.5700, 0.1300, 0.6200]; magenta = [1.0000, 0.0000, 1.0000]; orchid = [0.8549, 0.4392, 0.8392]; orchid_dark = [0.6000, 0.1961, 0.8000]; orchid_medium = [0.7294, 0.3333, 0.8275]; permanent_red_violet = [0.8600, 0.1500, 0.2700]; plum = [0.8667, 0.6275, 0.8667]; purple = [0.6275, 0.1255, 0.9412]; purple_medium = [0.5765, 0.4392, 0.8588]; ultramarine_violet = [0.3600, 0.1400, 0.4300]; violet = [0.5600, 0.3700, 0.6000]; violet_dark = [0.5804, 0.0000, 0.8275]; violet_red = [0.8157, 0.1255, 0.5647]; violet_red_medium = [0.7804, 0.0824, 0.5216]; violet_red_pale = [0.8588, 0.4392, 0.5765]; |
|
From: Jonathan S. <jjs...@us...> - 2007-01-27 22:50:43
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24964 Modified Files: vtk_polycut.m vtk_trimesh.m vtk_trisurf.m vtk_update.m Log Message: a few bug fixes and adjustments Index: vtk_update.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_update.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_update.m 1 Jun 2005 19:40:40 -0000 1.3 +++ vtk_update.m 27 Jan 2007 22:50:38 -0000 1.4 @@ -27,6 +27,7 @@ f.outline_actor.VisibilityOff(); f.axes.VisibilityOff(); + if ( f.axes_on ) b = f.renderer.ComputeVisiblePropBounds(); f.outline.SetBounds( b(1), b(2), b(3), b(4), b(5), b(6) ); @@ -39,3 +40,14 @@ f.window.Render(); endfunction + +## 'f.axes_on' is reverting to 1 after being set to 0, effectively making the if statement above of no effect +## to be solved later; JJS 1/24/07 +## for example, do: +##(make a figure with axes, e.g. vtk_sombsurf) +##f = vtk_figure(0); +##f.axes_on = 0 +##vtk_update (f); +##clear f +##f = vtk_figure (0); +##f.axes_on Index: vtk_polycut.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_polycut.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_polycut.m 27 Oct 2004 05:34:45 -0000 1.1 +++ vtk_polycut.m 27 Jan 2007 22:50:38 -0000 1.2 @@ -15,7 +15,7 @@ ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{f} =} vtk_polycut(@var{t},@var{x},@var{y},@var{z},@var{c},@var{p0},@var{n}) +## @deftypefn {Function File} vtk_polycut(@var{t},@var{x},@var{y},@var{z},@var{c},@var{p0},@var{n}) ## This function cuts a polygon surface at a plane, leaving only the ## line plot of the surface in that plane. The plane is defined by the ## point @var{p0} and the normal @var{n}. @@ -57,12 +57,14 @@ pts = [x y z]'; coords.SetArray( pts(:), 3*length(x), 0 ); points.SetData(coords); - - colors = vtkUnsignedCharArray; - colors.SetNumberOfTuples( length(x) ); - colors.SetNumberOfComponents(3); - c = c'*255; - colors.SetArray( c(:), 3*length(x), 0 ); + + ## difficult to see the lines with this color scheme; + ## just use default white for now; JJS 1/24/07 + ##colors = vtkUnsignedCharArray; + ##colors.SetNumberOfTuples( length(x) ); + ##colors.SetNumberOfComponents(3); + ##c = c'*255; + ##colors.SetArray( c(:), 3*length(x), 0 ); %% for (i=0; i<6; i++) polys->InsertNextCell(4,pts[i]); [nr nc] = size(t); @@ -82,7 +84,7 @@ %% We now assign the pieces to the vtkPolyData. surface.SetPoints(points); surface.SetPolys(polys); - surface.GetPointData().SetScalars(colors); + ##surface.GetPointData().SetScalars(colors); %% We clip with an implicit function. Here we use a plane positioned near; Index: vtk_trisurf.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_trisurf.m,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- vtk_trisurf.m 25 Dec 2006 20:12:50 -0000 1.10 +++ vtk_trisurf.m 27 Jan 2007 22:50:38 -0000 1.11 @@ -146,7 +146,24 @@ endif no_tris = length(t); - t = [ones(no_tris,1)*3 t-1]'; + ## check whether t has invalid indices (prevent segfaults), JJS 1/22/07 + npts = length(x); + tmin = min(t(:)); + tmax = max(t(:)); + if ( tmin < 0 ) + error ("negative value indices detected") + elseif ( tmin==0 ) + if ( tmax>npts-1 ) + error ("maximum index value is larger than the number of points") + endif + t = [ones(no_tris,1)*3 t]'; + warning ("using zero value indices") + else + if ( tmax>npts ) + error ("maximum index value is larger than the number of points") + endif + t = [ones(no_tris,1)*3 t-1]'; + endif ptids = vtkIdTypeArray; ptids.SetArray( t(:), no_tris*4, 0 ); polys.SetCells( no_tris, ptids ); Index: vtk_trimesh.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_trimesh.m,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- vtk_trimesh.m 25 Dec 2006 20:12:50 -0000 1.8 +++ vtk_trimesh.m 27 Jan 2007 22:50:38 -0000 1.9 @@ -174,7 +174,24 @@ endif no_tris = length(t); - t = [ones(no_tris,1)*3 t-1]'; + ## check whether t has invalid indices (prevent segfaults), JJS 1/22/07 + npts = length(x); + tmin = min(t(:)); + tmax = max(t(:)); + if ( tmin < 0 ) + error ("negative value indices detected") + elseif ( tmin==0 ) + if ( tmax>npts-1 ) + error ("maximum index value is larger than the number of points") + endif + t = [ones(no_tris,1)*3 t]'; + warning ("using zero value indices") + else + if ( tmax>npts ) + error ("maximum index value is larger than the number of points") + endif + t = [ones(no_tris,1)*3 t-1]'; + endif ptids = vtkIdTypeArray; ptids.SetArray( t(:), no_tris*4, 0 ); polys.SetCells( no_tris, ptids ); |
|
From: Thomas W. <tho...@us...> - 2007-01-17 21:19:01
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19697/Common Modified Files: CMakeLists.txt Log Message: Unify indentation (2 spaces), using cmake-mode.el http://www.cmake.org/Wiki/CMake_Editors_Support Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CMakeLists.txt 26 Dec 2006 14:18:54 -0000 1.6 +++ CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.7 @@ -30,5 +30,4 @@ # Remove prefix from octave lib install dir STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR}) INSTALL_TARGETS(${OUT_MTCH} octaviz) - - \ No newline at end of file + |
|
From: Thomas W. <tho...@us...> - 2007-01-17 21:18:59
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19697/Scripts Modified Files: CMakeLists.txt Log Message: Unify indentation (2 spaces), using cmake-mode.el http://www.cmake.org/Wiki/CMake_Editors_Support Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 29 Dec 2006 03:24:59 -0000 1.2 +++ CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.3 @@ -4,13 +4,13 @@ # Insert VTK_DATA_ROOT given to cmake into vtkGetDataRoot.m CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m - ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) + ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC) IF(CURRENT_DIR_EXEC MATCHES "Scripts") - SET(CURR_DIR "") + SET(CURR_DIR "") ELSE(CURRENT_DIR_EXEC MATCHES "Scripts") - SET(CURR_DIR "Scripts") + SET(CURR_DIR "Scripts") ENDIF(CURRENT_DIR_EXEC MATCHES "Scripts") EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE M_SCRIPTS_EXEC) |
|
From: Thomas W. <tho...@us...> - 2007-01-17 21:18:58
|
Update of /cvsroot/octaviz/octaviz/Examples In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19697/Examples Modified Files: CMakeLists.txt Log Message: Unify indentation (2 spaces), using cmake-mode.el http://www.cmake.org/Wiki/CMake_Editors_Support Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Examples/CMakeLists.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CMakeLists.txt 21 Sep 2004 22:50:41 -0000 1.1.1.1 +++ CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.2 @@ -4,9 +4,9 @@ EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC) IF(CURRENT_DIR_EXEC MATCHES "Examples") - SET(CURR_DIR "") + SET(CURR_DIR "") ELSE(CURRENT_DIR_EXEC MATCHES "Examples") - SET(CURR_DIR "Examples") + SET(CURR_DIR "Examples") ENDIF(CURRENT_DIR_EXEC MATCHES "Examples") EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE EXAMPLE_SCRIPTS_EXEC) |
|
From: Thomas W. <tho...@us...> - 2007-01-17 21:09:39
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17641 Modified Files: CMakeLists.txt Log Message: Unify indentation (2 spaces), using cmake-mode.el http://www.cmake.org/Wiki/CMake_Editors_Support Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- CMakeLists.txt 12 Jan 2007 08:12:41 -0000 1.9 +++ CMakeLists.txt 17 Jan 2007 21:09:34 -0000 1.10 @@ -3,162 +3,162 @@ PROJECT(OCTAVIZ) - ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in - CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) +## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) - ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - ## +ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +## - OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) - STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON) - IF(PCH_ON) - SET(CXX_COMPILER_PCH "g++" CACHE STRING "CMake overides compiler environment varibles. Put the compiler name here.") - ENDIF(PCH_ON) +OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) +STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON) +IF(PCH_ON) + SET(CXX_COMPILER_PCH "g++" CACHE STRING "CMake overides compiler environment varibles. Put the compiler name here.") +ENDIF(PCH_ON) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) - FIND_PACKAGE(VTK) - IF(NOT VTK_FOUND) - MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.") - ENDIF(NOT VTK_FOUND) +FIND_PACKAGE(VTK) +IF(NOT VTK_FOUND) + MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.") +ENDIF(NOT VTK_FOUND) - # load the needed compiler and linker settings to use VTK. - INCLUDE(${VTK_USE_FILE}) - - FIND_PACKAGE(X11) - IF(NOT X11_FOUND) - MESSAGE(FATAL_ERROR "X11 is required. Please install X11 development libraries.") - ENDIF(NOT X11_FOUND) - LINK_LIBRARIES(${X11_LIBRARIES} Xt) +# load the needed compiler and linker settings to use VTK. +INCLUDE(${VTK_USE_FILE}) - # find octave-config - FIND_PROGRAM(OCTAVE_CONFIG octave-config) - IF(NOT OCTAVE_CONFIG) - MESSAGE(FATAL_ERROR "Octave is required. Please install Octave and rerun cmake.") - ENDIF(NOT OCTAVE_CONFIG) - - # Set prefix from octave prefix - EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC) - - # check to see if OCT_PREFIX_EXEC is unset - # unset variables match exactly the name of the variable - IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - # if OCT_PREFIX_EXEC has a value then cache the value - # so that OCT_PREFIX can be seen in all sub directories of - # the project - SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE) - ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE) +FIND_PACKAGE(X11) +IF(NOT X11_FOUND) + MESSAGE(FATAL_ERROR "X11 is required. Please install X11 development libraries.") +ENDIF(NOT X11_FOUND) +LINK_LIBRARIES(${X11_LIBRARIES} Xt) - # Build the vtkOctave wrapping utility first. - ADD_SUBDIRECTORY(Wrapping) - - # Hack that creates symbolic links to functions - #ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.") - #FOREACH(kit ${vtk_kits}) - # ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links) - # ADD_DEPENDENCIES(create_links create_links_${kit}) - #ENDFOREACH(kit) +# find octave-config +FIND_PROGRAM(OCTAVE_CONFIG octave-config) +IF(NOT OCTAVE_CONFIG) + MESSAGE(FATAL_ERROR "Octave is required. Please install Octave and rerun cmake.") +ENDIF(NOT OCTAVE_CONFIG) - # Macro to create Octave wrapper functions - MACRO(OCTAVE_WRAP_VTK kit ukit deps) - # Hack for symbolic links - # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}") - - INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) +# Set prefix from octave prefix +EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC) - # what we don't want or can't build; - # this is an ugly hack[TM] and should be fixed by e.g. - # including a list of not-to-be-built-functions shipped with - # Octaviz - SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1) - SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1) - SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1) +# check to see if OCT_PREFIX_EXEC is unset +# unset variables match exactly the name of the variable +IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") +ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") + # if OCT_PREFIX_EXEC has a value then cache the value + # so that OCT_PREFIX can be seen in all sub directories of + # the project + SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE) +ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") +SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE) -# SET(all_oct) -# FOREACH(class ${VTK_${ukit}_CLASSES}) -# IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) -# SET(all_oct ${all_oct} ${class}.oct) -# ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) -# ENDFOREACH(class) +# Build the vtkOctave wrapping utility first. +ADD_SUBDIRECTORY(Wrapping) -# ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc) - - SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common) - SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics) -# ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc) - - # Precompiled headers - IF(USE_PREC_HEADERS) - # Which flags will mkoctfile use? - SET (PCHFLAGS "") - - EXEC_PROGRAM("mkoctfile" ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC) - STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC}) - FOREACH (flag ${MKOCT_FLAGS_LIST}) - SET (PCHFLAGS ${PCHFLAGS} ${flag}) - ENDFOREACH (flag ${MKOCT_FLAGS_LIST}) - -# MESSAGE(${PCHFLAGS}) - - ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h) - ENDIF(USE_PREC_HEADERS) +# Hack that creates symbolic links to functions +#ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.") +#FOREACH(kit ${vtk_kits}) +# ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links) +# ADD_DEPENDENCIES(create_links create_links_${kit}) +#ENDFOREACH(kit) - EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC) - # Remove prefix from oct install dir - STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC}) +# Macro to create Octave wrapper functions +MACRO(OCTAVE_WRAP_VTK kit ukit deps) + # Hack for symbolic links + # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}") + + INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) - SET ( all_oct "" ) - FOREACH(class ${VTK_${ukit}_CLASSES}) -# LIST( GET VTK_${ukit}_CLASSES 10 class ) - SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h") - IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) - ADD_CUSTOM_COMMAND( OUTPUT ${class}.cc COMMAND ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc ) - ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND mkoctfile ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc ) - SET ( all_oct ${all_oct} ${class}.oct ) -# ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc) -# ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc) -# ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc) - # Hack for symbolic links -# ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct) -# ADD_DEPENDENCIES(create_links ${class}_link) - ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) - ENDFOREACH(class) - ENDMACRO(OCTAVE_WRAP_VTK) + # what we don't want or can't build; + # this is an ugly hack[TM] and should be fixed by e.g. + # including a list of not-to-be-built-functions shipped with + # Octaviz + SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1) + + # SET(all_oct) + # FOREACH(class ${VTK_${ukit}_CLASSES}) + # IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) + # SET(all_oct ${all_oct} ${class}.oct) + # ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) + # ENDFOREACH(class) + + # ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc) - # MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX) + SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common) + SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics) + # ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc) + + # Precompiled headers + IF(USE_PREC_HEADERS) + # Which flags will mkoctfile use? + SET (PCHFLAGS "") + + EXEC_PROGRAM("mkoctfile" ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC) + STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC}) + FOREACH (flag ${MKOCT_FLAGS_LIST}) + SET (PCHFLAGS ${PCHFLAGS} ${flag}) + ENDFOREACH (flag ${MKOCT_FLAGS_LIST}) + + # MESSAGE(${PCHFLAGS}) + + ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h) + ENDIF(USE_PREC_HEADERS) - # Build octave wrappers for VTK kits. - ADD_SUBDIRECTORY(Common) - ADD_SUBDIRECTORY(Filtering) - ADD_SUBDIRECTORY(Imaging) - ADD_SUBDIRECTORY(Graphics) - ADD_SUBDIRECTORY(IO) + EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC) + # Remove prefix from oct install dir + STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC}) - SET(vtk_kits Common Filtering Imaging Graphics IO) - IF(VTK_USE_RENDERING) - ADD_SUBDIRECTORY(Rendering) - SET(vtk_kits ${vtk_kits} Rendering) - # Hybrid and Widgets are toggled by Rendering - # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html - ADD_SUBDIRECTORY(Hybrid) - SET(vtk_kits ${vtk_kits} Hybrid) - ADD_SUBDIRECTORY(Widgets) - SET(vtk_kits ${vtk_kits} Widgets) - ENDIF(VTK_USE_RENDERING) - IF(VTK_USE_PATENTED) - ADD_SUBDIRECTORY(Patented) - SET(vtk_kits ${vtk_kits} Patented) - ENDIF(VTK_USE_PATENTED) - IF(VTK_USE_PARALLEL) - ADD_SUBDIRECTORY(Parallel) - SET(vtk_kits ${vtk_kits} Parallel) - ENDIF(VTK_USE_PARALLEL) + SET ( all_oct "" ) + FOREACH(class ${VTK_${ukit}_CLASSES}) + # LIST( GET VTK_${ukit}_CLASSES 10 class ) + SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h") + IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) + ADD_CUSTOM_COMMAND( OUTPUT ${class}.cc COMMAND ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc ) + ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND mkoctfile ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc ) + SET ( all_oct ${all_oct} ${class}.oct ) + # ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc) + # ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc) + # ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc) + # Hack for symbolic links + # ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct) + # ADD_DEPENDENCIES(create_links ${class}_link) + ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) + ENDFOREACH(class) +ENDMACRO(OCTAVE_WRAP_VTK) - ADD_SUBDIRECTORY(Scripts) - ADD_SUBDIRECTORY(Examples) +# MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX) + +# Build octave wrappers for VTK kits. +ADD_SUBDIRECTORY(Common) +ADD_SUBDIRECTORY(Filtering) +ADD_SUBDIRECTORY(Imaging) +ADD_SUBDIRECTORY(Graphics) +ADD_SUBDIRECTORY(IO) + +SET(vtk_kits Common Filtering Imaging Graphics IO) +IF(VTK_USE_RENDERING) + ADD_SUBDIRECTORY(Rendering) + SET(vtk_kits ${vtk_kits} Rendering) + # Hybrid and Widgets are toggled by Rendering + # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html + ADD_SUBDIRECTORY(Hybrid) + SET(vtk_kits ${vtk_kits} Hybrid) + ADD_SUBDIRECTORY(Widgets) + SET(vtk_kits ${vtk_kits} Widgets) +ENDIF(VTK_USE_RENDERING) +IF(VTK_USE_PATENTED) + ADD_SUBDIRECTORY(Patented) + SET(vtk_kits ${vtk_kits} Patented) +ENDIF(VTK_USE_PATENTED) +IF(VTK_USE_PARALLEL) + ADD_SUBDIRECTORY(Parallel) + SET(vtk_kits ${vtk_kits} Parallel) +ENDIF(VTK_USE_PARALLEL) + +ADD_SUBDIRECTORY(Scripts) +ADD_SUBDIRECTORY(Examples) |
|
From: Thomas W. <tho...@us...> - 2007-01-12 08:12:44
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1418/Common Modified Files: vtkInitializeInteractor.cc vtkRaiseWindow.cc vtk_get_pointer.cc vtk_print_ref_table.cc Log Message: Use Unix-type line ends (no code changes) Index: vtk_get_pointer.cc =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/vtk_get_pointer.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_get_pointer.cc 24 Oct 2004 02:09:13 -0000 1.1 +++ vtk_get_pointer.cc 12 Jan 2007 08:12:41 -0000 1.2 @@ -1,46 +1,46 @@ -/* - -## Copyright (C) 2004 Dragan Tubic -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this file. If not, write to the Free Software Foundation, -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// The following must be defined for recent versions of Octave. -#define TYPEID_HAS_CLASS -#include <octave/oct.h> -#include "octaviz.h" - -DEFUN_DLD (vtk_get_pointer, args, , -"") -{ - octave_value retval; - if ( args(0).type_id() != vtk_object::static_type_id() ) - { - error("The parameter has to be vtk_object"); - return retval; - } - - retval = args(0).uint_value(); - - return retval; -} - - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ - +/* + +## Copyright (C) 2004 Dragan Tubic +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this file. If not, write to the Free Software Foundation, +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +// The following must be defined for recent versions of Octave. +#define TYPEID_HAS_CLASS +#include <octave/oct.h> +#include "octaviz.h" + +DEFUN_DLD (vtk_get_pointer, args, , +"") +{ + octave_value retval; + if ( args(0).type_id() != vtk_object::static_type_id() ) + { + error("The parameter has to be vtk_object"); + return retval; + } + + retval = args(0).uint_value(); + + return retval; +} + + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; End: *** +*/ + Index: vtkInitializeInteractor.cc =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/vtkInitializeInteractor.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtkInitializeInteractor.cc 7 Mar 2005 02:06:53 -0000 1.4 +++ vtkInitializeInteractor.cc 12 Jan 2007 08:12:41 -0000 1.5 @@ -1,90 +1,90 @@ -/* - -## Copyright (C) 2004 Dragan Tubic -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this file. If not, write to the Free Software Foundation, -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -#include <vtkXRenderWindowInteractor.h> -#include <vtkXOpenGLRenderWindow.h> -#include <vtkCommand.h> -#include <vtkCallbackCommand.h> -#undef Complex -#include <octave/oct.h> - -vtkCallbackCommand* InteractorExitCallbackCommand = NULL; - -// The following must be defined for recent versions of Octave. -#define TYPEID_HAS_CLASS -#include <octave/oct.h> -#include "octaviz.h" - - -// Function called when WM_DELETE_WINDOW protocol is passed -void CloseAppCallback(Widget w, XtPointer client_data, XtPointer call_data) -{ - cout << "WM_DELETE_WINDOW hello!" << endl << std::flush; -} - -void ExitCallback(vtkObject*, unsigned long eid, void* clientdata, void *calldata) -{ - -} - -DEFUN_DLD (vtkInitializeInteractor, args, , - "Returns app context.") -{ - octave_value retval; - - if ( args(0).type_id() != vtk_object::static_type_id() ) - { - error("The parameter has to be vtkRenderWindowInteractor"); - return retval; - } - - vtkObjectBase* vtk_pointer = reinterpret_cast<vtkObjectBase*>( args(0).uint_value() ); - - if ( !vtk_pointer->IsA("vtkXRenderWindowInteractor") ) - { - error("The parameter has to be vtkXRenderWindowInteractor"); - return retval; - } - - vtkXRenderWindowInteractor* CurrentInteractor = reinterpret_cast<vtkXRenderWindowInteractor*>(vtk_pointer); - - if ( InteractorExitCallbackCommand == NULL ) - { - InteractorExitCallbackCommand = vtkCallbackCommand::New(); - InteractorExitCallbackCommand->SetCallback( ExitCallback ); - } - CurrentInteractor->Initialize(vtk_app_context); - CurrentInteractor->AddObserver(vtkCommand::ExitEvent, InteractorExitCallbackCommand, 0.0f ); - - vtkXOpenGLRenderWindow* RenderWindow = reinterpret_cast<vtkXOpenGLRenderWindow*>(CurrentInteractor->GetRenderWindow()); - Widget widg = CurrentInteractor->GetWidget(); - Atom wm_delete_window = XInternAtom(XtDisplay(widg), "WM_DELETE_WINDOW", False); - vtk_delete_window_atoms[wm_delete_window] = reinterpret_cast<uintptr_t>(RenderWindow); - // turn off default delete response - XSetWMProtocols(XtDisplay(widg), XtWindow(widg), &wm_delete_window, 1); - return retval; -} - - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ - +/* + +## Copyright (C) 2004 Dragan Tubic +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this file. If not, write to the Free Software Foundation, +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +#include <vtkXRenderWindowInteractor.h> +#include <vtkXOpenGLRenderWindow.h> +#include <vtkCommand.h> +#include <vtkCallbackCommand.h> +#undef Complex +#include <octave/oct.h> + +vtkCallbackCommand* InteractorExitCallbackCommand = NULL; + +// The following must be defined for recent versions of Octave. +#define TYPEID_HAS_CLASS +#include <octave/oct.h> +#include "octaviz.h" + + +// Function called when WM_DELETE_WINDOW protocol is passed +void CloseAppCallback(Widget w, XtPointer client_data, XtPointer call_data) +{ + cout << "WM_DELETE_WINDOW hello!" << endl << std::flush; +} + +void ExitCallback(vtkObject*, unsigned long eid, void* clientdata, void *calldata) +{ + +} + +DEFUN_DLD (vtkInitializeInteractor, args, , + "Returns app context.") +{ + octave_value retval; + + if ( args(0).type_id() != vtk_object::static_type_id() ) + { + error("The parameter has to be vtkRenderWindowInteractor"); + return retval; + } + + vtkObjectBase* vtk_pointer = reinterpret_cast<vtkObjectBase*>( args(0).uint_value() ); + + if ( !vtk_pointer->IsA("vtkXRenderWindowInteractor") ) + { + error("The parameter has to be vtkXRenderWindowInteractor"); + return retval; + } + + vtkXRenderWindowInteractor* CurrentInteractor = reinterpret_cast<vtkXRenderWindowInteractor*>(vtk_pointer); + + if ( InteractorExitCallbackCommand == NULL ) + { + InteractorExitCallbackCommand = vtkCallbackCommand::New(); + InteractorExitCallbackCommand->SetCallback( ExitCallback ); + } + CurrentInteractor->Initialize(vtk_app_context); + CurrentInteractor->AddObserver(vtkCommand::ExitEvent, InteractorExitCallbackCommand, 0.0f ); + + vtkXOpenGLRenderWindow* RenderWindow = reinterpret_cast<vtkXOpenGLRenderWindow*>(CurrentInteractor->GetRenderWindow()); + Widget widg = CurrentInteractor->GetWidget(); + Atom wm_delete_window = XInternAtom(XtDisplay(widg), "WM_DELETE_WINDOW", False); + vtk_delete_window_atoms[wm_delete_window] = reinterpret_cast<uintptr_t>(RenderWindow); + // turn off default delete response + XSetWMProtocols(XtDisplay(widg), XtWindow(widg), &wm_delete_window, 1); + return retval; +} + + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; End: *** +*/ + Index: vtk_print_ref_table.cc =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/vtk_print_ref_table.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_print_ref_table.cc 25 Dec 2006 20:12:50 -0000 1.2 +++ vtk_print_ref_table.cc 12 Jan 2007 08:12:41 -0000 1.3 @@ -1,39 +1,39 @@ -/* - -## Copyright (C) 2004 Dragan Tubic -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this file. If not, write to the Free Software Foundation, -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// The following must be defined for recent versions of Octave. -#define TYPEID_HAS_CLASS -#include <octave/oct.h> -#include "octaviz.h" -// -DEFUN_DLD (vtk_print_ref_table, args, , -"") -{ - octave_value retval; - vtk_object::print_ref_table(); - return retval; -} - - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ - +/* + +## Copyright (C) 2004 Dragan Tubic +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this file. If not, write to the Free Software Foundation, +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +// The following must be defined for recent versions of Octave. +#define TYPEID_HAS_CLASS +#include <octave/oct.h> +#include "octaviz.h" +// +DEFUN_DLD (vtk_print_ref_table, args, , +"") +{ + octave_value retval; + vtk_object::print_ref_table(); + return retval; +} + + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; End: *** +*/ + Index: vtkRaiseWindow.cc =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/vtkRaiseWindow.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtkRaiseWindow.cc 4 Oct 2004 02:01:20 -0000 1.2 +++ vtkRaiseWindow.cc 12 Jan 2007 08:12:41 -0000 1.3 @@ -1,70 +1,70 @@ -/* - -## Copyright (C) 2004 Dragan Tubic -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this file. If not, write to the Free Software Foundation, -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -#include <vtkXOpenGLRenderWindow.h> -#undef Complex -#include <octave/oct.h> - -// The following must be defined for recent versions of Octave. -#define TYPEID_HAS_CLASS -#include <octave/oct.h> -#include "octaviz.h" - -DEFUN_DLD (vtkRaiseWindow, args, , -"-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {} vtkRaiseWindow(@var{window})\n\ -Raises the window specified. Typically this window can be obtained by:\n\ -\n\ -f = vtk_figure(0);\n\ -\n\ -@var{window} = f.window;\n\ -\n\ -Some windows managers (e.g. KDE) will intercept this call. You must\n\ -turn off so-called ``Focus stealing prevention'' options in your windows manager for this\n\ -function to work.\n\ -@end deftypefn") -{ - octave_value retval; - if ( args(0).type_id() != vtk_object::static_type_id() ) - { - error("The parameter has to be vtkXOpenGLRenderWindow"); - return retval; - } - - vtkObjectBase* vtk_pointer = reinterpret_cast<vtkObjectBase*>( args(0).uint_value() ); - - if ( !vtk_pointer->IsA("vtkXOpenGLRenderWindow") ) - { - error("The parameter has to be vtkXOpenGLRenderWindow"); - return retval; - } - - vtkXOpenGLRenderWindow* window = reinterpret_cast<vtkXOpenGLRenderWindow*>(vtk_pointer); - XRaiseWindow(window->GetDisplayId(), window->GetWindowId() ); - - return retval; -} - - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ - +/* + +## Copyright (C) 2004 Dragan Tubic +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this file. If not, write to the Free Software Foundation, +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +#include <vtkXOpenGLRenderWindow.h> +#undef Complex +#include <octave/oct.h> + +// The following must be defined for recent versions of Octave. +#define TYPEID_HAS_CLASS +#include <octave/oct.h> +#include "octaviz.h" + +DEFUN_DLD (vtkRaiseWindow, args, , +"-*- texinfo -*-\n\ +@deftypefn {Loadable Function} {} vtkRaiseWindow(@var{window})\n\ +Raises the window specified. Typically this window can be obtained by:\n\ +\n\ +f = vtk_figure(0);\n\ +\n\ +@var{window} = f.window;\n\ +\n\ +Some windows managers (e.g. KDE) will intercept this call. You must\n\ +turn off so-called ``Focus stealing prevention'' options in your windows manager for this\n\ +function to work.\n\ +@end deftypefn") +{ + octave_value retval; + if ( args(0).type_id() != vtk_object::static_type_id() ) + { + error("The parameter has to be vtkXOpenGLRenderWindow"); + return retval; + } + + vtkObjectBase* vtk_pointer = reinterpret_cast<vtkObjectBase*>( args(0).uint_value() ); + + if ( !vtk_pointer->IsA("vtkXOpenGLRenderWindow") ) + { + error("The parameter has to be vtkXOpenGLRenderWindow"); + return retval; + } + + vtkXOpenGLRenderWindow* window = reinterpret_cast<vtkXOpenGLRenderWindow*>(vtk_pointer); + XRaiseWindow(window->GetDisplayId(), window->GetWindowId() ); + + return retval; +} + + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; End: *** +*/ + |
|
From: Thomas W. <tho...@us...> - 2007-01-12 08:12:43
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1418 Modified Files: CMakeLists.txt Log Message: Use Unix-type line ends (no code changes) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- CMakeLists.txt 29 Dec 2006 03:33:37 -0000 1.8 +++ CMakeLists.txt 12 Jan 2007 08:12:41 -0000 1.9 @@ -1,164 +1,164 @@ -# This file is a hacked CMakeLists.txt from ParaView/Octave -# Thanks to Brad King. - -PROJECT(OCTAVIZ) - - ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in - CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - - ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - ## - - OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) - STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON) - IF(PCH_ON) - SET(CXX_COMPILER_PCH "g++" CACHE STRING "CMake overides compiler environment varibles. Put the compiler name here.") - ENDIF(PCH_ON) - - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) - - FIND_PACKAGE(VTK) - IF(NOT VTK_FOUND) - MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.") - ENDIF(NOT VTK_FOUND) - - # load the needed compiler and linker settings to use VTK. - INCLUDE(${VTK_USE_FILE}) - - FIND_PACKAGE(X11) - IF(NOT X11_FOUND) - MESSAGE(FATAL_ERROR "X11 is required. Please install X11 development libraries.") - ENDIF(NOT X11_FOUND) - LINK_LIBRARIES(${X11_LIBRARIES} Xt) - - # find octave-config - FIND_PROGRAM(OCTAVE_CONFIG octave-config) - IF(NOT OCTAVE_CONFIG) - MESSAGE(FATAL_ERROR "Octave is required. Please install Octave and rerun cmake.") - ENDIF(NOT OCTAVE_CONFIG) - - # Set prefix from octave prefix - EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC) - - # check to see if OCT_PREFIX_EXEC is unset - # unset variables match exactly the name of the variable - IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - # if OCT_PREFIX_EXEC has a value then cache the value - # so that OCT_PREFIX can be seen in all sub directories of - # the project - SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE) - ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE) - - # Build the vtkOctave wrapping utility first. - ADD_SUBDIRECTORY(Wrapping) - - # Hack that creates symbolic links to functions - #ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.") - #FOREACH(kit ${vtk_kits}) - # ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links) - # ADD_DEPENDENCIES(create_links create_links_${kit}) - #ENDFOREACH(kit) - - # Macro to create Octave wrapper functions - MACRO(OCTAVE_WRAP_VTK kit ukit deps) - # Hack for symbolic links - # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}") - - INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) - - # what we don't want or can't build; - # this is an ugly hack[TM] and should be fixed by e.g. - # including a list of not-to-be-built-functions shipped with - # Octaviz - SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1) - SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1) - SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1) - -# SET(all_oct) -# FOREACH(class ${VTK_${ukit}_CLASSES}) -# IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) -# SET(all_oct ${all_oct} ${class}.oct) -# ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) -# ENDFOREACH(class) - -# ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc) - - SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common) - SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics) -# ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc) - - # Precompiled headers - IF(USE_PREC_HEADERS) - # Which flags will mkoctfile use? - SET (PCHFLAGS "") - - EXEC_PROGRAM("mkoctfile" ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC) - STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC}) - FOREACH (flag ${MKOCT_FLAGS_LIST}) - SET (PCHFLAGS ${PCHFLAGS} ${flag}) - ENDFOREACH (flag ${MKOCT_FLAGS_LIST}) - -# MESSAGE(${PCHFLAGS}) - - ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h) - ENDIF(USE_PREC_HEADERS) - - EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC) - # Remove prefix from oct install dir - STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC}) - - SET ( all_oct "" ) - FOREACH(class ${VTK_${ukit}_CLASSES}) -# LIST( GET VTK_${ukit}_CLASSES 10 class ) - SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h") - IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) - ADD_CUSTOM_COMMAND( OUTPUT ${class}.cc COMMAND ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc ) - ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND mkoctfile ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc ) - SET ( all_oct ${all_oct} ${class}.oct ) -# ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc) -# ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc) -# ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc) - # Hack for symbolic links -# ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct) -# ADD_DEPENDENCIES(create_links ${class}_link) - ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) - ENDFOREACH(class) - ENDMACRO(OCTAVE_WRAP_VTK) - - # MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX) - - # Build octave wrappers for VTK kits. - ADD_SUBDIRECTORY(Common) - ADD_SUBDIRECTORY(Filtering) - ADD_SUBDIRECTORY(Imaging) - ADD_SUBDIRECTORY(Graphics) - ADD_SUBDIRECTORY(IO) - - SET(vtk_kits Common Filtering Imaging Graphics IO) - IF(VTK_USE_RENDERING) - ADD_SUBDIRECTORY(Rendering) - SET(vtk_kits ${vtk_kits} Rendering) - # Hybrid and Widgets are toggled by Rendering - # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html - ADD_SUBDIRECTORY(Hybrid) - SET(vtk_kits ${vtk_kits} Hybrid) - ADD_SUBDIRECTORY(Widgets) - SET(vtk_kits ${vtk_kits} Widgets) - ENDIF(VTK_USE_RENDERING) - IF(VTK_USE_PATENTED) - ADD_SUBDIRECTORY(Patented) - SET(vtk_kits ${vtk_kits} Patented) - ENDIF(VTK_USE_PATENTED) - IF(VTK_USE_PARALLEL) - ADD_SUBDIRECTORY(Parallel) - SET(vtk_kits ${vtk_kits} Parallel) - ENDIF(VTK_USE_PARALLEL) - - ADD_SUBDIRECTORY(Scripts) - ADD_SUBDIRECTORY(Examples) +# This file is a hacked CMakeLists.txt from ParaView/Octave +# Thanks to Brad King. + +PROJECT(OCTAVIZ) + + ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in + CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) + + ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + ## + + OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) + STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON) + IF(PCH_ON) + SET(CXX_COMPILER_PCH "g++" CACHE STRING "CMake overides compiler environment varibles. Put the compiler name here.") + ENDIF(PCH_ON) + + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) + + FIND_PACKAGE(VTK) + IF(NOT VTK_FOUND) + MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.") + ENDIF(NOT VTK_FOUND) + + # load the needed compiler and linker settings to use VTK. + INCLUDE(${VTK_USE_FILE}) + + FIND_PACKAGE(X11) + IF(NOT X11_FOUND) + MESSAGE(FATAL_ERROR "X11 is required. Please install X11 development libraries.") + ENDIF(NOT X11_FOUND) + LINK_LIBRARIES(${X11_LIBRARIES} Xt) + + # find octave-config + FIND_PROGRAM(OCTAVE_CONFIG octave-config) + IF(NOT OCTAVE_CONFIG) + MESSAGE(FATAL_ERROR "Octave is required. Please install Octave and rerun cmake.") + ENDIF(NOT OCTAVE_CONFIG) + + # Set prefix from octave prefix + EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC) + + # check to see if OCT_PREFIX_EXEC is unset + # unset variables match exactly the name of the variable + IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") + ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") + # if OCT_PREFIX_EXEC has a value then cache the value + # so that OCT_PREFIX can be seen in all sub directories of + # the project + SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE) + ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") + SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE) + + # Build the vtkOctave wrapping utility first. + ADD_SUBDIRECTORY(Wrapping) + + # Hack that creates symbolic links to functions + #ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.") + #FOREACH(kit ${vtk_kits}) + # ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links) + # ADD_DEPENDENCIES(create_links create_links_${kit}) + #ENDFOREACH(kit) + + # Macro to create Octave wrapper functions + MACRO(OCTAVE_WRAP_VTK kit ukit deps) + # Hack for symbolic links + # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}") + + INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) + + # what we don't want or can't build; + # this is an ugly hack[TM] and should be fixed by e.g. + # including a list of not-to-be-built-functions shipped with + # Octaviz + SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1) + +# SET(all_oct) +# FOREACH(class ${VTK_${ukit}_CLASSES}) +# IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) +# SET(all_oct ${all_oct} ${class}.oct) +# ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) +# ENDFOREACH(class) + +# ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc) + + SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common) + SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics) +# ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc) + + # Precompiled headers + IF(USE_PREC_HEADERS) + # Which flags will mkoctfile use? + SET (PCHFLAGS "") + + EXEC_PROGRAM("mkoctfile" ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC) + STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC}) + FOREACH (flag ${MKOCT_FLAGS_LIST}) + SET (PCHFLAGS ${PCHFLAGS} ${flag}) + ENDFOREACH (flag ${MKOCT_FLAGS_LIST}) + +# MESSAGE(${PCHFLAGS}) + + ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h) + ENDIF(USE_PREC_HEADERS) + + EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC) + # Remove prefix from oct install dir + STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC}) + + SET ( all_oct "" ) + FOREACH(class ${VTK_${ukit}_CLASSES}) +# LIST( GET VTK_${ukit}_CLASSES 10 class ) + SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h") + IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) + ADD_CUSTOM_COMMAND( OUTPUT ${class}.cc COMMAND ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc ) + ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND mkoctfile ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc ) + SET ( all_oct ${all_oct} ${class}.oct ) +# ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc) +# ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc) +# ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc) + # Hack for symbolic links +# ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct) +# ADD_DEPENDENCIES(create_links ${class}_link) + ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) + ENDFOREACH(class) + ENDMACRO(OCTAVE_WRAP_VTK) + + # MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX) + + # Build octave wrappers for VTK kits. + ADD_SUBDIRECTORY(Common) + ADD_SUBDIRECTORY(Filtering) + ADD_SUBDIRECTORY(Imaging) + ADD_SUBDIRECTORY(Graphics) + ADD_SUBDIRECTORY(IO) + + SET(vtk_kits Common Filtering Imaging Graphics IO) + IF(VTK_USE_RENDERING) + ADD_SUBDIRECTORY(Rendering) + SET(vtk_kits ${vtk_kits} Rendering) + # Hybrid and Widgets are toggled by Rendering + # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html + ADD_SUBDIRECTORY(Hybrid) + SET(vtk_kits ${vtk_kits} Hybrid) + ADD_SUBDIRECTORY(Widgets) + SET(vtk_kits ${vtk_kits} Widgets) + ENDIF(VTK_USE_RENDERING) + IF(VTK_USE_PATENTED) + ADD_SUBDIRECTORY(Patented) + SET(vtk_kits ${vtk_kits} Patented) + ENDIF(VTK_USE_PATENTED) + IF(VTK_USE_PARALLEL) + ADD_SUBDIRECTORY(Parallel) + SET(vtk_kits ${vtk_kits} Parallel) + ENDIF(VTK_USE_PARALLEL) + + ADD_SUBDIRECTORY(Scripts) + ADD_SUBDIRECTORY(Examples) |
|
From: Thomas W. <tho...@us...> - 2007-01-12 07:55:11
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26437 Modified Files: COPYING Log Message: Update FSF address and LGPL Index: COPYING =================================================================== RCS file: /cvsroot/octaviz/octaviz/COPYING,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- COPYING 21 Sep 2004 22:50:38 -0000 1.1.1.1 +++ COPYING 12 Jan 2007 07:55:07 -0000 1.2 @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,7 +55,7 @@ The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -291,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -303,17 +303,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. |
|
From: Jonathan S. <jjs...@us...> - 2007-01-09 04:20:21
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29431 Modified Files: vtk_close.m vtk_cone3.m Log Message: small edits to help documentation Index: vtk_cone3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_cone3.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_cone3.m 25 Dec 2006 20:12:50 -0000 1.4 +++ vtk_cone3.m 9 Jan 2007 04:20:19 -0000 1.5 @@ -15,7 +15,7 @@ ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {} vtk_arrows3(@var{x},@var{y},@var{z},@var{nx},@var{ny},@var{nz}, [@var{fmt} | @var{prop},@var{val}]) +## @deftypefn {Function File} {} vtk_cone3(@var{x},@var{y},@var{z},@var{nx},@var{ny},@var{nz}, [@var{fmt} | @var{prop},@var{val}]) ## Displayes oriented cones at points defined by triplets (@var{x},@var{y},@var{z}). ## Cones are oriented along the vectors defined by triplets (@var{nx},@var{ny},@var{nz}) ## @@ -24,10 +24,13 @@ ## @var{prop},@var{val} is a property,value pair argument. Valid ## properties are ";Color;Height;Radius;". ## @end deftypefn -## @seealso{vtk_plot3,vtk_get_line_spec} +## @seealso{vtk_plot3,vtk_arrows3,vtk_get_line_spec} ## Author: Dragan Tubic +## The center of the cone is placed at the given point, whereas the base +## of the arrow in vtk_arrows is placed at the given point. This should +## probably be fixed. JJS 1/8/07 function vtk_cone3(varargin) Index: vtk_close.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_close.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_close.m 23 Oct 2004 18:47:58 -0000 1.2 +++ vtk_close.m 9 Jan 2007 04:20:19 -0000 1.3 @@ -17,8 +17,8 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} vtk_close(@var{n}) ## Closes the specified vtk figure window. All structures referencing -## the figure window must be cleared from userspace in order for the -## window to close. +## the figure window (perhaps 'ans') must be cleared from userspace +## in order for the window to close. ## @end deftypefn ## @seealso{vtk_clear} @@ -27,4 +27,3 @@ function f = vtk_close( fig_no ) vtk_figure( -abs(fig_no) ); endfunction - \ No newline at end of file |
|
From: Dragan T. <dr...@us...> - 2006-12-29 14:55:51
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29971 Modified Files: octaviz.cc Log Message: Removed a forgotten cout. Index: octaviz.cc =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/octaviz.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- octaviz.cc 25 Dec 2006 20:12:50 -0000 1.6 +++ octaviz.cc 29 Dec 2006 14:55:44 -0000 1.7 @@ -215,7 +215,6 @@ octave_value vtk_object::subsref (const std::string SUBSREF_STRREF type, const LIST<octave_value_list>& idx) { - octave_stdout << "octave_object: subsref(type,idx)" << std::endl; return subsref (type, idx, 1)(0); } |
|
From: Jonathan S. <jjs...@us...> - 2006-12-29 04:45:32
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15711 Modified Files: vtk_blackonwhite.m vtk_clear.m vtk_figure.m vtk_parse_params.m vtk_plot.m vtk_title.m Log Message: cleaning up some of the function scripts Index: vtk_plot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_plot.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_plot.m 25 Dec 2006 20:12:50 -0000 1.3 +++ vtk_plot.m 29 Dec 2006 04:45:27 -0000 1.4 @@ -125,7 +125,7 @@ f = vtk_figure(0); w.SetInteractor(f.interactor); - f.renderer.RemoveAllProps(); + f.renderer.RemoveAllViewProps(); f.renderer.AddActor2D(xyplot); vtk_update(f); Index: vtk_parse_params.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_parse_params.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_parse_params.m 25 Dec 2006 20:12:50 -0000 1.4 +++ vtk_parse_params.m 29 Dec 2006 04:45:27 -0000 1.5 @@ -28,12 +28,12 @@ %% Properties begin with the first string parameter. Each property needs a value. %% Get the types - no_params = length(varargin) + no_params = length(varargin); num_type = zeros(1,no_params); str_type = zeros(1,no_params); for i = 1:no_params - num_type(i) = isnumeric(varargin{i}) + num_type(i) = isnumeric(varargin{i}); str_type(i) = ischar(varargin{i}); end Index: vtk_figure.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_figure.m,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- vtk_figure.m 21 Apr 2005 17:04:23 -0000 1.9 +++ vtk_figure.m 29 Dec 2006 04:45:27 -0000 1.10 @@ -169,7 +169,8 @@ axes.SetAxisTitleTextProperty(tprop); axes.SetAxisLabelTextProperty(tprop); axes.SetViewProp( outline_actor ); - ##axes.GetXAxisActor2D().AdjustLabelsOn(); # discovered a case where the axis label is off by ~25% when this is used; JJS 4/5/05 + ## discovered a case where the axis label is off by ~25% when AdjustLabels is used; JJS 4/5/05 + ##axes.GetXAxisActor2D().AdjustLabelsOn(); ##axes.GetYAxisActor2D().AdjustLabelsOn(); ##axes.GetZAxisActor2D().AdjustLabelsOn(); axes.SetInertia(10); Index: vtk_clear.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_clear.m 31 Mar 2005 17:40:20 -0000 1.3 +++ vtk_clear.m 29 Dec 2006 04:45:27 -0000 1.4 @@ -35,10 +35,10 @@ ## clear existing scalarbar and title, if they exist i=0; - while i < f.renderer.GetProps().GetNumberOfItems(); - if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkScalarBarActor") || - f.renderer.GetProps().GetItemAsObject(i).IsA("vtkTextActor") ) - f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) ); + while i < f.renderer.GetViewProps().GetNumberOfItems(); + if ( f.renderer.GetViewProps().GetItemAsObject(i).IsA("vtkScalarBarActor") || + f.renderer.GetViewProps().GetItemAsObject(i).IsA("vtkTextActor") ) + f.renderer.RemoveViewProp( f.renderer.GetViewProps().GetItemAsObject(i) ); --i; endif ++i; Index: vtk_blackonwhite.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_blackonwhite.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_blackonwhite.m 9 Sep 2005 19:53:13 -0000 1.2 +++ vtk_blackonwhite.m 29 Dec 2006 04:45:27 -0000 1.3 @@ -35,20 +35,20 @@ f.axes.GetAxisTitleTextProperty.ShadowOff ## change color of title (assume it is the only textactor) - nprops = f.renderer.GetProps.GetNumberOfItems; + nprops = f.renderer.GetViewProps.GetNumberOfItems; for i = 0:nprops-1; - if ( f.renderer.GetProps.GetItemAsObject(i).IsA("vtkTextActor") ) - f.renderer.GetProps.GetItemAsObject(i).GetTextProperty.SetColor(0,0,0) + if ( f.renderer.GetViewProps.GetItemAsObject(i).IsA("vtkTextActor") ) + f.renderer.GetViewProps.GetItemAsObject(i).GetTextProperty.SetColor(0,0,0) break endif endfor ## change color of text of color bar, if it exists - nprops = f.renderer.GetProps.GetNumberOfItems; + nprops = f.renderer.GetViewProps.GetNumberOfItems; for i = 0:nprops-1; - if ( f.renderer.GetProps.GetItemAsObject(i).IsA("vtkScalarBarActor") ) - f.renderer.GetProps.GetItemAsObject(i).GetTitleTextProperty.SetColor(0,0,0) - f.renderer.GetProps.GetItemAsObject(i).GetLabelTextProperty.SetColor(0,0,0) + if ( f.renderer.GetViewProps.GetItemAsObject(i).IsA("vtkScalarBarActor") ) + f.renderer.GetViewProps.GetItemAsObject(i).GetTitleTextProperty.SetColor(0,0,0) + f.renderer.GetViewProps.GetItemAsObject(i).GetLabelTextProperty.SetColor(0,0,0) break endif endfor Index: vtk_title.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_title.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_title.m 31 Mar 2005 17:40:21 -0000 1.4 +++ vtk_title.m 29 Dec 2006 04:45:27 -0000 1.5 @@ -28,10 +28,10 @@ ## clear existing title, if it exists ## assume there is no other "vtkTextActor" in the renderer - nprops = f.renderer.GetProps().GetNumberOfItems(); + nprops = f.renderer.GetViewProps().GetNumberOfItems(); for i = 0:nprops-1; - if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkTextActor") ) - f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) ); + if ( f.renderer.GetViewProps().GetItemAsObject(i).IsA("vtkTextActor") ) + f.renderer.RemoveViewProp( f.renderer.GetViewProps().GetItemAsObject(i) ); break endif endfor |
|
From: Jonathan S. <jjs...@us...> - 2006-12-29 03:33:40
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11972 Modified Files: CMakeLists.txt Log Message: widgets will build now Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- CMakeLists.txt 27 Dec 2006 13:44:27 -0000 1.7 +++ CMakeLists.txt 29 Dec 2006 03:33:37 -0000 1.8 @@ -148,9 +148,8 @@ # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html ADD_SUBDIRECTORY(Hybrid) SET(vtk_kits ${vtk_kits} Hybrid) - # widgets not getting made! JJS 12/27/06 -# ADD_SUBDIRECTORY(Widgets) -# SET(vtk_kits ${vtk_kits} Widgets) + ADD_SUBDIRECTORY(Widgets) + SET(vtk_kits ${vtk_kits} Widgets) ENDIF(VTK_USE_RENDERING) IF(VTK_USE_PATENTED) ADD_SUBDIRECTORY(Patented) |
|
From: Jonathan S. <jjs...@us...> - 2006-12-29 03:33:40
|
Update of /cvsroot/octaviz/octaviz/Widgets In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11972/Widgets Modified Files: CMakeLists.txt Log Message: widgets will build now Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Widgets/CMakeLists.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CMakeLists.txt 27 Dec 2006 05:18:09 -0000 1.1 +++ CMakeLists.txt 29 Dec 2006 03:33:37 -0000 1.2 @@ -1,4 +1,5 @@ SET(KIT_WRAP_DEPS Rendering) OCTAVE_WRAP_VTK(Widgets WIDGETS "${KIT_WRAP_DEPS}") +ADD_CUSTOM_TARGET( Widgets ALL COMMAND touch Widgets DEPENDS ${all_oct} ) INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkWidgets.oct) |
|
From: Jonathan S. <jjs...@us...> - 2006-12-29 03:25:03
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7422 Modified Files: CMakeLists.txt vtkGetDataRoot.m Log Message: make vtk_data path configurable Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/CMakeLists.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CMakeLists.txt 21 Sep 2004 22:50:43 -0000 1.1.1.1 +++ CMakeLists.txt 29 Dec 2006 03:24:59 -0000 1.2 @@ -2,6 +2,10 @@ # Remove prefix from scripts install dir STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" M_INST_DIR ${M_INST_DIR_EXEC}) +# Insert VTK_DATA_ROOT given to cmake into vtkGetDataRoot.m +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m + ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) + EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC) IF(CURRENT_DIR_EXEC MATCHES "Scripts") SET(CURR_DIR "") Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtkGetDataRoot.m 21 Apr 2005 17:04:22 -0000 1.2 +++ vtkGetDataRoot.m 29 Dec 2006 03:24:59 -0000 1.3 @@ -2,6 +2,38 @@ ## I guess this is a locally set variable; should put this in documents ## f = "/usr/share/vtkdata"; - f = "/usr/local/share/vtk/VTKData-release-4-4"; + + f = ""; + + ## The file that marks the vtkdata/ directory + readme = "VTKData.readme"; + + ## check for a possible environmental variable + env_data_root = getenv("VTK_DATA_ROOT"); + + ## set at Octaviz's compile time + oct_data_root = ""; + + ## locally set path + local_data_root = "/usr/share/vtkdata"; + + data_root_path = [ env_data_root; local_data_root; oct_data_root ]; + + ## check where we have the readme file + if (! isempty(data_root_path)) + for i=[1:rows(data_root_path)] + filename = [data_root_path(i, :), '/', readme]; + if (! isempty(stat(filename))) + f = data_root_path(i,:); + break; + endif + endfor + else + error("Empty search path for VTK_DATA_ROOT!"); + endif + + if (isempty(f)) + error([readme, " not found! \n\t Did you install the vtkdata package?"]); + endif endfunction |
|
From: Jonathan S. <jjs...@us...> - 2006-12-27 13:44:29
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2828 Modified Files: CMakeLists.txt Log Message: problem with widgets Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CMakeLists.txt 27 Dec 2006 05:18:08 -0000 1.6 +++ CMakeLists.txt 27 Dec 2006 13:44:27 -0000 1.7 @@ -148,8 +148,9 @@ # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html ADD_SUBDIRECTORY(Hybrid) SET(vtk_kits ${vtk_kits} Hybrid) - ADD_SUBDIRECTORY(Widgets) - SET(vtk_kits ${vtk_kits} Widgets) + # widgets not getting made! JJS 12/27/06 +# ADD_SUBDIRECTORY(Widgets) +# SET(vtk_kits ${vtk_kits} Widgets) ENDIF(VTK_USE_RENDERING) IF(VTK_USE_PATENTED) ADD_SUBDIRECTORY(Patented) |
|
From: Jonathan S. <jjs...@us...> - 2006-12-27 05:18:13
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29673 Modified Files: CMakeLists.txt Log Message: checking patches 1591368 and 1607894 Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CMakeLists.txt 25 Dec 2006 20:12:49 -0000 1.5 +++ CMakeLists.txt 27 Dec 2006 05:18:08 -0000 1.6 @@ -144,11 +144,13 @@ IF(VTK_USE_RENDERING) ADD_SUBDIRECTORY(Rendering) SET(vtk_kits ${vtk_kits} Rendering) - ENDIF(VTK_USE_RENDERING) - IF(VTK_USE_HYBRID) + # Hybrid and Widgets are toggled by Rendering + # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html ADD_SUBDIRECTORY(Hybrid) SET(vtk_kits ${vtk_kits} Hybrid) - ENDIF(VTK_USE_HYBRID) + ADD_SUBDIRECTORY(Widgets) + SET(vtk_kits ${vtk_kits} Widgets) + ENDIF(VTK_USE_RENDERING) IF(VTK_USE_PATENTED) ADD_SUBDIRECTORY(Patented) SET(vtk_kits ${vtk_kits} Patented) |
|
From: Jonathan S. <jjs...@us...> - 2006-12-27 05:18:10
|
Update of /cvsroot/octaviz/octaviz/Widgets In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29673/Widgets Added Files: CMakeLists.txt Log Message: checking patches 1591368 and 1607894 --- NEW FILE: CMakeLists.txt --- SET(KIT_WRAP_DEPS Rendering) OCTAVE_WRAP_VTK(Widgets WIDGETS "${KIT_WRAP_DEPS}") INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkWidgets.oct) |
|
From: Jonathan S. <jjs...@us...> - 2006-12-27 05:18:10
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29673/Scripts Modified Files: vtk_colorbar.m Log Message: checking patches 1591368 and 1607894 Index: vtk_colorbar.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_colorbar.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_colorbar.m 7 Jul 2005 23:42:28 -0000 1.1 +++ vtk_colorbar.m 27 Dec 2006 05:18:08 -0000 1.2 @@ -32,10 +32,10 @@ f=vtk_figure(0); ## clear existing bar, if it exists - nprops = f.renderer.GetProps.GetNumberOfItems; + nprops = f.renderer.GetViewProps.GetNumberOfItems; for i = 0:nprops-1; - if ( f.renderer.GetProps.GetItemAsObject(i).IsA("vtkScalarBarActor") ) - f.renderer.RemoveViewProp( f.renderer.GetProps.GetItemAsObject(i) ); + if ( f.renderer.GetViewProps.GetItemAsObject(i).IsA("vtkScalarBarActor") ) + f.renderer.RemoveViewProp( f.renderer.GetViewProps.GetItemAsObject(i) ); break endif endfor |
