X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fkw%2Fsrc%2FvtkKWSlicer.cxx;h=03de8d94b39c127daa210c42e17350d3345c9e31;hb=34a4b6e0dbf8373c79c665f64ff2d7ca6c911045;hp=adc9bf9d52f675ea2d12c82dc60fab074ebaa71f;hpb=310a70fea52f768e60d0a844e6ef84f13e4babd4;p=bbtk.git diff --git a/packages/kw/src/vtkKWSlicer.cxx b/packages/kw/src/vtkKWSlicer.cxx index adc9bf9..03de8d9 100644 --- a/packages/kw/src/vtkKWSlicer.cxx +++ b/packages/kw/src/vtkKWSlicer.cxx @@ -1,3 +1,30 @@ +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÈ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # This software is governed by the CeCILL-B license under French law and + # abiding by the rules of distribution of free software. You can use, + # modify and/ or redistribute the software under the terms of the CeCILL-B + # license as circulated by CEA, CNRS and INRIA at the following URL + # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html + # or in the file LICENSE.txt. + # + # As a counterpart to the access to the source code and rights to copy, + # modify and redistribute granted by the license, users are provided only + # with a limited warranty and the software's author, the holder of the + # economic rights, and the successive licensors have only limited + # liability. + # + # The fact that you are presently reading this means that you have had + # knowledge of the CeCILL-B license and that you accept its terms. + # ------------------------------------------------------------------------ */ + + #ifdef USE_KWWIDGETS #include "vtkKWSlicer.h" @@ -24,20 +51,27 @@ #include "vtkRenderWindowInteractor.h" #include "vtkXMLImageDataReader.h" +#include "vtkKWCornerAnnotationEditor.h" + //#include "vtkKWWidgetsPaths.h" #include "vtkToolkits.h" #include +extern "C" int Bbkw_Init(Tcl_Interp *interp); + //namespace bbkw { //---------------------------------------------------------------------------- vtkStandardNewMacro( vtkKWSlicer ); -vtkCxxRevisionMacro(vtkKWSlicer, "$Revision: 1.2 $"); +vtkCxxRevisionMacro(vtkKWSlicer, "$Revision: 1.5 $"); //---------------------------------------------------------------------------- vtkKWSlicer::vtkKWSlicer() { + + Bbkw_Init(vtkKWApplication::GetMainInterp ()); + this->Frame = NULL; this->RenderWidget = NULL; this->Image = NULL; @@ -70,6 +104,10 @@ vtkKWSlicer::~vtkKWSlicer() { this->WindowLevelPresetSelector->Delete(); } + if (this->AnnotationEditor) + { + this->AnnotationEditor->Delete(); + } if (this->AnimationWidget) { this->AnimationWidget->Delete(); @@ -94,6 +132,7 @@ void vtkKWSlicer::CreateWidget() vtkKWApplication *app = this->GetApplication(); // Add a SplitFrame + /* Frame = vtkKWSplitFrame::New(); Frame->SetFrame1MinimumSize(150); Frame->SetFrame2MinimumSize(250); @@ -104,12 +143,13 @@ void vtkKWSlicer::CreateWidget() app->Script("pack %s -side top -expand yes",// -fill both", this->Frame->GetWidgetName()); // Add a render widget, attach it to the view frame, and pack + */ if (!this->RenderWidget) { this->RenderWidget = vtkKWRenderWidget::New(); } - this->RenderWidget->SetParent(Frame->GetFrame2()); + this->RenderWidget->SetParent(this); //Frame->GetFrame2()); this->RenderWidget->Create(); this->RenderWidget->CornerAnnotationVisibilityOn(); @@ -120,20 +160,7 @@ void vtkKWSlicer::CreateWidget() // this->Script("grid rowconfigure %s 1 -weight 1 -minsize 100", // this->RenderWidget->GetWidgetName()); - // Create a volume reader - /* - vtkXMLImageDataReader *reader = vtkXMLImageDataReader::New(); - - char data_path[2048]; - sprintf(data_path, "%s/Data/head100x100x47.vti", KWWidgets_EXAMPLES_DIR); - if (!vtksys::SystemTools::FileExists(data_path)) - { - sprintf(data_path, - "%s/..%s/Examples/Data/head100x100x47.vti", - app->GetInstallationDirectory(), KWWidgets_INSTALL_DATA_DIR); - } - reader->SetFileName(data_path); - */ + // Create an image viewer // Use the render window and renderer of the renderwidget @@ -148,15 +175,6 @@ void vtkKWSlicer::CreateWidget() this->RenderWidget->GetRenderWindow()->GetInteractor()); - // Reset the window/level and the camera - /* - reader->Update(); - double *range = reader->GetOutput()->GetScalarRange(); - this->ImageViewer->SetColorWindow(range[1] - range[0]); - this->ImageViewer->SetColorLevel(0.5 * (range[1] + range[0])); - - this->RenderWidget->ResetCamera(); - */ // The corner annotation has the ability to parse "tags" and fill // them with information gathered from other objects. // For example, let's display the slice and window/level in one corner @@ -169,13 +187,15 @@ void vtkKWSlicer::CreateWidget() ca->SetText(2, ""); ca->SetText(3, "\n"); + + // Create a scale to control the slice if (!this->SliceScale) { this->SliceScale = vtkKWScale::New(); } - this->SliceScale->SetParent(Frame->GetFrame1()); + this->SliceScale->SetParent(this); //Frame->GetFrame1()); this->SliceScale->Create(); // this->SliceScale->SetCommand(this, "SetSliceFromScaleCallback"); @@ -192,7 +212,7 @@ void vtkKWSlicer::CreateWidget() vtkKWMenuButtonWithSpinButtonsWithLabel *orientation_menubutton = vtkKWMenuButtonWithSpinButtonsWithLabel::New(); - orientation_menubutton->SetParent(Frame->GetFrame1()); + orientation_menubutton->SetParent(this); //Frame->GetFrame1()); orientation_menubutton->Create(); orientation_menubutton->SetLabelText("Orientation:"); orientation_menubutton->SetPadX(2); @@ -221,12 +241,11 @@ void vtkKWSlicer::CreateWidget() // Create a window/level preset selector - /* vtkKWFrameWithLabel *wl_frame = vtkKWFrameWithLabel::New(); - wl_frame->SetParent(this); //->GetMainPanelFrame()); + wl_frame->SetParent(this); //Frame->GetFrame1()); wl_frame->Create(); wl_frame->SetLabelText("Window/Level Presets"); - + wl_frame->CollapseFrame (); app->Script("pack %s -side top -anchor nw -expand n -fill x -pady 2", wl_frame->GetWidgetName()); @@ -237,22 +256,24 @@ void vtkKWSlicer::CreateWidget() this->WindowLevelPresetSelector->SetParent(wl_frame->GetFrame()); this->WindowLevelPresetSelector->Create(); this->WindowLevelPresetSelector->ThumbnailColumnVisibilityOn(); - - this->WindowLevelPresetSelector->SetPresetAddCommand( - this, "WindowLevelPresetAddCallback"); - this->WindowLevelPresetSelector->SetPresetApplyCommand( - this, "WindowLevelPresetApplyCallback"); - this->WindowLevelPresetSelector->SetPresetUpdateCommand( - this, "WindowLevelPresetUpdateCallback"); - this->WindowLevelPresetSelector->SetPresetHasChangedCommand( - this, "WindowLevelPresetHasChangedCallback"); - + + app->Script("pack %s -side top -anchor nw -expand n -fill x", this->WindowLevelPresetSelector->GetWidgetName()); - // Create a simple animation widget + // Create a corner annotation editor + this->AnnotationEditor = vtkKWCornerAnnotationEditor::New(); + this->AnnotationEditor->SetParent(this); + this->AnnotationEditor->Create(); + this->AnnotationEditor->SetRenderWidget(this->RenderWidget); + this->AnnotationEditor->GetFrame()->CollapseFrame (); + app->Script("pack %s -side top -anchor nw -expand n -fill x", + this->AnnotationEditor->GetWidgetName()); + + // Create a simple animation widget + /* vtkKWFrameWithLabel *animation_frame = vtkKWFrameWithLabel::New(); animation_frame->SetParent(this); //->GetMainPanelFrame()); animation_frame->Create(); @@ -275,6 +296,7 @@ void vtkKWSlicer::CreateWidget() app->Script("pack %s -side top -anchor nw -expand n -fill x", this->AnimationWidget->GetWidgetName()); */ + this->UpdateSliceRanges(); // Callbacks @@ -283,6 +305,18 @@ void vtkKWSlicer::CreateWidget() this->AddCallbackCommandObserver( menu, vtkKWMenu::MenuItemInvokedEvent); + // this->AddCallbackCommandObserver( this->WindowLevelPresetSelector, + + this->WindowLevelPresetSelector->SetPresetAddCommand(this, + "WindowLevelPresetAddCallback"); + this->WindowLevelPresetSelector->SetPresetApplyCommand(this, + "WindowLevelPresetApplyCallback"); + this->WindowLevelPresetSelector->SetPresetUpdateCommand( + this, "WindowLevelPresetUpdateCallback"); + this->WindowLevelPresetSelector->SetPresetHasChangedCommand( + this, "WindowLevelPresetHasChangedCallback"); + + // Deallocate local objects @@ -298,7 +332,7 @@ void vtkKWSlicer::CreateWidget() void vtkKWSlicer::ProcessCallbackCommandEvents( vtkObject *caller, unsigned long event, void *calldata) { - std::cout << "###### vtkKWSlicer::ProcessCallbackCommandEvents" << std::endl; + // std::cout << "###### vtkKWSlicer::ProcessCallbackCommandEvents" << std::endl; if (caller == this->SliceScale && event == vtkKWScale::ScaleValueChangingEvent) {