Merge topic '0015060_fix_temporalshift_issue'

4a3f3687 BUG #15060. Fixed issue when using TemporalShiftScale.
Merge topic '15059_fix_time_comments'

dc7a344d BUG #15059: Bring back lost comments about ${TIME}.
Merge topic '15100_fix_color_map_editor_size'

68a6f38a Update test after widget size change.
c589883e BUG #15100: Increate ColorMapEditor dialog width.
Merge topic 'python_syntax_highlighting_bugs'

dc7f9b0b Add unicode character support in the syntax highlighter
14f64332 Python syntax highlighter ctor highlights text
Merge topic 'test_max'

96e4410d Add tests with NumPy only when NumPy is found.
519b6803 Added a test for BUG #15048.
Merge topic 'vtk_master_20141104'

b2b84c74 Update VTK
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ib43c0293fabe9f3cf0d6f0d7d5d3e3414aaeaa59
BUG #15053. Fixed issues when coloring with a no longer valid array.

When user was coloring using an array
and then he changed the pipeline such that the array is no longer
available, the "Color By" combo-box ended up showing "Solid Color",
though on underlying pipeline, the user's previous coloring selection is
indeed being used. This manifested as the color legend staying visible
even when the color-by widget was showing "Solid Color".

Since we don't want the widget to change the underlying pipeline's state
if an array disappears due to changes in the pipeline, we must update
the widget to continue to indicate that we're coloring with an array
and possible mark it saying that it's not present currently.
Furthermore, if the user switches the color array after that using the
UI, he should not be able to go back to the now no-longer-present array.

This fix addresses this. A no-longer-present array is now indicated in
the 'Color By' widget with a suffix "(?)". Also when the user selects
another array to color with, that entry will automatically disappear
from the 'Color By' combo-box.

Change-Id: Ifc8afd70476988843193cbe32561763f64fe08cb
HACK: Fix duplicate entries in Color By.

We sometimes end up with duplicate entries. Overcome it for now.
We need a proper fix in vtkSMArrayListDomain/vtkSMRepresentedArrayListDomain/
vtkPVDataInformation.  for now, just do this. To reproduce the problem,
skip the uniquifier check, and the load can.ex2, uncheck all blocks,
and check all sets. The color-by will have duplicated ObjectId,
SourceElementId, and SourceElementSide entries.

Change-Id: I026218602671c6777483c29d1ada6918461c4bd5
Merge topic '15053_fix_coloring_with_missing_arrays' into next

dbafed2a HACK: Fix duplicate entries in Color By.
49f33566 BUG #15053. Fixed issues when coloring with a no longer valid array.
BUG #0011858. Fix unnecessary showing of scalar bar.

Don't show scalar bar when user changes color array selection if the
representation is currently not being shown in the view.

Change-Id: Ie503f6bdd98947d76c01be7d87ea450d3dadc05b
Merge topic '15053_fix_coloring_with_missing_arrays' into next

b0094786 BUG #0011858. Fix unnecessary showing of scalar bar.
BUG #14921: Fixed scalar bar visibility from context menu.

Fixed updating of scalar bar visibility when coloring is selected using
the render-view context menu (similar to the COlor By toolbar).

Change-Id: I3e219b2ec63f4c473f6ec0f39463ca8f7d095aa8
Merge topic '15053_fix_coloring_with_missing_arrays' into next

e0bf4863 BUG #14921: Fixed scalar bar visibility from context menu.
Update VTK.

Change-Id: I9785af707d2e514959f185f0b1f120786b4fc74d
Merge topic 'vtk_master_20141105' into next

3155f740 Update VTK.
BUG 14845: Added ability to reset color map.

Added ability to reset color map to XML defaults. The reset is not
naive, i.e. it will preserve the currently set color map data range.

Change-Id: I21f30926e4bb488d8b36fff8b8356c0b003924ce
Fix condition to catch exception case.

Change-Id: I17bbba06d2735ce8ad277ba2d27bf55443246dc1
Merge topic '14845_reset_color_map' into next

4e8d7f84 Fix condition to catch exception case.
79655119 BUG 14845: Added ability to reset color map.
BUG #15085: Fix install rules for vtkPVPythonCatalystPython.

The Python files for the separately built vtkPVPythonCatalystPython were
not getting installed. Fixed that.

Change-Id: I898b78b2b4d7a448adefcae0e56cbd3d3d50d8f0