1. 23 Jul, 2013 2 commits
    • Zack Galbreath's avatar
      use SetMaxDiscreteValues for categorical color map · 2c86574b
      Zack Galbreath authored
      Use the new function vtkAbstractArray::SetMaxDiscreteValues within
      vtkTreeHeatmapItem.  This allows us to properly color categorical
      datasets that contain more than 32 distinct values.
      Within this commit, we also change the color set that we're using for
      the categorical color map.  The accent set is pretty, but it only has
      8 different values.  Instead we'll use qualitative set3 because it
      has 12 values.
      Finally, we fix a bug in vtkTreeHeatmapItem so that our NaN color
      (grey) is used appropriately by our categorical lookup table.
      Change-Id: I53bc9f13240be8c0c10b5dbc77bdcca1ea0fa2a1
    • Zack Galbreath's avatar
      change MAX_DISCRETE_VALUES into an ivar · 02ffb7ac
      Zack Galbreath authored
      Change MAX_DISCRETE_VALUES from a hardcoded value of 32 to a user-
      settable ivar.  This allows users of vtkAbstractArray to generate
      a categorical color map for data sets containing more than 32
      discrete values.
      For backwards compatibility, we keep the MAX_DISCRETE_VALUES enum
      and use it to initialize MaxDiscreteValues.  This enum is marked
      as deprecated.
      Change-Id: I83bf7c598288dc28a4ad231778c66e1571e3a461
  2. 22 Jul, 2013 1 commit
  3. 19 Jul, 2013 4 commits
    • Brad King's avatar
      Merge branch 'upstream-kwsys' into update-kwsys · 3d6e5ff5
      Brad King authored
      Change-Id: Ie2b3b8194af9479547b6dc772a285641ea845c91
    • Kitware Robot's avatar
      KWSys 2013-07-10 (beef6819) · bc2e9dab
      Kitware Robot authored
      Extract upstream KWSys using the following shell commands.
      $ git archive --prefix=upstream-kwsys/ beef6819 | tar x
      $ git shortlog --no-merges --abbrev=8 --format='%h %s' 5b0d1bd9..beef6819
      Andreas Mohr (1):
            f4928d44 Fix spelling and typos in comments and method documentation
      Brad King (7):
            5c34ed2e SystemTools: Do not abort with no current directory
            709fb5c1 SystemTools: Fix FileIsDirectory for Windows drive letter roots
            9fd64779 SystemTools: Fix FileIsDirectory with long paths
            e3370418 SystemTools: Use COMPILE_DEFINITIONS to pass platform tests
            dccf7725 SystemTools: Touch with better than 1s resolution if possible
            d79a792e SystemTools: Fix CollapseFullPath to not erase root component
            beef6819 SystemTools: Implement IsSubDirectory without loop
      Cory Quammen (1):
            3d1d4e7c SystemTools: MakeDirectory() reports failure if path is file
      Paul Kunysch (1):
            2d263bc3 Process: Increase FD_SETSIZE on Cygwin
      Rolf Eike Beer (3):
            e8269442 Tests: fix a warning with acc
            87abd647 SystemInformation: fix truncation warnings
            039d9598 fix warnings about sizeof() return value truncation
      Sean McBride (2):
            13f5badd SystemInformation: Replace __GNUG__ with __GNUC__
            f6c4c247 RegularExpression: Remove 'register' storage specifier
      Change-Id: I25759bb9f579b7702314bce688cd989a409618e4
    • Sean McBride's avatar
      Merge topic 'vtkMathTextUtilities-include-guard' into master · a17a90c2
      Sean McBride authored
      fe579828 Fixed typo in include guard define
    • Sean McBride's avatar
      Fixed typo in include guard define · fe579828
      Sean McBride authored
      Found by a cool new warning in clang:
      VTK/Rendering/FreeType/vtkMathTextUtilities.h:21:9: warning: '__vtkMathTextUtilities_h' is used as a header guard here, followed by #define of a different macro [-Wheader-guard]
      VTK/Rendering/FreeType/vtkMathTextUtilities.h:22:9: note: '__vtkMathTypeUtilities_h' is defined here; did you mean '__vtkMathTextUtilities_h'?
      Change-Id: I0ed048fcdfa69f6c47308987c8901eb0e56459a1
  4. 18 Jul, 2013 3 commits
  5. 17 Jul, 2013 4 commits
  6. 16 Jul, 2013 2 commits
    • Kenneth Moreland's avatar
      Safer fake coordinates for structured from unstructured CF grids · 14c8487e
      Kenneth Moreland authored
      The vtkNetCDFCFReader allows you to specify the output type and makes
      the best attempt to represent the data in that type.  Even though
      sometimes the representation makes little sense (like storing an
      unstructured grid in an extent-based data set like structured grids),
      the reader should at least continue to be stable (see ParaView bug
      There was a corner case in one of these nonsensical conversions where a
      data array was read one past its end.  This change makes a different way
      to create nonsense and avoids the bad array access.
      Change-Id: Idc30bb9aa8474c1a67c36b22f05aa99428b1b37e
    • Utkarsh Ayachit's avatar
      Increasing timeout for test. · 4b20f9b1
      Utkarsh Ayachit authored
      With additional OpenGL checks, vtkRenderingOpenGLCxx-TestTextureSize  now takes
      longer than 90s on certain machines (dash3). Increasing the timeout to 300s
      which is typical for dashboards.
      Change-Id: Iac4f5ff3f9eb22d3af1caf7507a162c7fa6cce05
  7. 15 Jul, 2013 6 commits
    • Zack Galbreath's avatar
      update vtkTreeHeatmapItem baselines · 633d50ab
      Zack Galbreath authored
      Update the baseline images for the tests of vtkTreeHeatmapItem.
      This is necessary now that we are using separate color maps for
      categorical & continuous data.
      Change-Id: I5819db094fe988a579853f62f71b41aa4f66bf01
    • Zack Galbreath's avatar
      improve "heatmap only" performance · e60dab3a
      Zack Galbreath authored
      only draw cells and labels that are currently visible on the
      Change-Id: Ic7bfa415952fc9720d199fad790b1a1115746d10
    • Zack Galbreath's avatar
      separate color maps for categorical & continuous data · 7308311a
      Zack Galbreath authored
      This commit separates the default colors that we use to represent
      categorical & continuous data within our heatmap.  Continuous data
      is now drawn using a blackbody color map.  Categorical data is drawn
      using the diverging accent color set.  In order to take advantage of
      vtkColorSeries in this effort, a dependency on vtkCommonColor was
      added to this module.
      As a result of this effort, we now use one vtkLookupTable to
      assign colors to all continuous data, and another for the categorical
      data.  This is a simplification over our previous approach, where we
      used a separate vtkLookupTable for each column.
      Change-Id: If008b871c750b1020b8df04c89e34db36785f853
    • Zack Galbreath's avatar
      change leaf node display behavior · 1b0150a4
      Zack Galbreath authored
      Prior to this commit, leaf nodes were extended so that they all
      lined up vertically.  The motivation behind this behavior was
      to make it easy to see which leaf nodes correponded to each
      row in the heatmap.
      The problem with this approach is that it obscured information
      about how long these leaf nodes actually are.  Starting with this
      commit, the actual length of the leaf nodes is now drawn in black
      by default (the same as the rest of the tree).  The leaf nodes are
      still extended as before, but this extra length is now drawn in grey.
      This extension of the leaf nodes is also now a toggleable behavior.
      The options are always extend leaf nodes, never extend leaf nodes,
      or only extend leaf nodes if a heatmap is also loaded.  This latter
      option is the default.
      This commit also introduces two new public member functions: GetSize
      and GetCenter.  These functions make it easier to center this item
      within a scene in an end-user application.
      Change-Id: I11576b8822de2c915a6edb36c80c4721661aa317
    • Zack Galbreath's avatar
      hide tooltip when hovering over a blank row · 5f1dcf58
      Zack Galbreath authored
      Change-Id: I2cef08a3ed807923e506f16dbb1b09609444cc57
    • Zack Galbreath's avatar
      always label leaf nodes · 4fa063d2
      Zack Galbreath authored
      Label leaf nodes even if they don't have a row in the heatmap.
      Previously, the leaf labels were only drawn after the row of the
      heatmap was drawn.
      Change-Id: I7d4b932fde9ce5628ed38693fd72dc8ca08ee020
  8. 12 Jul, 2013 2 commits
    • Burlen Loring's avatar
      Merge topic 'opengl-error-hunt' into master · 46a51e1c
      Burlen Loring authored
      6455c581 OpenGL error hunt -- dashboard cleanup
    • Burlen Loring's avatar
      OpenGL error hunt -- dashboard cleanup · 6455c581
      Burlen Loring authored
      Use static version of vtkOpenGLCheckErrorMacro in helper class
      that's not a vtkObject in vtkPistonMapper. Don't check for OpenGL
      errors in vtkGL2PSExporter::Write it doesn't use OpenGL directly.
      Fix warning about narrowing cast. Use vtkOpenGLCheckErrorMacro
      before return in vtkOpenGLImageSliceMapper::TextureSizeOK.
      Change-Id: Ia05575d571c230b68b2035e8a866f0ec7519d887
  9. 11 Jul, 2013 7 commits
  10. 10 Jul, 2013 8 commits
  11. 09 Jul, 2013 1 commit
    • Dave DeMarle's avatar
      Add ability to query units from netcdf. · d39346dd
      Dave DeMarle authored
      The time units and calendar give you a start time, time step size and
      calendar which you can use to interpret what the timestamps mean.
      Units on the other variables are likewise a good thing to have access
      Change-Id: Iebb151973e53fee120f5d3874aaa3d95401b395b