Skip to content

Commit

Permalink
Merge topic 'BaselineImagesSizeFix'
Browse files Browse the repository at this point in the history
36a7587 COMP: Mac issues with odd-sized baseline images

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Ken Martin <[email protected]>
Merge-request: !2999
  • Loading branch information
lorensen authored and kwrobot committed Jul 10, 2017
2 parents a18bb51 + 36a7587 commit 3378fc6
Show file tree
Hide file tree
Showing 70 changed files with 69 additions and 85 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b6c364f94d2b924e8f084e7369d0485e
d9bd387063b2180df6c97da533a7d9ed
1 change: 1 addition & 0 deletions Common/Transforms/Testing/Python/TestThinPlateWarp3D.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@
viewer.SetZSlice(90)
viewer.SetColorWindow(2000)
viewer.SetColorLevel(1000)
viewer.SetSize(200,200)
viewer.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Common/Transforms/Testing/Tcl/TestThinPlateWarp3D.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@ vtkImageViewer viewer
viewer SetZSlice 90
viewer SetColorWindow 2000
viewer SetColorLevel 1000
viewer SetSize 200 200
viewer Render

2 changes: 1 addition & 1 deletion Filters/Core/Testing/Data/Baseline/fieldToUGrid.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3f3d7018d1d67903e2aa280aab128966
676a05cb962d287c1d652d69082045aa
2 changes: 1 addition & 1 deletion Filters/Core/Testing/Data/Baseline/fieldToUGrid_1.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
458ee7ae75092b578441f79e3a90a4ce
d20e151e256ef6b2ffb6b40140398899
2 changes: 1 addition & 1 deletion Filters/Core/Testing/Python/fieldToUGrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
ren1.ResetCameraClippingRange()
ren1.SetBackground(1, 1, 1)

renWin.SetSize(375, 200)
renWin.SetSize(380, 200)
renWin.SetMultiSamples(0)
iren.Initialize()

Expand Down
2 changes: 1 addition & 1 deletion Filters/Core/Testing/Tcl/fieldToUGrid.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ ren1 ResetCamera
[ren1 GetActiveCamera] Dolly 2
ren1 ResetCameraClippingRange
ren1 SetBackground 1 1 1
renWin SetSize 375 200
renWin SetSize 380 200
renWin SetMultiSamples 0

iren Initialize
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
48ecaefd90caf9267efdd8cf9e1bd87d
3c2d5b07e4bf5a153f3c309ba2750905
Original file line number Diff line number Diff line change
@@ -1 +1 @@
35546e964face99028bc34f9d85ccfb0
7900acb9c76a1ec622c24851182c5300

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
3d1063ecbb9e413eaeb9646b09fe6b40
928582c147be661811b4a5266f7ba5e4
2 changes: 1 addition & 1 deletion Filters/Extraction/Testing/Python/extractUGrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
ren1.GetActiveCamera().Roll(-90)
ren1.GetActiveCamera().Dolly(1.5)
ren1.ResetCameraClippingRange()
renWin.SetSize(500,375)
renWin.SetSize(500,380)
iren.Initialize()
# prevent the tk window from showing up then start the event loop
# --- end of script --
2 changes: 1 addition & 1 deletion Filters/Extraction/Testing/Python/extractVectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
ren1.AddActor(isoVzActor)
isoVzActor.AddPosition(0,-12,0)
ren1.SetBackground(.8,.8,.8)
renWin.SetSize(321,321)
renWin.SetSize(320,320)
ren1.GetActiveCamera().SetPosition(-63.3093,-1.55444,64.3922)
ren1.GetActiveCamera().SetFocalPoint(8.255,0.0499763,29.7631)
ren1.GetActiveCamera().SetViewAngle(30)
Expand Down
2 changes: 1 addition & 1 deletion Filters/Extraction/Testing/Tcl/extractUGrid.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ren1 ResetCamera
[ren1 GetActiveCamera] Roll -90
[ren1 GetActiveCamera] Dolly 1.5
ren1 ResetCameraClippingRange
renWin SetSize 500 375
renWin SetSize 500 380
iren Initialize

# prevent the tk window from showing up then start the event loop
Expand Down
2 changes: 1 addition & 1 deletion Filters/Extraction/Testing/Tcl/extractVectors.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ ren1 AddActor isoVyActor
ren1 AddActor isoVzActor
isoVzActor AddPosition 0 -12 0
ren1 SetBackground .8 .8 .8
renWin SetSize 321 321
renWin SetSize 320 320

[ren1 GetActiveCamera] SetPosition -63.3093 -1.55444 64.3922
[ren1 GetActiveCamera] SetFocalPoint 8.255 0.0499763 29.7631
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/Testing/Data/Baseline/splitVectors.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24bc70955972f9cd4ef8571c463ca80d
bc80d36b892cdf119a5486d021a03742
2 changes: 1 addition & 1 deletion Filters/General/Testing/Python/splitVectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
ren1.AddActor(outlineActor)
outlineActor.AddPosition(0,24,0)
ren1.SetBackground(.8,.8,.8)
renWin.SetSize(321,321)
renWin.SetSize(320,320)

ren1.GetActiveCamera().SetPosition(-20.3093,20.55444,64.3922)
ren1.GetActiveCamera().SetFocalPoint(8.255,0.0499763,29.7631)
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/Testing/Tcl/splitVectors.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ slActor AddPosition 0 24 0
ren1 AddActor outlineActor
outlineActor AddPosition 0 24 0
ren1 SetBackground .8 .8 .8
renWin SetSize 321 321
renWin SetSize 320 320

[ren1 GetActiveCamera] SetPosition -20.3093 20.55444 64.3922
[ren1 GetActiveCamera] SetFocalPoint 8.255 0.0499763 29.7631
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d1c0b2c037d661bca0985fb18ac87e3c
55261bd342d5944ad31d938deed77b9e
1 change: 1 addition & 0 deletions Filters/Hybrid/Testing/Python/TestGridWarp3D.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@
viewer.SetZSlice(70)
viewer.SetColorWindow(2000)
viewer.SetColorLevel(1000)
viewer.SetSize(200,200)
viewer.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Filters/Hybrid/Testing/Tcl/TestGridWarp3D.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ vtkImageViewer viewer
viewer SetZSlice 70
viewer SetColorWindow 2000
viewer SetColorLevel 1000
viewer SetSize 200 200
viewer Render


Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12e16507c3c300260c835909b5959fe6
5dcd3ec3e0722c459567ed955c2b933a
2 changes: 1 addition & 1 deletion Filters/Sources/Testing/Python/coneResolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
ren1.GetActiveCamera().Elevation(30)
ren1.GetActiveCamera().Dolly(1.3)
ren1.ResetCameraClippingRange()
renWin.SetSize(301,91)
renWin.SetSize(300,90)
cone0Actor.SetPosition(-1.5,0,0)
cone1Actor.SetPosition(-.5,0,0)
cone2Actor.SetPosition(.5,0,0)
Expand Down
2 changes: 1 addition & 1 deletion IO/Image/Testing/Cxx/TestNIFTIReaderWriter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static void TestDisplay(vtkRenderWindow *renwin, const char *infile)
cam2->SetFocalPoint(center2[0], center2[1], center2[2]);
cam2->SetPosition(center2[0] + 100.0, center2[1], center2[2]);

renwin->SetSize(size[0] + size[2], size[1]);
renwin->SetSize((size[0] + size[2]) / 2 * 2, size[1] / 2 * 2); // keep size even
renwin->AddRenderer(ren1.GetPointer());
renwin->AddRenderer(ren2.GetPointer());
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49e8210a47e8e2eb657db6c4b7973d86
5d829d29bc1250848ca7c4a4ba02e2ab
2 changes: 1 addition & 1 deletion IO/Image/Testing/Python/TestNIFTIReaderWriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def TestDisplay(file1):
iren.SetInteractorStyle(style)

renwin = vtk.vtkRenderWindow()
renwin.SetSize(size[0] + size[2], size[1])
renwin.SetSize((size[0] + size[2]) // 2 * 2, size[1] // 2 * 2) # keep size even
renwin.AddRenderer(ren1)
renwin.AddRenderer(ren2)

Expand Down
2 changes: 1 addition & 1 deletion IO/PLY/Testing/Data/Baseline/TestPLYReadWrite.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
06a796326c623548481e85aeae631aed
8bb450d3fc2cc3fd5a5e1d9670b445d5
2 changes: 1 addition & 1 deletion IO/PLY/Testing/Python/TestPLYReadWrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
ren1.AddActor(plyActor2)
ren1.AddActor(plyActor3)

renWin.SetSize(325, 125)
renWin.SetSize(330, 120)

iren.Initialize()
renWin.Render()
Expand Down
2 changes: 1 addition & 1 deletion IO/PLY/Testing/Tcl/TestPLYReadWrite.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ ren1 AddActor plyActor
ren1 AddActor plyActor2
ren1 AddActor plyActor3

renWin SetSize 325 125
renWin SetSize 330 120
iren Initialize
renWin Render
[ren1 GetActiveCamera] Zoom 3.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
71632cd65a655c6f84dfa9e15887f2a4
0e02c4bd05cf1eab9fbf54950345ba2f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
64df85c3d4a5b1a29296755358abfb19
3c241dcff75ff53152fde60421336f4b
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Data/Baseline/ResliceToColors.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8cc4a57820c5ae4bf9e94517517fc97c
d7d5aa60f4a523cd211fa0052c8ef86c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f7963ed9642f3b2cbfb3a74923543526
81e395eed5c25c1c7197d799053548a3
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Data/Baseline/TestHSIToRGB.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23d6dbe3975f9d6a52f974745b6e5e6a
6dbbae83ccb59913c460b84a88bee44b
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Data/Baseline/TestHSVToRGB.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f3896ded10fb26b740aa3f3374593f1
8417d08466ea814e4c3f18d81e589a14
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Data/Baseline/TestImageCanvas.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b5643bc053df53ebf734933fd43fc76a
dcb7ce69210892cec5301656a6f35536
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bddc97fa2aa5c833bb8395faa9b2033a
220fbf92763ed280accc9d5c9d9be8a1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6e3d9b7095b5f9a4c75585ee0581b58c
a02a6a7aca7a2b5bae2e21beeabe3cf7
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Data/Baseline/TestWrapPad.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4c65c1410e6142dcd03ff6f205c1860c
6ba1547cc7ba79cf77eaeea9085f1fed
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Data/Baseline/TestYIQToRGB.png.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5a0c92b18babea9ccb2cee386e983bb4
b17c6179f6fefff166a65e08a49ef4a5
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Python/ReslicePermutations.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@
imgWin.AddRenderer(imager4)
imgWin.AddRenderer(imager5)
imgWin.AddRenderer(imager6)
imgWin.SetSize(225,150)
imgWin.SetSize(224,150)
imgWin.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/ReslicePermuteResample.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
viewer.SetZSlice(100)
viewer.SetColorWindow(2000)
viewer.SetColorLevel(1000)
viewer.SetSize(200,140)
viewer.Render()
# --- end of script --
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Python/ResliceToColors.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,6 @@
imgWin.AddRenderer(imager4)
imgWin.AddRenderer(imager5)
imgWin.AddRenderer(imager6)
imgWin.SetSize(225,150)
imgWin.SetSize(230,150)
imgWin.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestGradientMagnitude2.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
viewer.SetInputConnection(slide.GetOutputPort())
viewer.SetColorWindow(-1000)
viewer.SetColorLevel(500)
viewer.SetSize(150,150)
viewer.Render()
#skipping source
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestHSIToRGB.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@
#viewer SetInputConnection [imageCanvas GetOutputPort]
viewer.SetColorWindow(256)
viewer.SetColorLevel(127.5)
viewer.SetSize(320,320)
viewer.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestHSVToRGB.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@
#viewer SetInputConnection [imageCanvas GetOutputPort]
viewer.SetColorWindow(256)
viewer.SetColorLevel(127.5)
viewer.SetSize(320,320)
viewer.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestImageCanvas.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
viewer.SetInputConnection(imageCanvas.GetOutputPort())
viewer.SetColorWindow(255)
viewer.SetColorLevel(128)
viewer.SetSize(300,300)
viewer.Render()
# --- end of script --
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Python/TestImageProjection.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,6 @@
imgWin.AddRenderer(imager4)
imgWin.AddRenderer(imager5)
imgWin.AddRenderer(imager6)
imgWin.SetSize(225,150)
imgWin.SetSize(230,150)
imgWin.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestQuantizeTo16Colors.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
viewer.SetColorWindow(256)
viewer.SetColorLevel(127)
viewer.GetActor2D().SetDisplayPosition(110,110)
viewer.SetSize(440,440)
viewer.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestWrapPad.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
viewer.SetColorWindow(2000)
viewer.SetColorLevel(1000)
viewer.GetActor2D().SetDisplayPosition(150,150)
viewer.SetSize(256,270)
viewer.Render()
# --- end of script --
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Python/TestYIQToRGB.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,6 @@
#viewer SetInputConnection [imageCanvas GetOutputPort]
viewer.SetColorWindow(256)
viewer.SetColorLevel(127.5)
viewer.SetSize(320,320)
viewer.Render()
# --- end of script --
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Tcl/ReslicePermutations.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ vtkRenderWindow imgWin
imgWin AddRenderer imager4
imgWin AddRenderer imager5
imgWin AddRenderer imager6
imgWin SetSize 225 150
imgWin SetSize 224 150

imgWin Render

Expand Down
10 changes: 1 addition & 9 deletions Imaging/Core/Testing/Tcl/ReslicePermuteResample.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,5 @@ viewer SetInputConnection [reslice GetOutputPort]
viewer SetZSlice 100
viewer SetColorWindow 2000
viewer SetColorLevel 1000
viewer SetSize 200 140
viewer Render









2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Tcl/ResliceToColors.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,6 @@ vtkRenderWindow imgWin
imgWin AddRenderer imager4
imgWin AddRenderer imager5
imgWin AddRenderer imager6
imgWin SetSize 225 150
imgWin SetSize 230 150

imgWin Render
2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Tcl/TestGradientMagnitude2.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ vtkImageViewer viewer
viewer SetInputConnection [slide GetOutputPort]
viewer SetColorWindow -1000
viewer SetColorLevel 500

viewer SetSize 150 150
viewer Render

source [file join [file dirname [info script]] WindowLevelInterface.tcl]
1 change: 1 addition & 0 deletions Imaging/Core/Testing/Tcl/TestHSIToRGB.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ viewer SetInputConnection [convertBack GetOutputPort]
#viewer SetInputConnection [imageCanvas GetOutputPort]
viewer SetColorWindow 256
viewer SetColorLevel 127.5
viewer SetSize 320 320

viewer Render

Expand Down
8 changes: 1 addition & 7 deletions Imaging/Core/Testing/Tcl/TestHSVToRGB.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,7 @@ cast ReleaseDataFlagOff

vtkImageViewer viewer
viewer SetInputConnection [convertBack GetOutputPort]
#viewer SetInputConnection [imageCanvas GetOutputPort]
viewer SetColorWindow 256
viewer SetColorLevel 127.5

viewer SetSize 320 320
viewer Render





9 changes: 1 addition & 8 deletions Imaging/Core/Testing/Tcl/TestImageCanvas.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ vtkImageViewer viewer
viewer SetInputConnection [imageCanvas GetOutputPort]
viewer SetColorWindow 255
viewer SetColorLevel 128
viewer SetSize 300 300

viewer Render








2 changes: 1 addition & 1 deletion Imaging/Core/Testing/Tcl/TestImageProjection.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,6 @@ vtkRenderWindow imgWin
imgWin AddRenderer imager4
imgWin AddRenderer imager5
imgWin AddRenderer imager6
imgWin SetSize 225 150
imgWin SetSize 230 150

imgWin Render
7 changes: 1 addition & 6 deletions Imaging/Core/Testing/Tcl/TestQuantizeTo16Colors.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,5 @@ viewer SetInputConnection [map GetOutputPort]
viewer SetColorWindow 256
viewer SetColorLevel 127
[viewer GetActor2D] SetDisplayPosition 110 110
viewer SetSize 440 440
viewer Render






Loading

0 comments on commit 3378fc6

Please sign in to comment.