Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kitware master #15

Merged
merged 771 commits into from
Jun 22, 2016
Merged

Kitware master #15

merged 771 commits into from
Jun 22, 2016

Conversation

doutriaux1
Copy link

@danlipsa is this correct?

dgobbi and others added 30 commits April 26, 2016 08:13
The strtod() and strtol() methods require a null-terminated string,
so call ConvertDataArrayToString() to guarantee null-termination.
The current technique can cause many small memory allocations and deallocations.
This fixes it by serializing all the point data in one big array.
06bdae4 ifdef out unsupported GL method for ES 2/3.

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Ken Martin <[email protected]>
Merge-request: !1461
d04df17 Centralize array-to-string conversion in vtkMINCImageAttributes.
1bb1123 Make PrintImageHeader use "double" for image-min, image-max.
329ddf6 Fix the way that MINC IO handles null-termination.
9e0eb98 Compensate for recent changes to vtkDataArray
87f403d Minor improvements to type matching, style, etc.
325ef8b Increase size of filename related buffer
b6a0ea0 Replace unsafe C string functions with safer varieties

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1453
it was using a bad check on apple systems
e45012f Improve Point Serialization in vtkPResampleToImage

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Berk Geveci <[email protected]>
Merge-request: !1412
cc8c3ac Removed OS X specific avoidance of realloc()

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1448
Add a NULL pointer check to handle the case when textDims are not provided in
vtkFreeTypeTools::RenderStringInternal().

This fixes a regression introduced in commit 5dcad97.
We ran into an issue with some netCDF files in the CF convention where
ParaView was not recognizing the time dimension. The problem was not so
much that the reader did not identify the dimension as time, but that
the time values for the last several steps was 0 because there was
garbage written in those time steps. The reader blindly appended those
time values and then gave an invalid time range. ParaView saw the
invalid time range and decided the data had no time.

To solve this issue, the netCDF reader now identifies time values that
are not in sequence and removes those out of sequence time slices.
f4ca373 fix renderbuffer isSupported method

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Berk Geveci <[email protected]>
Merge-request: !1462
325fb50 Fix build error with old clangs without UBSan

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1447
30dcadf Adding default to switch to remove warnings and explicit falltrough

Acked-by: Kitware Robot <[email protected]>
Acked-by: Julien Finet <[email protected]>
Reviewed-by: Ken Martin <[email protected]>
Merge-request: !1463
The vtkCellPicker would enter into an infinite loop if volume pick
reached the far clipping plane before exiting through the back of
the volume, as can happen when picking transparent regions of the
volume.  This bug wasn't discovered until recently because the
clipping bounds are usually larger than the bounds of any volume
in the scene.
In the Python wrappers, the vtkDataArray::SetVoidArray() method can take
two kinds of arguments:

1) a string formatted as a swig pointer "_addr_type" where "addr" is
the hexadecimal address and "type" is the type, e.g. "p_void".

2) a Python buffer object (any Python object with buffer protocol)

A Python string (in Python 2) is also a buffer object, therefore there
is some ambiguity.  The use of swig pointers with VTK is exceedingly
rare, so this fix requires that the string exactly matches the format
"_addr_p_void" to be interpreted as a swig pointer.

Note that in Python 3, the ambiguity disappears because a string in Py3K
does not have the buffer protocol.
This test fails with the OpenGL 2 backend enabled, but passes with the
OpenGL backend.
No picking support was provided in vtkOpenGLPolyDataMapper2D.  This
change adds such support. The test added in the previous commit will
now pass when either the OpenGL 1 or OpenGL 2 backend is enabled.
This allows the background values outside the bounds of the
volume to be white and transparent in the color image and white
in the depth image. This combination makes sure that the depth
image has an opaque white background outside the bounds of the
volume; while the color image has a transparent white background.
bd63a80 Handle case when textDims are NULL

Acked-by: Kitware Robot <[email protected]>
Acked-by: Mathieu Westphal <[email protected]>
Reviewed-by: Cory Quammen <[email protected]>
Merge-request: !1464
a189f37 RayCast mapper renders voxel Id during element selection.
e26054e Fixed volume picking test. Disabled depth mask in raycast mapper.
0f9e8d6 vtkHardwareSelector renders VolumetricGeometry.
a024c26 Added VolumePicking test.

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Ken Martin <[email protected]>
Merge-request: !1360
Added overrides for the methods that take a vtkAbstractArray and dispatch
it, so that the common case of using these methods with NewInstance() can
avoid the dispatch overhead.

Also moved to vtkDataArrayRoundIfNecessary helpers from vtkDataArray.cxx
to vtkMath::RoundDoubleToIntegralIfNecessary so they can be reused from
other array implementations.

Also replaced some vtkDataArray::SafeDownCasts with FastDownCasts and
added more detail to some error messages.
tjcorona and others added 25 commits June 15, 2016 15:16
5c8c06a Support cutoff mass/density arrays; 2D kernels

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1557
This flag is required for newer git. Declare that we Know What We're
Doing™ (but only if necessary).
f2a7383 ENH: Restore TestXMLCInterface

Acked-by: Kitware Robot <[email protected]>
Tested-by: Andrew Maclean <[email protected]>
Merge-request: !1541
This fixes a few thing that were missed in the previous commits
7d7c27d and
00e9d12

* Updates the way old VTK behaviour is maintained.
* Removes checks done in SetCenter and SetRadius in vtkImplicitCylinderRepresenation. The checks are now done in BuildRepresentation.
* Fix a bug in TestHanldeWidget that was exposed because of this change.
58ffed6 Update implicit plane/cylinder representations fix

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1569
In order to visualize simply progress bar in vtkRenderWindow
this commits add a vtkProgressBarRepresentation and associated
widget to display a progress bar with a progress rate and progress color,
as well as a Background and associated background color
e1d6777 ThirdParty: support 2.9.0's new merge restrictions

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Brad King <[email protected]>
Merge-request: !1573
7a9661e Add vtkInformationKeyLookup to find information keys by name.

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Brad King <[email protected]>
Merge-request: !1566
cfff910 Adding a vtkProgressBarRepresentation and Widget

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Cory Quammen <[email protected]>
Reviewed-by: Joachim Pouderoux <[email protected]>
Merge-request: !1505
Found by cppcheck.

This branch has been dead for years.
3d6a42c Add annotations to lookup table, needed for display, and update test
3bbfea3 Add code to read images with index data & color palette
fc28e36 Add test for vtkGDALRasterReader with image using color palette

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1575
vtkMapper also has a BuildTime ivar that is still needed for the OpenGL
backend.
The generated Python wrappers use the C offsetof() macro, but don't #include the
header that defines the macro (<cstddef>). For example, see
https://gitlab.kitware.com/vtk/vtk/blob/636aa17/Wrapping/Tools/vtkWrapPythonClass.c#L553.

This commit adds the proper header to the generated Python wrappers. Without
this, wrapping could fail unless <cstddef> is indirectly included through the
header of the class being wrapped. An example error message is:

    Libs/MRML/Core/vtkMRMLSubjectHierarchyConstantsPython.cxx:853:40: error: ‘offsetof’ was not declared in this scope
       offsetof(PyVTKObject, vtk_weakreflist), // tp_weaklistoffset
… window.

A loop where the render window is kept around and everything in the pipeline is removed
and added at the next iteration leaks memory, in OpenGL, linux. For the OpenGL2 backend same
loop does not leak.
Two problems were fixed. First ReleaseGraphicsResources was not called when
a renderer was removed from a render window. Second, for a offscreen render window
Mapped was set to 0, which meant that no resources were released.
22ab829 Purged dead branch

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Berk Geveci <[email protected]>
Merge-request: !1578
1fcd833 Rename LabeledContourMapper::BuildTime to avoid shadowing superclass.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1580
a0eb686 Add #include for offsetof() macro in generated Python wrappers

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1582
7b08d2d vtkPeriodicDataArray: fix vector range computation.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1570
1cdf99c Proposed fix for handling Exodus files that lack time
62bf406 Fixes bug introduced in 235bd27.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1534
d560ec8 BUG #16744: Resources are not removed for a renderer removed from the window.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1574
@danlipsa
Copy link

@doutriaux1 Yes, it seems it is. The last merge is the relevant one.

@doutriaux1
Copy link
Author

@danlipsa let's merge then ok?

@danlipsa
Copy link

@doutriaux1 If the tests pass, yes we can merge. Together with
CDAT/cdat#2030

@doutriaux1 doutriaux1 merged commit e303916 into uvcdat-master Jun 22, 2016
@doutriaux1 doutriaux1 deleted the kitware_master branch June 22, 2016 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.