Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
b199fa51
Commit
b199fa51
authored
Mar 25, 2016
by
saubatn
Browse files
Merge branch 'bug-19' into develop
parents
739e99b5
d9b2c6ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
sdk/libraries/core/component/Slice.cpp
View file @
b199fa51
...
...
@@ -180,22 +180,14 @@ void Slice::initActors() {
}
else
imgToMapFilter
->
SetLookupTable
(
lut
);
/// NICO + MAHNU
/* 3D Actor case: directly pluged to the output of imgToMapFilter */
// image3DActor->SetInputData(imgToMapFilter->GetOutput());
image3DActor
->
GetMapper
()
->
SetInputConnection
(
imgToMapFilter
->
GetOutputPort
());
image3DActor
->
InterpolateOn
();
/// NICO + MAHNU
// 2D actors
// image2DActor->SetInputData(imgToMapFilter->GetOutput());
image2DActor
->
GetMapper
()
->
SetInputConnection
(
imgToMapFilter
->
GetOutputPort
());
image2DActor
->
InterpolateOn
();
/// NICO
// image2DActor->SetOpacity(0.5);
// Pick plane
updatePickPlane
();
...
...
@@ -223,9 +215,6 @@ void Slice::initActors() {
pickPlaneActor
->
GetProperty
()
->
SetOpacity
(
1.0
);
pickPlaneActor
->
GetProperty
()
->
SetLineWidth
(
2.0
);
/// NICO
// imgToMapFilter->Update();
// Orientation 2D Axes
init2DAxesActor
();
update2DAxesActorPosition
();
...
...
@@ -515,9 +504,6 @@ void Slice::updatePixelActorPosition(double x, double y, double z) {
vtkSmartPointer
<
vtkDataSetMapper
>
aPixelMapper
=
vtkSmartPointer
<
vtkDataSetMapper
>::
New
();
aPixelMapper
->
SetInputData
(
aPixelGrid
);
/// NICO
// aPixelMapper->Update();
pixelActor
->
SetMapper
(
aPixelMapper
);
pixelActor
->
GetProperty
()
->
SetAmbient
(
1.0
);
pixelActor
->
GetProperty
()
->
SetDiffuse
(
1.0
);
...
...
sdk/libraries/core/component/image/ImageComponent.cpp
View file @
b199fa51
...
...
@@ -296,10 +296,7 @@ void ImageComponent::setImageData(vtkSmartPointer<vtkImageData> anImageData,
imageResliceFilter
->
SetOutputDimensionality
(
3
);
imageResliceFilter
->
SetResliceAxes
(
initialImageDataTransform
->
GetMatrix
());
imageResliceFilter
->
Update
();
originalImageData
=
imageResliceFilter
->
GetOutput
();
// /// NICO
// originalImageData =vtkSmartPointer<vtkImageData>::New();
// originalImageData->DeepCopy(anImageData);
originalImageData
=
imageResliceFilter
->
GetOutput
();
// 7. Store initialFrameTransform as the current frame
// note: we need to get another matrix instance for the transformation (else it is deleted)
...
...
sdk/libraries/core/viewer/RendererWidget.cpp
View file @
b199fa51
...
...
@@ -333,8 +333,6 @@ void vtkInteractorStylePick::Pick() {
areaPicker
->
AreaPick
(
min
[
0
],
min
[
1
],
max
[
0
],
max
[
1
],
this
->
CurrentRenderer
);
}
else
{
/// NICO c'est ici que ça ne libère plus la mémoire
/// Une fois qu'on a fait le pick
picker
->
Pick
(
rbcenter
[
0
],
rbcenter
[
1
],
0.0
,
this
->
CurrentRenderer
);
}
...
...
@@ -389,14 +387,11 @@ RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget(p
pointSize
=
4.0
;
//-- render window
/// NICO + MAHNU
vtkSmartPointer
<
vtkRenderWindow
>
renderWindow
=
GetRenderWindow
();
// vtkSmartPointer<vtkRenderWindow> renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
//-- renderer
renderer
=
vtkSmartPointer
<
vtkRenderer
>::
New
();
renderWindow
->
AddRenderer
(
renderer
);
// SetRenderWindow( renderWindow ); /// NICO + MAHNU
//-- interactor
interactor
=
vtkSmartPointer
<
QVTKInteractor
>::
New
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment