[cig-commits] r4708 - mc/3D/CitcomS/trunk/visual
tan2 at geodynamics.org
tan2 at geodynamics.org
Wed Oct 4 17:38:05 PDT 2006
Author: tan2
Date: 2006-10-04 17:38:05 -0700 (Wed, 04 Oct 2006)
New Revision: 4708
Modified:
mc/3D/CitcomS/trunk/visual/visFull.cfg
mc/3D/CitcomS/trunk/visual/visFull.net.in
mc/3D/CitcomS/trunk/visual/visRegional.cfg
mc/3D/CitcomS/trunk/visual/visRegional.net.in
Log:
Updated macros to use new samples files and fixed a few stylus issues
Modified: mc/3D/CitcomS/trunk/visual/visFull.cfg
===================================================================
--- mc/3D/CitcomS/trunk/visual/visFull.cfg 2006-10-05 00:25:13 UTC (rev 4707)
+++ mc/3D/CitcomS/trunk/visual/visFull.cfg 2006-10-05 00:38:05 UTC (rev 4708)
@@ -1,41 +1,42 @@
//
-// time: Fri Jun 17 11:17:08 2005
+// time: Wed Oct 4 17:18:03 2006
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
+// Message Window:
+// window: position = (0.0000,0.0000), size = 0.3825x0.1625
//
-// panel[0]: position = (0.0000,0.0000), size = 0.2930x0.4395, startup = 1, devstyle = 1
+// panel[1]: position = (0.0056,0.0000), size = 0.3044x0.4392, startup = 1, devstyle = 1
// title: value = Control Panel
//
// workspace: width = 500, height = 500
// layout: snap = 0, width = 50, height = 50, align = NN
//
-// panel[1]: position = (0.0000,0.0000), size = 0.2930x0.4395, startup = 1, devstyle = 1
-// title: value = Control Panel
+// interactor FileSelector[1]: num_components = 1, value = "samples/fulltest.cap%02d.100.general"
+// instance: panel = 1, x = 0, y = 0, style = FileSelector, vertical = 1, size = 264x57
+// label: value = Format String of CitcomSFullImport:
+// filter = ./*.general
//
-// workspace: width = 500, height = 500
-// layout: snap = 0, width = 50, height = 50, align = NN
-//
-// panel[2]: position = (0.0000,0.0000), size = 0.2930x0.4395, startup = 1, devstyle = 1
-// title: value = Control Panel
-//
-// workspace: width = 500, height = 500
-// layout: snap = 0, width = 50, height = 50, align = NN
-//
-// interactor FileSelector[1]: num_components = 1, value = "path to your data"
-// instance: panel = 1, x = 5, y = 5, style = FileSelector, vertical = 1, size = 242x55
-//
// interactor Integer[8]: num_components = 1, value = 2
-// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 0, global continuous = 0
-// instance: panel = 2, x = 5, y = 5, style = Stepper, vertical = 1, size = 206x54
+// component[0]: minimum = 1, maximum = 100, global increment = 1, decimal = 0, global continuous = 0
+// instance: panel = 1, x = 0, y = 67, style = Stepper, vertical = 1, size = 208x56
+// label: value = CitcomSFullImport reduced:
// local continuous: value = 0, mode = global
// local increment[0]: value = 1, mode = global
//
-// interactor Scalar[6]: num_components = 1, value = 0.0
-// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 5, global continuous = 0
+// interactor Scalar[6]: num_components = 1, value = -30.0
+// component[0]: minimum = -90, maximum = 90, global increment = 1, decimal = 1, global continuous = 0
+// instance: panel = 1, x = 7, y = 200, style = Slider, vertical = 1, size = 212x85
+// label: value = Latitude of normal axis:
+// local continuous: value = 0, mode = global
+// local increment[0]: value = 1, mode = global
//
-// interactor Scalar[7]: num_components = 1, value = 0.0
-// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 5, global continuous = 0
+// interactor Scalar[7]: num_components = 1, value = -30.0
+// component[0]: minimum = -90, maximum = 90, global increment = 1, decimal = 1, global continuous = 0
+// instance: panel = 1, x = 238, y = 199, style = Slider, vertical = 1, size = 212x85
+// label: value = Longitude of normal axis:
+// local continuous: value = 0, mode = global
+// local increment[0]: value = 1, mode = global
//
// node Colormap[5]:
// input[1]: defaulting = 0, value = { [0.0 0.666667] [1.0 0.0] }
@@ -51,11 +52,18 @@
// input[18]: defaulting = 0, value = 1.0
// window: position = (0.0000,0.0000), size = 0.5078x0.4395
//
-// interactor ScalarList[1]: num_components = 1, value = { 0.9 }
-// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 5, global continuous = 0
+// interactor ScalarList[1]: num_components = 1, value = { 0.8 0.4 }
+// component[0]: minimum = -1, maximum = 1, global increment = 0.05, decimal = 2, global continuous = 0
+// instance: panel = 1, x = 277, y = 0, style = List Editor, vertical = 1, size = 168x178
+// local continuous: value = 0, mode = global
+// local increment[0]: value = 1, mode = global
//
// interactor Scalar[5]: num_components = 1, value = 0.55
-// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 5, global continuous = 0
+// component[0]: minimum = 0, maximum = 1, global increment = 0.05, decimal = 2, global continuous = 0
+// instance: panel = 1, x = 20, y = 131, style = Stepper, vertical = 1, size = 133x56
+// label: value = Core radius:
+// local continuous: value = 0, mode = global
+// local increment[0]: value = 1, mode = global
//
// node Image[3]:
// title: value = Gridded_3D_2ormorevar_notseries
@@ -66,8 +74,8 @@
// input[5]: defaulting = 0, value = [5.96046e-08 -5.96046e-08 -1.19209e-07]
// input[6]: defaulting = 0, value = [10.2066 0.966056 1.00301]
// input[7]: defaulting = 0, value = 5.52043
-// input[8]: defaulting = 0, value = 716
-// input[9]: defaulting = 0, value = 0.63757
+// input[8]: defaulting = 0, value = 898
+// input[9]: defaulting = 0, value = 0.604
// input[10]: defaulting = 0, value = [-0.0950113 -0.0293021 0.995045]
// input[11]: defaulting = 1, value = 30.0003
// input[12]: defaulting = 0, value = 0
Modified: mc/3D/CitcomS/trunk/visual/visFull.net.in
===================================================================
--- mc/3D/CitcomS/trunk/visual/visFull.net.in 2006-10-05 00:25:13 UTC (rev 4707)
+++ mc/3D/CitcomS/trunk/visual/visFull.net.in 2006-10-05 00:38:05 UTC (rev 4708)
@@ -1,5 +1,5 @@
//
-// time: Fri Jun 17 11:17:08 2005
+// time: Wed Oct 4 15:59:54 2006
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
@@ -34,8 +34,8 @@
// page assignment: boundary order=7, windowed=0, showing=0
// page assignment: colormap order=3, windowed=0, showing=0
// page assignment: glyph order=4, windowed=0, showing=0
-// page assignment: image order=8, windowed=0, showing=1
-// page assignment: import order=2, windowed=0, showing=0
+// page assignment: image order=8, windowed=0, showing=0
+// page assignment: import order=2, windowed=0, showing=1
// page assignment: isosurface order=6, windowed=0, showing=0
// page assignment: plane order=5, windowed=0, showing=0
// workspace: width = 459, height = 512
@@ -66,16 +66,16 @@
) [instance: 3, cache: 1];
//
// node FileSelector[1]: x = 14, y = 35, inputs = 0, label = FileSelector
- // output[1]: visible = 1, type = 32, value = "path to your data"
- // output[2]: visible = 1, type = 32, value = "path to your data"
+ // output[1]: visible = 1, type = 32, value = "samples/fulltest.cap%02d.100.general"
+ // output[2]: visible = 1, type = 32, value = "fulltest.cap%02d.100.general"
// page group: import
//
//
// node Integer[8]: x = 214, y = 38, inputs = 11, label = Integer
// input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_8"
// input[3]: defaulting = 0, visible = 0, type = 1, value = 2
- // input[5]: defaulting = 1, visible = 0, type = 1, value = -1000000
- // input[6]: defaulting = 1, visible = 0, type = 1, value = 1000000
+ // input[5]: defaulting = 1, visible = 0, type = 1, value = 1
+ // input[6]: defaulting = 1, visible = 0, type = 1, value = 100
// input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0
// input[9]: defaulting = 1, visible = 0, type = 1, value = 0
// output[1]: visible = 1, type = 1, value = 2
@@ -133,23 +133,23 @@
//
// node Scalar[6]: x = 197, y = 33, inputs = 11, label = Scalar
// input[1]: defaulting = 0, visible = 0, type = 32, value = "Scalar_6"
- // input[3]: defaulting = 0, visible = 0, type = 5, value = 0.0
- // input[5]: defaulting = 1, visible = 0, type = 5, value = -1000000.0
- // input[6]: defaulting = 1, visible = 0, type = 5, value = 1000000.0
+ // input[3]: defaulting = 0, visible = 0, type = 5, value = -30.0
+ // input[5]: defaulting = 1, visible = 0, type = 5, value = -90.0
+ // input[6]: defaulting = 1, visible = 0, type = 5, value = 90.0
// input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0
- // input[9]: defaulting = 1, visible = 0, type = 1, value = 5
- // output[1]: visible = 1, type = 5, value = 0.0
+ // input[9]: defaulting = 1, visible = 0, type = 1, value = 1
+ // output[1]: visible = 1, type = 5, value = -30.0
// page group: plane
//
//
// node Scalar[7]: x = 253, y = 33, inputs = 11, label = Scalar
// input[1]: defaulting = 0, visible = 0, type = 32, value = "Scalar_7"
- // input[3]: defaulting = 0, visible = 0, type = 5, value = 0.0
- // input[5]: defaulting = 1, visible = 0, type = 5, value = -1000000.0
- // input[6]: defaulting = 1, visible = 0, type = 5, value = 1000000.0
+ // input[3]: defaulting = 0, visible = 0, type = 5, value = -30.0
+ // input[5]: defaulting = 1, visible = 0, type = 5, value = -90.0
+ // input[6]: defaulting = 1, visible = 0, type = 5, value = 90.0
// input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0
- // input[9]: defaulting = 1, visible = 0, type = 1, value = 5
- // output[1]: visible = 1, type = 5, value = 0.0
+ // input[9]: defaulting = 1, visible = 0, type = 1, value = 1
+ // output[1]: visible = 1, type = 5, value = -30.0
// page group: plane
//
//
@@ -263,12 +263,12 @@
//
// node ScalarList[1]: x = 247, y = 43, inputs = 11, label = ScalarList
// input[1]: defaulting = 0, visible = 0, type = 32, value = "ScalarList_1"
- // input[3]: defaulting = 0, visible = 0, type = 16777221, value = { 0.9 }
- // input[5]: defaulting = 1, visible = 0, type = 5, value = -1000000.0
- // input[6]: defaulting = 1, visible = 0, type = 5, value = 1000000.0
+ // input[3]: defaulting = 0, visible = 0, type = 16777221, value = { 0.8 0.4 }
+ // input[5]: defaulting = 1, visible = 0, type = 5, value = -1.0
+ // input[6]: defaulting = 1, visible = 0, type = 5, value = 1.0
// input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0
- // input[9]: defaulting = 1, visible = 0, type = 1, value = 5
- // output[1]: visible = 1, type = 16777221, value = { 0.9 }
+ // input[9]: defaulting = 1, visible = 0, type = 1, value = 2
+ // output[1]: visible = 1, type = 16777221, value = { 0.8 0.4 }
// page group: isosurface
//
//
@@ -429,10 +429,10 @@
// node Scalar[5]: x = 64, y = 46, inputs = 11, label = Scalar
// input[1]: defaulting = 0, visible = 0, type = 32, value = "Scalar_5"
// input[3]: defaulting = 0, visible = 0, type = 5, value = 0.55
- // input[5]: defaulting = 1, visible = 0, type = 5, value = -1000000.0
- // input[6]: defaulting = 1, visible = 0, type = 5, value = 1000000.0
+ // input[5]: defaulting = 1, visible = 0, type = 5, value = 0.0
+ // input[6]: defaulting = 1, visible = 0, type = 5, value = 1.0
// input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0
- // input[9]: defaulting = 1, visible = 0, type = 1, value = 5
+ // input[9]: defaulting = 1, visible = 0, type = 1, value = 2
// output[1]: visible = 1, type = 5, value = 0.55
// page group: boundary
//
@@ -518,8 +518,8 @@
// input[5]: defaulting = 0, visible = 0, type = 8, value = [5.96046e-08 -5.96046e-08 -1.19209e-07]
// input[6]: defaulting = 0, visible = 0, type = 8, value = [10.2066 0.966056 1.00301]
// input[7]: defaulting = 0, visible = 0, type = 5, value = 5.52043
- // input[8]: defaulting = 0, visible = 0, type = 1, value = 716
- // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.63757
+ // input[8]: defaulting = 0, visible = 0, type = 1, value = 898
+ // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.604
// input[10]: defaulting = 0, visible = 0, type = 8, value = [-0.0950113 -0.0293021 0.995045]
// input[11]: defaulting = 1, visible = 0, type = 5, value = 30.0003
// input[12]: defaulting = 0, visible = 0, type = 1, value = 0
@@ -640,7 +640,7 @@
main_AutoColor_3_in_8 = NULL;
main_AutoColor_3_in_9 = NULL;
main_AutoColor_3_in_10 = NULL;
-main_FileSelector_1_out_1 = "path to your data";
+main_FileSelector_1_out_1 = "samples/fulltest.cap%02d.100.general";
main_Integer_8_in_1 = "Integer_8";
main_Integer_8_in_2 = NULL;
main_Integer_8_in_3 = 2 ;
@@ -671,7 +671,7 @@
main_Receiver_96_out_1 = NULL;
main_Scalar_6_in_1 = "Scalar_6";
main_Scalar_6_in_2 = NULL;
-main_Scalar_6_in_3 = 0.0 ;
+main_Scalar_6_in_3 = -30.0 ;
main_Scalar_6_in_4 = NULL;
main_Scalar_6_in_5 = NULL;
main_Scalar_6_in_6 = NULL;
@@ -680,10 +680,10 @@
main_Scalar_6_in_9 = NULL;
main_Scalar_6_in_10 = NULL;
main_Scalar_6_in_11 = NULL;
-main_Scalar_6_out_1 = 0.0 ;
+main_Scalar_6_out_1 = -30.0 ;
main_Scalar_7_in_1 = "Scalar_7";
main_Scalar_7_in_2 = NULL;
-main_Scalar_7_in_3 = 0.0 ;
+main_Scalar_7_in_3 = -30.0 ;
main_Scalar_7_in_4 = NULL;
main_Scalar_7_in_5 = NULL;
main_Scalar_7_in_6 = NULL;
@@ -692,7 +692,7 @@
main_Scalar_7_in_9 = NULL;
main_Scalar_7_in_10 = NULL;
main_Scalar_7_in_11 = NULL;
-main_Scalar_7_out_1 = 0.0 ;
+main_Scalar_7_out_1 = -30.0 ;
main_Compute_85_in_1 = "latr=$0/180*3.1416; lonr=$1/180*3.1416; [cos(lonr)*cos(latr), sin(lonr)*cos(latr), sin(latr)]";
main_Compute_85_out_1 = NULL;
main_MapToPlane_1_in_2 = [0 0 0];
@@ -728,7 +728,7 @@
main_Receiver_90_out_1 = NULL;
main_ScalarList_1_in_1 = "ScalarList_1";
main_ScalarList_1_in_2 = NULL;
-main_ScalarList_1_in_3 = { 0.9 };
+main_ScalarList_1_in_3 = { 0.8 0.4 };
main_ScalarList_1_in_4 = NULL;
main_ScalarList_1_in_5 = NULL;
main_ScalarList_1_in_6 = NULL;
@@ -737,7 +737,7 @@
main_ScalarList_1_in_9 = NULL;
main_ScalarList_1_in_10 = NULL;
main_ScalarList_1_in_11 = NULL;
-main_ScalarList_1_out_1 = { 0.9 };
+main_ScalarList_1_out_1 = { 0.8 0.4 };
main_Isosurface_3_in_3 = NULL;
main_Isosurface_3_in_4 = NULL;
main_Isosurface_3_in_5 = NULL;
@@ -1130,8 +1130,8 @@
main_Image_3_in_5 = [5.96046e-08 -5.96046e-08 -1.19209e-07];
main_Image_3_in_6 = [10.2066 0.966056 1.00301];
main_Image_3_in_7 = 5.52043;
-main_Image_3_in_8 = 716;
-main_Image_3_in_9 = 0.63757;
+main_Image_3_in_8 = 898;
+main_Image_3_in_9 = 0.604;
main_Image_3_in_10 = [-0.0950113 -0.0293021 0.995045];
main_Image_3_in_11 = NULL;
main_Image_3_in_12 = 0;
Modified: mc/3D/CitcomS/trunk/visual/visRegional.cfg
===================================================================
--- mc/3D/CitcomS/trunk/visual/visRegional.cfg 2006-10-05 00:25:13 UTC (rev 4707)
+++ mc/3D/CitcomS/trunk/visual/visRegional.cfg 2006-10-05 00:38:05 UTC (rev 4708)
@@ -1,5 +1,5 @@
//
-// time: Fri Jun 17 11:17:40 2005
+// time: Wed Oct 4 16:13:27 2006
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
@@ -10,12 +10,12 @@
// workspace: width = 500, height = 500
// layout: snap = 0, width = 50, height = 50, align = NN
//
-// interactor FileSelector[1]: num_components = 1, value = "path to your data"
+// interactor FileSelector[1]: num_components = 1, value = "samples/regtest.cap00.100.general"
// instance: panel = 2, x = 0, y = 0, style = FileSelector, vertical = 1, size = 180x55
// filter = ./*.general
//
// interactor Integer[8]: num_components = 1, value = 2
-// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 0, global continuous = 0
+// component[0]: minimum = 1, maximum = 100, global increment = 1, decimal = 0, global continuous = 0
// instance: panel = 2, x = 0, y = 57, style = Stepper, vertical = 1, size = 180x54
// local continuous: value = 0, mode = global
// local increment[0]: value = 1, mode = global
Modified: mc/3D/CitcomS/trunk/visual/visRegional.net.in
===================================================================
--- mc/3D/CitcomS/trunk/visual/visRegional.net.in 2006-10-05 00:25:13 UTC (rev 4707)
+++ mc/3D/CitcomS/trunk/visual/visRegional.net.in 2006-10-05 00:38:05 UTC (rev 4708)
@@ -1,5 +1,5 @@
//
-// time: Fri Jun 17 11:17:40 2005
+// time: Wed Oct 4 16:13:27 2006
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
@@ -32,8 +32,8 @@
// page assignment: boundary order=7, windowed=0, showing=0
// page assignment: colormap order=3, windowed=0, showing=0
// page assignment: glyph order=4, windowed=0, showing=0
-// page assignment: image order=8, windowed=0, showing=1
-// page assignment: import order=2, windowed=0, showing=0
+// page assignment: image order=8, windowed=0, showing=0
+// page assignment: import order=2, windowed=0, showing=1
// page assignment: isosurface order=6, windowed=0, showing=0
// page assignment: slab order=5, windowed=0, showing=0
// workspace: width = 459, height = 512
@@ -64,16 +64,16 @@
) [instance: 3, cache: 1];
//
// node FileSelector[1]: x = 86, y = 49, inputs = 0, label = FileSelector
- // output[1]: visible = 1, type = 32, value = "path to your datal"
- // output[2]: visible = 1, type = 32, value = "path to your datal"
+ // output[1]: visible = 1, type = 32, value = "samples/regtest.cap00.100.general"
+ // output[2]: visible = 1, type = 32, value = "regtest.cap00.100.general"
// page group: import
//
//
// node Integer[8]: x = 205, y = 49, inputs = 11, label = Integer
// input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_8"
// input[3]: defaulting = 0, visible = 0, type = 1, value = 2
- // input[5]: defaulting = 1, visible = 0, type = 1, value = -1000000
- // input[6]: defaulting = 1, visible = 0, type = 1, value = 1000000
+ // input[5]: defaulting = 1, visible = 0, type = 1, value = 1
+ // input[6]: defaulting = 1, visible = 0, type = 1, value = 100
// input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0
// input[9]: defaulting = 1, visible = 0, type = 1, value = 0
// output[1]: visible = 1, type = 1, value = 2
@@ -559,7 +559,7 @@
main_AutoColor_3_in_8 = NULL;
main_AutoColor_3_in_9 = NULL;
main_AutoColor_3_in_10 = NULL;
-main_FileSelector_1_out_1 = "path to your datal";
+main_FileSelector_1_out_1 = "samples/regtest.cap00.100.general";
main_Integer_8_in_1 = "Integer_8";
main_Integer_8_in_2 = NULL;
main_Integer_8_in_3 = 2 ;
More information about the cig-commits
mailing list