541 patterns support #1516

sankhesh · 2015-09-03T17:21:15Z

Fixes issues #541 #1042

Incorrect indentation.

aashish24 · 2015-09-03T17:34:50Z

Great stuff @sankhesh can you get rid of "WIP" from commit messages?

doutriaux1 · 2015-09-03T18:39:12Z

Packages/vcs/Lib/fillarea.py

@@ -336,6 +355,7 @@ def __init__(self, Tf_name=None, Tf_name_src='default'):
            self._style = ['solid', ]
            self._index = [1, ]
            self._color = [1, ]
+            self._opacity = []


shouldn't we default to 1. ?

Nope. The default is different in different cases.
For solids and patterns, default opacity value is 0 and for hatches it is 100.

doutriaux1 · 2015-09-03T18:40:39Z

Packages/vcs/Lib/vcsvtk/boxfillpipeline.py

@@ -329,6 +343,7 @@ def _plotInternalCustomBoxfill(self):
                    I = [indices[i]]
        tmpLevels.append(L)
        tmpColors.append(C)
+        print tmpLevels


Good spot. I'll fix it.

doutriaux1 · 2015-09-03T18:43:24Z

@sankhesh I'm excited. Going to play with it right way! quick question does iso.script("iso.json") work? I don't see you updated the test_dump_json and it should probably fail now since we have a new attribute.

doutriaux1 · 2015-09-03T18:43:51Z

I will let @aashish24 do the "commits police" work 😜

doutriaux1 · 2015-09-03T18:44:11Z

@sankhesh also could you please rebase on master?

sankhesh · 2015-09-03T18:51:53Z

@aashish24 Done.

@doutriaux1 Until now, I had no idea about the json stuff. I'll take a look at it too.

They are automatically computed

This is required as patterns/hatches are textures applied to 3D polydata that don't get exported without rasterization.

instead of 4 times the bounds of the pattern plane. This improves performance and also fixes disorientation of texture coordinates with very large textures

Call fitToViewport on object instead of weakref. Build vtkImagingStencil module with VTK.

Conflicts: CMake/cdat_modules/vtk_external.cmake Packages/vcs/Lib/VTKPlots.py Packages/vcs/Lib/vcsvtk/isofillpipeline.py testing/matplotlib/CMakeLists.txt

doutriaux1 · 2015-09-03T21:14:37Z

@sankhesh lots of failing tests... Also basic plot now fails:

import os,sys,cdms2,vcs

f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
s=f("clt")
x=vcs.init()
x.plot(s)

python test.py
Traceback (most recent call last):
  File "test.py", line 6, in <module>
    x.plot(s)
  File "/lgm/uvcdat/2015-09-03/lib/python2.7/site-packages/vcs/Canvas.py", line 2524, in plot
    a = self.__plot(arglist, keyargs)
  File "/lgm/uvcdat/2015-09-03/lib/python2.7/site-packages/vcs/Canvas.py", line 3839, in __plot
    returned_kargs = self.backend.plot(*arglist, **keyargs)
  File "/lgm/uvcdat/2015-09-03/lib/python2.7/site-packages/vcs/VTKPlots.py", line 466, in plot
    vtk_backend_grid, vtk_backend_geo))
  File "/lgm/uvcdat/2015-09-03/lib/python2.7/site-packages/vcs/vcsvtk/pipeline2d.py", line 157, in plot
    self._plotInternal()
  File "/lgm/uvcdat/2015-09-03/lib/python2.7/site-packages/vcs/vcsvtk/boxfillpipeline.py", line 186, in _plotInternal
    for ind, mapper in enumerate(self._patternMappers):
TypeError: 'NoneType' object is not iterable

sankhesh · 2015-09-03T21:40:00Z

@doutriaux1 Could you please try with a new checkout? I had to force-push a couple of changes.

aashish24 · 2015-09-05T19:45:08Z

@sankhesh looks like you still have 52 tests failing. Most of the has the same pattern.

Fixed bug where the number of opacity values was one less than the number of colors provided

Fix issue where the set methods allowed setting null or NoneType values for members, thereby causing inconsistencies in code that used these member variables.

This is a special case as the default opacity values differ based on the fill style. The default is 0 for patterns and 100 for solid fill and hatches.

sankhesh · 2015-09-09T14:07:03Z

@doutriaux1 All regressions pass now.

doutriaux1 · 2015-09-09T16:41:12Z

Nice! thanks will play with it now and let you know. Will let our scientists know as well. @bonfils2 @durack1 I will let you know when it's ready.

durack1 · 2015-09-09T16:53:01Z

@sankhesh are there some missing files in the test-suite? On the macbot I see:

The following tests FAILED:
    302 - vcs_test_patterns (Failed)
    309 - vcs_test_isofill_patterns (Failed)
    310 - vcs_test_isofill_hatches (Failed)
    311 - vcs_test_hatches_patterns (Failed)
    460 - basemap_verify_import (Failed)
File "/Users/doutriaux1/uvcbot/build/uvcdat-testdata/baselines/vcs/test_vcs_hatches_patterns.png" not found.
File "/Users/doutriaux1/uvcbot/build/uvcdat-testdata/baselines/vcs/test_isofill_hatches.png" not found.
File "/Users/doutriaux1/uvcbot/build/uvcdat-testdata/baselines/vcs/test_isofill_patterns.png" not found.

sankhesh · 2015-09-09T17:02:02Z

@durack1

Those files are sitting in a PR @ CDAT/uvcdat-testdata#61
Typically, the testdata should be updated everytime its built. No idea why the macbot fails to do so. The other machines seem to be fine.

aashish24 · 2015-09-09T17:33:01Z

@sankhesh awesome dude!..

541 patterns support

Fixed issue in parsing contour levels

10b9e8e

Incorrect indentation.

sankhesh mentioned this pull request Sep 3, 2015

Baselines for hatches/patterns tests CDAT/uvcdat-testdata#61

Merged

sankhesh assigned doutriaux1 Sep 3, 2015

doutriaux1 reviewed Sep 3, 2015
View reviewed changes

sankhesh force-pushed the 541_patterns_support branch from 6df42e6 to 8f82acf Compare September 3, 2015 18:40

doutriaux1 reviewed Sep 3, 2015
View reviewed changes

sankhesh added 18 commits September 3, 2015 14:55

Initial work for pattern overlay

93c3376

Remove debug code

21f7b74

Fixed issues with patterns at different contour levels

5399930

A specific pattern will look same for all different bounds

85ba06d

Cleaned up redundant commented out code

7bf3e24

No need to explicitly set plane center and normal

55ceeb5

They are automatically computed

Enable background rasterization when writing out vector formats

1b66549

This is required as patterns/hatches are textures applied to 3D polydata that don't get exported without rasterization.

Enable background rasterization for patterns, hatches only

b9fffde

Added new utility script to generate different patterns

9c572cf

Added more patterns

61169ed

More patterns support

dbd17c6

Added more patterns to the list

7b77da5

Re-scale the pattern image to 2 times the bounds of plane

63f6464

instead of 4 times the bounds of the pattern plane. This improves performance and also fixes disorientation of texture coordinates with very large textures

Fillareautils should return the textured actor

4b99607

Added support for patterns in legend fillarea

0a91679

Fix fillarea pattern resolution issues with very small bounds

5c9b3cb

Enable rasterization when writing out fillareas with patterns

c891d2f

Support colored patterns (hatch) in fillarea

4f8b93d

doutriaux1 and others added 11 commits September 3, 2015 14:56

documents what solution does and where i found the answer

0e96d68

document solution and source of it

66a102c

Fixes post merging with master

733e0ec

Call fitToViewport on object instead of weakref. Build vtkImagingStencil module with VTK.

Clamp fillarea opacity values between 0 - 100

521ebae

Add opacity support in legend and fix default value to empty

f501e74

Ensure that translucent solid fillareas are rasterized in ps/pdf

44cdb0a

Add opacity as attribute to isosurfaces grouping logic

6b271f8

Always apply stencil when using patterns/hatches

f77181e

Modified patterns/hatches as per user feedback

c7ddc9f

Fix error when no indices are provided

7ea1853

Added various test cases for hatches/patterns

6490f95

sankhesh force-pushed the 541_patterns_support branch from 8f82acf to 6490f95 Compare September 3, 2015 18:57

Merge branch 'master' into 541_patterns_support

d623fd9

Conflicts: CMake/cdat_modules/vtk_external.cmake Packages/vcs/Lib/VTKPlots.py Packages/vcs/Lib/vcsvtk/isofillpipeline.py testing/matplotlib/CMakeLists.txt

sankhesh added 5 commits September 7, 2015 23:39

Limit to one round of bandedcontouring with solid fillareas

236c934

Pad opacity values with defaults if none provided

c39768e

Fixed bug where the number of opacity values was one less than the number of colors provided

Avoid setting null or NoneType values for member variables

4f3fa74

Fix issue where the set methods allowed setting null or NoneType values for members, thereby causing inconsistencies in code that used these member variables.

Handle invalid opacity values for fillareas

3698d07

This is a special case as the default opacity values differ based on the fill style. The default is 0 for patterns and 100 for solid fill and hatches.

Accomodate for new opacity attribute in output of test_vcs_dump_json

b3cd323

sankhesh added this to the 2.4 milestone Sep 9, 2015

doutriaux1 added a commit that referenced this pull request Sep 10, 2015

Merge pull request #1516 from UV-CDAT/541_patterns_support

fc1660a

541 patterns support

doutriaux1 merged commit fc1660a into master Sep 10, 2015

doutriaux1 deleted the 541_patterns_support branch September 10, 2015 01:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

541 patterns support #1516

541 patterns support #1516

sankhesh commented Sep 3, 2015

aashish24 commented Sep 3, 2015

doutriaux1 Sep 3, 2015

sankhesh Sep 3, 2015

doutriaux1 Sep 3, 2015

sankhesh Sep 3, 2015

doutriaux1 commented Sep 3, 2015

doutriaux1 commented Sep 3, 2015

doutriaux1 commented Sep 3, 2015

sankhesh commented Sep 3, 2015

doutriaux1 commented Sep 3, 2015

sankhesh commented Sep 3, 2015

aashish24 commented Sep 5, 2015

sankhesh commented Sep 9, 2015

doutriaux1 commented Sep 9, 2015

durack1 commented Sep 9, 2015

sankhesh commented Sep 9, 2015

aashish24 commented Sep 9, 2015

541 patterns support #1516

541 patterns support #1516

Conversation

sankhesh commented Sep 3, 2015

aashish24 commented Sep 3, 2015

doutriaux1 Sep 3, 2015

Choose a reason for hiding this comment

sankhesh Sep 3, 2015

Choose a reason for hiding this comment

doutriaux1 Sep 3, 2015

Choose a reason for hiding this comment

sankhesh Sep 3, 2015

Choose a reason for hiding this comment

doutriaux1 commented Sep 3, 2015

doutriaux1 commented Sep 3, 2015

doutriaux1 commented Sep 3, 2015

sankhesh commented Sep 3, 2015

doutriaux1 commented Sep 3, 2015

sankhesh commented Sep 3, 2015

aashish24 commented Sep 5, 2015

sankhesh commented Sep 9, 2015

doutriaux1 commented Sep 9, 2015

durack1 commented Sep 9, 2015

sankhesh commented Sep 9, 2015

aashish24 commented Sep 9, 2015