1. 09 Apr, 2013 8 commits
    • David Thompson's avatar
      More adjustable scalar bar widget. · 3893b0be
      David Thompson authored
      Now the padding around text and the border can be adjusted.
      Also the relative amount of space taken up by the title and
      tick labels can be changed as can the thickness of the scalar bar.
      Change-Id: Ic66514a80feb0d2c81fd9daa67f743b9a619b529
    • David Thompson's avatar
      Pad scalar-bar title to prevent ugly layout. · 07be3e42
      David Thompson authored
      Change-Id: I3f69aa027f2228470a31a47872a8ffd53637ced8
    • David Thompson's avatar
      Allow empty string rendering to succeed. · 8a7aaf67
      David Thompson authored
      An empty string should not be considered an error condition.
      Change-Id: Ia19c3b6a459897b54901920eac1fa2f3826e6fba
    • David Thompson's avatar
      Use scalar annotations on interval-mode scalar bar. · 55cb7e11
      David Thompson authored
      This commit renders user-provided notes associated with specific
      scalar values on the interval-mode scalar bar. Previously, only
      the categorical mode rendered these annotations.
      Also, provide the scalar bar with an optional swatch
      to illustrate the color assigned to NaN values.
      Add an option to color leader lines from the scalar bar to
      the annotation labels by the corresponding scalar value.
      This commit also breaks the process of rebuilding the scalar bar
      into several virtual methods so that subclasses (particularly
      ParaView's `vtkPVScalarBarActor`) can reuse more of the base class
      functionality. The process is now separated into 2 phases: layout,
      where bounding boxes for scalar bar components are placed; and
      configuration, where actors are positioned and geometry is created.
      This includes some changes to text actor to support constrained
      placement and text size queries.
      Add a test for the new scalar bar options.
      There are now many more options controlling how the scalar bar behaves.
      In particular many settings interact with the way geometry is rendered:
      the lookup table may be indexed or not (thus tick marks may not be
      rendered); the orientation may be horizontal or vertical; annotations
      may be rendered or not; the NaN annotation may be omitted; leader lines
      to annotations may be colored by the scalar they annotate or by the label
      color; and the tick marks may precede or succeed the scalar bar.
      Also, we must test how empty labels are handled and how even vs odd
      numbers of labels affect placement (since the algorithm for placement
      behaves differently in these cases).
      We cannot perform a full factorial test, but do test independent
      Finally, this commit improves the performance of prominent value
      detection for primitive-type arrays (e.g., int, double) by avoiding
      the use of vtkVariant instances to hold the working set of distinct
      values during sampling.
      Change-Id: I852f9b497d5e6ab619d9d7b763f641c44e4869cf
    • Marcus D. Hanwell's avatar
      Merge topic 'fixed-warning-and-failure' into master · 9e23a9d9
      Marcus D. Hanwell authored
      5c10e777 Fixed test failures and compiler warnings.
    • Berk Geveci's avatar
      Fixed test failures and compiler warnings. · 5c10e777
      Berk Geveci authored
      Cleaning up minor issue resulting from Plot3DMetaReader commit.
      Change-Id: I3fb35dcfb82d1c30e4508e79876f202524cce028
    • Sebastien Jourdain's avatar
      Merge topic 'java-regression-test' into master · 2fde61d2
      Sebastien Jourdain authored
      44d2c23e Update JavaRegression test to run inside the EDT
    • Sebastien Jourdain's avatar
      Update JavaRegression test to run inside the EDT · 44d2c23e
      Sebastien Jourdain authored
      Hopefully this should solved the issue when the window get created
      on Mac and the system doesn't want to provide it.
      Change-Id: I19d5e48a492009ef4c901ef263588748bbfbb3c2
  2. 08 Apr, 2013 5 commits
  3. 07 Apr, 2013 2 commits
    • Berk Geveci's avatar
      Added a new reader to better handle PLOT3D files. · 452d8812
      Berk Geveci authored
      - Added a new reader (vtkPlot3DMetaReader) designed to make it easier
      to deal with Plot3D files. This is a meta-file in which the user
      can specify various settings (such as endianness, multi-grid etc.)
      rather than having to do it through the reader API. The reader also
      supports time series of xyz and q files.
      - Added JSON CPP support which is used by the meta-reader.
      Change-Id: I991e6487869966c3e1769835a72fd2f8b7f81770
    • Berk Geveci's avatar
      Major reworking of vtkMultiBlockPLOT3DReader. · 50e677ac
      Berk Geveci authored
      Added lots of new functionality including:
      - Support for OVERFLOW files,
      - Support for double precision,
      - Auto-detection of the format of binary files.
      Also cleaned up the code significantly.
      Change-Id: I13a18c1afce8e3587529a385599084943f3f4143
  4. 05 Apr, 2013 10 commits
    • David Gobbi's avatar
      Merge topic 'Wconditional-uninitialized' into master · 06ad3dea
      David Gobbi authored
      19931660 Suppress -Wconditional-uninitialized warning
      9c896273 Suppress -Wconditional-uninitialized warning
    • Sean McBride's avatar
      Suppress -Wconditional-uninitialized warning · 19931660
      Sean McBride authored
      clang warned that 'count' was maybe used
      uninitialised, because, I think, it didn't realize
      that you can only get into the 'while' if you
      previously got into the 'if'.  So just moved
      the 'while' into the 'if'.
      Change-Id: I1360e16c3af3186c8b0a65c4db1011c2d5f057a9
    • Sean McBride's avatar
      Suppress -Wconditional-uninitialized warning · 9c896273
      Sean McBride authored
      Init pointer variable to NULL to suppress
      Wconditional-uninitialized warning.
      Change-Id: I7f09bd24cfc00778084617dfaf2e3a262c561e66
    • Brad King's avatar
      Merge topic 'vtk-wrapping-depends' into master · 226351b3
      Brad King authored
      05a4febb COMP: Fix static library dependencies on VS 7
    • Brad King's avatar
      COMP: Fix static library dependencies on VS 7 · 05a4febb
      Brad King authored
      Visual Studio 7 and 7.1 do not support direct dependencies between static
      library targets cleanly.  CMake works around the problem by adding a
      custom "_UTILITY" target in between, but only does it for explicit
      add_dependencies and not for target_link_libraries because the extra
      targets are ugly and the dependencies are not needed only for compiling
      Now that VTK uses custom commands to run vtkWrapHierarchy when building
      module libraries we need the library target ordering dependencies to be
      enforced.  In the case of STATIC libraries on VS 7, use an explicit
      add_dependencies call to tell CMake to use the work around to enforce the
      target build order.  In other cases the existing target_link_libraries is
      Change-Id: I62c934669cedfdb23f7cf8f6cd1e7ee1d1f1d427
    • Brad King's avatar
      Merge topic 'vtk-wrapping-depends' into master · b95d0f33
      Brad King authored
      1f6a2dcb COMP: Do not attach Tcl wrapping to vtk*.h class headers
    • Sean McBride's avatar
      Merge topic 'Wshift-sign-overflow' into master · 78fe1d70
      Sean McBride authored
      6beda6f0 Fixed -Wshift-sign-overflow warning
    • Brad King's avatar
      COMP: Do not attach Tcl wrapping to vtk*.h class headers · 1f6a2dcb
      Brad King authored
      Do not attach rules to generate vtk*Tcl.cxx wrapper files to the
      corresponding vtk*.h class headers with MAIN_DEPENDENCY.  This causes
      the Tcl wrapping rules to run while building the main <mod> library in
      addition to the <mod>TCL library where they belong.  Instead just add
      the vtk*.h class header as a DEPENDS of each rule as is done for Python
      and Java wrapping already.
      Change-Id: I21d1c0956a97f9d187247227a4431526b4eddb37
    • Sebastien Jourdain's avatar
      Merge remote-tracking branch 'pvvtk/pv-master' into HEAD · 7d053afd
      Sebastien Jourdain authored
      Change-Id: I2faac2d07005719ee8b52d5c073b208947569c23
    • Sebastien Jourdain's avatar
      Merge topic 'forward-to-vtk-master' into pv-master · 933647b3
      Sebastien Jourdain authored and Kitware Robot's avatar Kitware Robot committed
      1e54ac16 Merge topic 'python-custom-hints' into master
      026ccf32 Merge topic 'python-hierarchy-dep' into master
      d3155f9b Simplify vtkWrapHierarchy invocation
      e62bff86 Merge topic 'python-install-rules' into master
      ed0d4e81 These should be appending the WRAP_HINTS to the vars
      e5323fc7 Fixed copy/paste error - WRAP_HINTS install path
      fcf221c7 Merge topic 'composite-pipeline-as-default' into master
      95d4ca64 Added facility to export custom hints for modules
      7f7586e4 Removed vtk.qt - Qt 3 is not supported in VTK
      2ef97890 Changed the default executive to be vtkCompositeDataPipeline.
      11e36798 Merge topic 'fixed-unused-var-warning' into master
      95ef69b4 Fixed warning about unused variable.
      b60cc9c7 Merge topic 'pyramid_apex_search_tolerance' into master
      2704cf30 Fixing the interior check tolerance for the apex of vtkPyramid.
      c6195a3a Merge topic 'misc-warnings' into master
      44fac21d Merge topic 'missing-VTK_LEGACY' into master
  5. 04 Apr, 2013 6 commits
    • Marcus D. Hanwell's avatar
      Merge topic 'python-custom-hints' into master · 1e54ac16
      Marcus D. Hanwell authored
      ed0d4e81 These should be appending the WRAP_HINTS to the vars
      e5323fc7 Fixed copy/paste error - WRAP_HINTS install path
      95d4ca64 Added facility to export custom hints for modules
    • Brad King's avatar
      Merge topic 'python-hierarchy-dep' into master · 026ccf32
      Brad King authored
      d3155f9b Simplify vtkWrapHierarchy invocation
    • Brad King's avatar
      Simplify vtkWrapHierarchy invocation · d3155f9b
      Brad King authored
      Run vtkWrapHierarchy as a custom command in each module library target
      instead of as a POST_BUILD event.  Use a stamp file as the output so the
      actual hierarchy file may be modified only when its content changes.
      Depend on all the input header files, vtkWrapHierarchy binary, command
      args/data files, and other hierarchy files so that the command re-runs
      when one changes.
      Drop unnecessary shell escaping workarounds.  Drop extra target-level
      dependencies that are implied by linking since the switch to using
      ${vtk-module}_LINK_DEPENDS to construct the list of hierarchy files from
      When building with the CMake Ninja generator, work around an apparent
      limitation by exposing the real hierarchy file as an output of the
      custom command.
      Change-Id: I8bda94e5a40d89ff6758d3a0c44a723f18e94f58
    • Marcus D. Hanwell's avatar
      Merge topic 'python-install-rules' into master · e62bff86
      Marcus D. Hanwell authored
      7f7586e4 Removed vtk.qt - Qt 3 is not supported in VTK
    • Marcus D. Hanwell's avatar
      These should be appending the WRAP_HINTS to the vars · ed0d4e81
      Marcus D. Hanwell authored
      The previous version would have caused bugs when there was a custom
      hints file and some CMake code to export.
      Change-Id: Ie33b73be4505c0f483f4f2d9727cce744fee1005
    • Marcus D. Hanwell's avatar
      Fixed copy/paste error - WRAP_HINTS install path · e5323fc7
      Marcus D. Hanwell authored
      Thanks to Utkarsh for spotting the error, we need a path for the build
      tree and a path for the install tree for any custom hints file.
      Change-Id: I57b49a7a91da75286136652fdb65d89b54b15217
  6. 03 Apr, 2013 9 commits