[vtk-developers] Axis-aligned hexahedral cell rendering module

[Bill Lorensen]

Francois,

It would be great to document the proper way to create and apply
patches to VTK now that it has moved to git.

To a git newbie it all looks like blah, blah, patch, blah.

Bill

On Fri, Jul 2, 2010 at 1:43 PM, Francois Bertel
<francois.bertel at kitware.com> wrote:
> Hi Stephane,
>
> I guess you created your patch with:
> $ git show > vtk-hexa.diff
>
> because when I try to apply it:
> $ cd VTK
> $ git am -3 -i -s -u ~/vtk-hexa.diff
>
> I have the following error:
> Patch format detection failed.
>
> Then I tried to apply the patch directly:
> $ git apply --whitespace=fix ~/vtk-hexa.diff
>
> I have this output (ignore the trailing whitespace messages, the error
> is about VolumeRendering/Testing/Cxx/CMakeLists.txt):
>
> vtk-hexa.diff:54: trailing whitespace.
> // setup of source -> mapper -> actor -> renderer -> renderwindow is
> vtk-hexa.diff:105: trailing whitespace.
>
> vtk-hexa.diff:119: trailing whitespace.
>
> vtk-hexa.diff:150: trailing whitespace.
>
> vtk-hexa.diff:158: trailing whitespace.
>
> error: patch failed: VolumeRendering/Testing/Cxx/CMakeLists.txt:30
> error: VolumeRendering/Testing/Cxx/CMakeLists.txt: patch does not apply
>
>
> Can you send me the patch again, please?
>
> Make sure you call "$git pull --rebase" first.
>
> Can you instead send me a patch created with "git format-patch", please?
>
> For example,
> $ git format-patch 'HEAD^..HEAD'
> will return the last commit.
>
> Regards.
>
> On Fri, Jul 2, 2010 at 10:57 AM, Francois Bertel
> <francois.bertel at kitware.com> wrote:
>> Hi Stephane,
>>
>> I'll take a look at it.
>>
>> On Thu, Jul 1, 2010 at 10:32 PM, Stephane Marchesin
>> <stephane.marchesin at gmail.com> wrote:
>>> Ping.
>>>
>>> On Tue, Jun 15, 2010 at 15:49, Stephane Marchesin
>>> <stephane.marchesin at gmail.com> wrote:
>>>>
>>>>
>>>> On Thu, Jun 3, 2010 at 17:21, Stephane Marchesin
>>>> <stephane.marchesin at gmail.com> wrote:
>>>>>
>>>>> Hi everyone,
>>>>> Attached is a patch implementing a high accuracy axis-aligned hexahedral
>>>>> cell renderer in VTK. This is a (simplified) implementation of my Vis 2009
>>>>> paper, see the paper at http://people.freedesktop.org/~marcheu/vis09-amr.pdf
>>>>> for more details.
>>>>> This rendering module is useful for structured hexahedral meshes, and in
>>>>> particular AMR mesh visualization. If you want to test it there is a small
>>>>> test program included, and a hexahedral test mesh is there:
>>>>> http://people.freedesktop.org/~marcheu/hexa.vtk
>>>>> This module was written by me at CEA/DIF - Commissariat a l'Energie
>>>>> Atomique, Centre DAM Ile-De-France.
>>>>> Stéphane
>>>>
>>>> Hi,
>>>> Any feedback about this? Although I did not state it explicitly in the
>>>> original email, I would like to get this merged into VTK. Any
>>>> remarks/comments towards that goal?
>>>> Thanks,
>>>> Stephane
>>>
>>>
>>> _______________________________________________
>>> Powered by www.kitware.com
>>>
>>> Visit other Kitware open-source projects at
>>> http://www.kitware.com/opensource/opensource.html
>>>
>>> Follow this link to subscribe/unsubscribe:
>>> http://www.vtk.org/mailman/listinfo/vtk-developers
>>>
>>>
>>>
>>
>>
>>
>> --
>> François Bertel, PhD  | Kitware Inc. Suite 204
>> 1 (518) 371 3971 x113 | 28 Corporate Drive
>>                      | Clifton Park NY 12065, USA
>>
>
>
>
> --
> François Bertel, PhD  | Kitware Inc. Suite 204
> 1 (518) 371 3971 x113 | 28 Corporate Drive
>                      | Clifton Park NY 12065, USA
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>
> Follow this link to subscribe/unsubscribe:
> http://www.vtk.org/mailman/listinfo/vtk-developers
>
>