# HG changeset patch
# User greg
# Date 1468346518 14400
# Node ID 4745aef01a3aae9aaf804a9a6b84e0241cfe9b55
# Parent  c5adc08ee05b24f8ae440138673df2d56f36fa86
Uploaded

diff -r c5adc08ee05b -r 4745aef01a3a icqsol_add_texture.xml
--- a/icqsol_add_texture.xml	Tue Jul 12 11:29:16 2016 -0400
+++ b/icqsol_add_texture.xml	Tue Jul 12 14:01:58 2016 -0400
@@ -52,6 +52,7 @@
             <param name="input_file_format_and_type" value="vtkascii" />
             <param name="input_dataset_type" value="POLYDATA" />
             <param name="input_texture" value="sandstone.jpg" ftype="jpg" />
+            <param name="refine_shape" value="yes" />
             <param name="max_edge_length" value="0.1" />
             <output name="output" file="shaft_with_texture.vtkascii" ftype="vtkascii" />
             <param name="output_vtk_type" value="vtkascii" />
diff -r c5adc08ee05b -r 4745aef01a3a test-data/shaft_with_texture.vtkascii
--- a/test-data/shaft_with_texture.vtkascii	Tue Jul 12 11:29:16 2016 -0400
+++ b/test-data/shaft_with_texture.vtkascii	Tue Jul 12 14:01:58 2016 -0400
@@ -1,4 +1,4 @@
-# vtk DataFile Version 3.0
+# vtk DataFile Version 4.0
 vtk output
 ASCII
 DATASET POLYDATA
@@ -504,127 +504,127 @@
 
 POINT_DATA 242
 COLOR_SCALARS Colors 3
-0.576471 0.513725 0.454902 0.572549 0.509804 0.45098 0.478431 0.403922 0.34902 
-0.521569 0.54902 0.588235 0.431373 0.458824 0.498039 
-0.541176 0.556863 0.6 0.466667 0.392157 0.333333 
-0.411765 0.439216 0.478431 0.568627 0.494118 0.435294 
-0.376471 0.403922 0.435294 0.623529 0.54902 0.482353 
-0.517647 0.537255 0.560784 0.768627 0.694118 0.627451 
-0.494118 0.498039 0.513725 0.631373 0.564706 0.501961 
-0.462745 0.443137 0.431373 0.701961 0.635294 0.572549 
-0.529412 0.494118 0.47451 0.764706 0.694118 0.639216 
-0.541176 0.501961 0.466667 0.682353 0.611765 0.556863 
-0.545098 0.509804 0.490196 0.686275 0.615686 0.560784 
-0.403922 0.380392 0.380392 0.545098 0.482353 0.423529 
-0.67451 0.67451 0.713725 0.819608 0.756863 0.698039 
-0.52549 0.537255 0.603922 0.631373 0.568627 0.509804 
-0.435294 0.462745 0.494118 0.415686 0.352941 0.294118 
-0.439216 0.466667 0.505882 0.439216 0.376471 0.317647 
-0.407843 0.435294 0.47451 0.572549 0.509804 0.45098 
-0.478431 0.403922 0.34902 0.521569 0.54902 0.588235 
-0.431373 0.458824 0.498039 0.466667 0.392157 0.333333 
-0.411765 0.439216 0.478431 0.568627 0.494118 0.435294 
-0.376471 0.403922 0.435294 0.623529 0.54902 0.482353 
-0.517647 0.537255 0.560784 0.768627 0.694118 0.627451 
-0.494118 0.498039 0.513725 0.631373 0.564706 0.501961 
-0.462745 0.443137 0.431373 0.701961 0.635294 0.572549 
-0.529412 0.494118 0.47451 0.764706 0.694118 0.639216 
-0.541176 0.501961 0.466667 0.682353 0.611765 0.556863 
-0.545098 0.509804 0.490196 0.686275 0.615686 0.560784 
-0.403922 0.380392 0.380392 0.545098 0.482353 0.423529 
-0.67451 0.67451 0.713725 0.819608 0.756863 0.698039 
-0.52549 0.537255 0.603922 0.631373 0.568627 0.509804 
-0.435294 0.462745 0.494118 0.415686 0.352941 0.294118 
-0.439216 0.466667 0.505882 0.439216 0.376471 0.317647 
-0.407843 0.435294 0.47451 0.388235 0.32549 0.266667 
-0.447059 0.372549 0.313725 0.486275 0.423529 0.364706 
-0.635294 0.572549 0.513725 0.458824 0.396078 0.345098 
-0.768627 0.678431 0.647059 0.721569 0.65098 0.596078 
-0.431373 0.12549 0.435294 0 0.941176 0.666667 
-0.772549 0 0 0.25098 0 0 
-0.388235 0.415686 0.454902 0.658824 0.317647 0 
-0 0 0 0.690196 0.847059 0.952941 
-0.639216 0.576471 0.517647 0.611765 0.545098 0.482353 
-0.729412 0.666667 0.615686 0.709804 0.631373 0.588235 
-0.717647 0.643137 0.588235 0.486275 0.513725 0.545098 
-0.501961 0.529412 0.560784 0.537255 0.462745 0.403922 
-0.384314 0.411765 0.45098 0.447059 0.494118 0.839216 
-0 0 0 0 0 0.407843 
-0.54902 0.478431 0.431373 0.760784 0.713725 0.658824 
-0.741176 0.678431 0.627451 0.772549 0.698039 0.643137 
-0.545098 0.470588 0.415686 0.678431 0.705882 0.737255 
-0.733333 0.658824 0.6 0.368627 0.396078 0.427451 
-0.545098 0.517647 0.447059 0 0 0 
-0.823529 0.482353 0.87451 0.498039 0.427451 0.380392 
-0.513725 0.458824 0.415686 0.662745 0.611765 0.54902 
-0.541176 0.478431 0.415686 0.580392 0.505882 0.447059 
-0.517647 0.545098 0.576471 0.67451 0.6 0.533333 
-0.439216 0.407843 0.364706 0.705882 0.670588 0.635294 
-0.47451 0.431373 0.407843 0.533333 0.501961 0.458824 
-0.552941 0.482353 0.435294 0.541176 0.470588 0.423529 
-0.67451 0.631373 0.552941 0.584314 0.52549 0.45098 
-0.678431 0.603922 0.537255 0.309804 0.32549 0.360784 
-0.67451 0.6 0.533333 0.447059 0.439216 0.443137 
-0.580392 0.52549 0.47451 0.666667 0.623529 0.552941 
-0.560784 0.509804 0.435294 0.596078 0.52549 0.478431 
-0.6 0.54902 0.486275 0.803922 0.741176 0.682353 
-0.635294 0.576471 0.501961 0.654902 0.580392 0.513725 
-0.552941 0.564706 0.592157 0.8 0.72549 0.658824 
-0.545098 0.509804 0.490196 0.505882 0.501961 0.482353 
-0.521569 0.509804 0.482353 0.713725 0.643137 0.556863 
-0.415686 0.345098 0.298039 0.407843 0.368627 0.329412 
-0.760784 0.705882 0.654902 0.623529 0.556863 0.494118 
-0.631373 0.564706 0.501961 0.52549 0.529412 0.545098 
-0.694118 0.619608 0.552941 0.513725 0.462745 0.427451 
-0.717647 0.662745 0.611765 0.729412 0.678431 0.603922 
-0.541176 0.486275 0.435294 0.6 0.529412 0.482353 
-0.717647 0.654902 0.603922 0.686275 0.619608 0.580392 
-0.52549 0.462745 0.403922 0.666667 0.6 0.537255 
-0.537255 0.529412 0.541176 0.541176 0.478431 0.419608 
-0.52549 0.47451 0.439216 0.647059 0.592157 0.556863 
-0.701961 0.654902 0.568627 0.403922 0.360784 0.290196 
-0.411765 0.34902 0.290196 0.47451 0.411765 0.360784 
-0.698039 0.631373 0.6 0.717647 0.654902 0.603922 
-0.568627 0.498039 0.443137 0.454902 0.447059 0.458824 
-0.647059 0.584314 0.52549 0.647059 0.596078 0.560784 
-0.427451 0.376471 0.345098 0.623529 0.588235 0.529412 
-0.584314 0.54902 0.482353 0.647059 0.584314 0.52549 
-0.721569 0.678431 0.654902 0.482353 0.415686 0.384314 
-0.498039 0.435294 0.384314 0.611765 0.541176 0.486275 
-0.556863 0.54902 0.560784 0.615686 0.552941 0.494118 
-0.556863 0.521569 0.501961 0.686275 0.639216 0.592157 
-0.458824 0.411765 0.356863 0.67451 0.643137 0.6 
-0.639216 0.588235 0.564706 0.6 0.529412 0.47451 
-0.733333 0.670588 0.611765 0.588235 0.517647 0.462745 
-0.584314 0.513725 0.458824 0.572549 0.572549 0.603922 
-0.615686 0.552941 0.494118 0.545098 0.533333 0.560784 
-0.411765 0.388235 0.388235 0.584314 0.552941 0.509804 
-0.45098 0.407843 0.384314 0.407843 0.360784 0.305882 
-0.615686 0.541176 0.47451 0.639216 0.564706 0.505882 
-0.654902 0.592157 0.529412 0.482353 0.419608 0.360784 
-0.513725 0.521569 0.572549 0.545098 0.482353 0.423529 
-0.458824 0.470588 0.545098 0.494118 0.505882 0.580392 
-0.462745 0.490196 0.560784 0.505882 0.517647 0.537255 
-0.611765 0.560784 0.52549 0.623529 0.572549 0.541176 
-0.670588 0.596078 0.541176 0.423529 0.360784 0.301961 
-0.8 0.737255 0.678431 0.494118 0.505882 0.564706 
-0.705882 0.643137 0.584314 0.541176 0.568627 0.6 
-0.454902 0.482353 0.513725 0.501961 0.513725 0.541176 
-0.290196 0.384314 0.968627 0.733333 0.682353 0.647059 
-0.482353 0.415686 0.376471 0.435294 0.360784 0.305882 
-0.572549 0.509804 0.45098 0.560784 0.498039 0.439216 
-0.368627 0.396078 0.427451 0.568627 0.505882 0.447059 
-0.592157 0.619608 0.658824 0.937255 0.141176 0.321569 
-0 0 0 0.00784314 0.00392157 0 
-0.517647 0.521569 0.466667 0.470588 0.4 0.352941 
-0.584314 0.521569 0.462745 0.627451 0.564706 0.505882 
-0.478431 0.415686 0.356863 0.301961 0.329412 0.360784 
-0.462745 0.4 0.341176 0.454902 0.482353 0.521569 
-0 0.513725 0.705882 0.607843 0.862745 0 
-0 0 0 0.670588 0.603922 0.541176 
-0.619608 0.564706 0.521569 0.552941 0.490196 0.427451 
-0.4 0.337255 0.278431 0.701961 0.639216 0.580392 
-0.407843 0.435294 0.466667 
+0.67451 0.627451 0.572549 0.584314 0.529412 0.478431 0.556863 0.486275 0.431373 
+0.470588 0.47451 0.494118 0.52549 0.552941 0.592157 
+0.705882 0.678431 0.639216 0.572549 0.498039 0.439216 
+0.447059 0.439216 0.458824 0.607843 0.545098 0.486275 
+0.658824 0.607843 0.545098 0.682353 0.631373 0.6 
+0.760784 0.713725 0.65098 0.576471 0.513725 0.454902 
+0.482353 0.431373 0.368627 0.643137 0.580392 0.521569 
+0.588235 0.513725 0.486275 0.580392 0.517647 0.458824 
+0.490196 0.458824 0.45098 0.752941 0.72549 0.701961 
+0.552941 0.505882 0.458824 0.717647 0.658824 0.584314 
+0.572549 0.533333 0.498039 0.482353 0.407843 0.34902 
+0.564706 0.517647 0.462745 0.592157 0.529412 0.470588 
+0.568627 0.517647 0.454902 0.372549 0.309804 0.258824 
+0.784314 0.745098 0.698039 0.741176 0.670588 0.623529 
+0.721569 0.658824 0.6 0.623529 0.576471 0.521569 
+0.596078 0.556863 0.552941 0.705882 0.639216 0.6 
+0.490196 0.494118 0.513725 0.584314 0.529412 0.478431 
+0.556863 0.486275 0.431373 0.470588 0.47451 0.494118 
+0.52549 0.552941 0.592157 0.572549 0.498039 0.439216 
+0.447059 0.439216 0.458824 0.607843 0.545098 0.486275 
+0.658824 0.607843 0.545098 0.682353 0.631373 0.6 
+0.760784 0.713725 0.65098 0.576471 0.513725 0.454902 
+0.482353 0.431373 0.368627 0.643137 0.580392 0.521569 
+0.588235 0.513725 0.486275 0.580392 0.517647 0.458824 
+0.490196 0.458824 0.45098 0.752941 0.72549 0.701961 
+0.552941 0.505882 0.458824 0.717647 0.658824 0.584314 
+0.572549 0.533333 0.498039 0.482353 0.407843 0.34902 
+0.564706 0.517647 0.462745 0.592157 0.529412 0.470588 
+0.568627 0.517647 0.454902 0.372549 0.309804 0.258824 
+0.784314 0.745098 0.698039 0.741176 0.670588 0.623529 
+0.721569 0.658824 0.6 0.623529 0.576471 0.521569 
+0.596078 0.556863 0.552941 0.705882 0.639216 0.6 
+0.490196 0.494118 0.513725 0.72549 0.662745 0.603922 
+0.607843 0.537255 0.482353 0.647059 0.607843 0.568627 
+0.596078 0.533333 0.482353 0.694118 0.643137 0.568627 
+0.537255 0.486275 0.454902 0.521569 0.458824 0.407843 
+0 0 0 0 0 0 
+0 0 0 0 0 0 
+0.607843 0.509804 0.113725 0 0 0 
+0.615686 0.113725 0.498039 0.176471 0.854902 0.0823529 
+0.596078 0.521569 0.466667 0.662745 0.607843 0.564706 
+0.690196 0.615686 0.556863 0.588235 0.517647 0.462745 
+0.52549 0.462745 0.403922 0.490196 0.454902 0.435294 
+0.380392 0.333333 0.34902 0.741176 0.67451 0.611765 
+0.678431 0.705882 0.737255 0 0 0 
+0.12549 0.156863 0.247059 0 0 0 
+0.545098 0.482353 0.431373 0 0 0 
+0.658824 0.588235 0.533333 0.670588 0.603922 0.533333 
+0.411765 0.345098 0.305882 0.733333 0.690196 0.619608 
+0.627451 0.552941 0.494118 0.45098 0.447059 0.427451 
+0.717647 0.67451 0.596078 0.596078 0.533333 0.431373 
+0.509804 0.113725 0.498039 0.721569 0.654902 0.584314 
+0 0 0 0.529412 0.47451 0.431373 
+0.72549 0.658824 0.596078 0.592157 0.533333 0.458824 
+0.635294 0.588235 0.533333 0.678431 0.631373 0.584314 
+0.603922 0.552941 0.490196 0.701961 0.635294 0.564706 
+0.780392 0.745098 0.686275 0.72549 0.666667 0.592157 
+0.572549 0.517647 0.47451 0.784314 0.717647 0.654902 
+0.623529 0.572549 0.537255 0.756863 0.690196 0.627451 
+0.572549 0.521569 0.490196 0.662745 0.631373 0.580392 
+0.760784 0.713725 0.658824 0.556863 0.52549 0.47451 
+0.498039 0.427451 0.372549 0.572549 0.509804 0.45098 
+0.713725 0.670588 0.6 0.654902 0.584314 0.537255 
+0.752941 0.423529 0.564706 0.572549 0.517647 0.482353 
+0.631373 0.576471 0.52549 0.588235 0.52549 0.466667 
+0.517647 0.470588 0.423529 0.764706 0.690196 0.631373 
+0.568627 0.552941 0.541176 0.584314 0.521569 0.458824 
+0.45098 0.388235 0.32549 0.588235 0.513725 0.447059 
+0.521569 0.470588 0.435294 0 0.188235 0.490196 
+0.639216 0.572549 0.509804 0.733333 0.678431 0.627451 
+0.709804 0.647059 0.588235 0.580392 0.533333 0.470588 
+0.596078 0.541176 0.498039 0.290196 0.254902 0.227451 
+0.701961 0.635294 0.564706 0.560784 0.529412 0.478431 
+0.513725 0.458824 0.423529 0.494118 0.443137 0.411765 
+0.658824 0.627451 0.576471 0.619608 0.572549 0.52549 
+0.713725 0.662745 0.6 0.741176 0.690196 0.627451 
+0.584314 0.537255 0.47451 0.623529 0.568627 0.52549 
+0.67451 0.611765 0.560784 0.627451 0.580392 0.52549 
+0.705882 0.678431 0.615686 0.560784 0.498039 0.447059 
+0.619608 0.615686 0.6 0.278431 0.223529 0.211765 
+0.729412 0.678431 0.643137 0.486275 0.431373 0.388235 
+0.807843 0.772549 0.745098 0.482353 0.435294 0.372549 
+0.796078 0.745098 0.682353 0.466667 0.411765 0.360784 
+0.556863 0.509804 0.454902 0.6 0.552941 0.505882 
+0.611765 0.545098 0.513725 0.537255 0.490196 0.443137 
+0.521569 0.482353 0.435294 0.298039 0.247059 0.215686 
+0.482353 0.427451 0.392157 0.776471 0.721569 0.670588 
+0.301961 0.25098 0.188235 0.529412 0.47451 0.423529 
+0.541176 0.478431 0.427451 0.505882 0.45098 0.4 
+0.639216 0.592157 0.537255 0.454902 0.403922 0.372549 
+0.592157 0.545098 0.498039 0 0 0 
+0.580392 0.509804 0.454902 0.733333 0.670588 0.611765 
+0.615686 0.552941 0.494118 0.517647 0.490196 0.427451 
+0.737255 0.682353 0.631373 0.486275 0.411765 0.356863 
+0.454902 0.403922 0.337255 0.505882 0.454902 0.423529 
+0.796078 0.733333 0.67451 0.592157 0.52549 0.447059 
+0 0 0 0.733333 0.670588 0.607843 
+0.701961 0.627451 0.560784 0.6 0.537255 0.478431 
+0.619608 0.580392 0.533333 0.529412 0.466667 0.407843 
+0.635294 0.588235 0.52549 0.658824 0.607843 0.545098 
+0.717647 0.670588 0.615686 0.678431 0.639216 0.592157 
+0.729412 0.678431 0.603922 0.635294 0.584314 0.517647 
+0.380392 0.309804 0.231373 0.372549 0.301961 0.254902 
+0.407843 0.345098 0.294118 0.729412 0.698039 0.654902 
+0.784314 0.717647 0.654902 0.639216 0.576471 0.517647 
+0.533333 0.482353 0.447059 0.537255 0.537255 0.505882 
+0 0 0 0.74902 0.698039 0.635294 
+0.643137 0.509804 0.113725 0.627451 0.564706 0.505882 
+0.482353 0.427451 0.376471 0.541176 0.466667 0.411765 
+0.729412 0.682353 0.627451 0.631373 0.560784 0.505882 
+0.501961 0.486275 0.482353 0 0 0 
+0.235294 0.439216 0.435294 0.752941 0.219608 0.882353 
+0.454902 0.458824 0.403922 0.435294 0.447059 0.427451 
+0.580392 0.54902 0.498039 0.568627 0.517647 0.482353 
+0.333333 0.282353 0.247059 0.572549 0.521569 0.458824 
+0.631373 0.568627 0.509804 0.615686 0.603922 0.360784 
+0 0 0 0 0.290196 0.705882 
+0 0 0 0.678431 0.623529 0.580392 
+0.678431 0.631373 0.576471 0.666667 0.6 0.529412 
+0.396078 0.333333 0.282353 0.737255 0.67451 0.615686 
+0.678431 0.623529 0.580392 
 NORMALS Normals float
 -1 0 0 -1 0 0 -1 0 0 
 0 0.0661586 -0.997809 0 -0.320722 -0.947174 1 0 0