From 01105d0c66163c7d62f911928d4a2f39978d2079 Mon Sep 17 00:00:00 2001 From: Krad Date: Wed, 16 Nov 2022 11:18:41 +0800 Subject: [PATCH] Change Define value. --- src/src/Rendering/Core/RenderingDefines.h | 9 +++++---- src/src/UI/Widget/ToolBar/VolumeRenderingToolBar.cpp | 12 +++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/src/Rendering/Core/RenderingDefines.h b/src/src/Rendering/Core/RenderingDefines.h index b403e06..dea1622 100644 --- a/src/src/Rendering/Core/RenderingDefines.h +++ b/src/src/Rendering/Core/RenderingDefines.h @@ -6,6 +6,7 @@ #define OMEGAV_DEFINES_H #include +#include #define VTKIS_DRAG 33 #define VTKIS_MEASURE 36 @@ -13,10 +14,10 @@ #define VTKIS_IMAGE_PAN 5 #define VTKIS_IMAGE_ZOOM 6 #define VTKIS_IMAGE_WINDOWLEVEL 7 -#define VTKIS_VOLUME_ROTATE3D 0 -#define VTKIS_VOLUME_ROTATE2D 1 -#define VTKIS_VOLUME_ZOOM 2 -#define VTKIS_VOLUME_PAN 3 +#define VTKIS_VOLUME_ROTATE3D VTKIS_ROTATE +#define VTKIS_VOLUME_ROTATE2D VTKIS_SPIN +#define VTKIS_VOLUME_ZOOM VTKIS_ZOOM +#define VTKIS_VOLUME_PAN VTKIS_PAN #define VTKIS_VOLUME_WINDOW 7 enum DraggableStyleEvents { diff --git a/src/src/UI/Widget/ToolBar/VolumeRenderingToolBar.cpp b/src/src/UI/Widget/ToolBar/VolumeRenderingToolBar.cpp index 82f1096..0e48be1 100644 --- a/src/src/UI/Widget/ToolBar/VolumeRenderingToolBar.cpp +++ b/src/src/UI/Widget/ToolBar/VolumeRenderingToolBar.cpp @@ -9,6 +9,8 @@ #include #include +#include "Rendering/Core/RenderingDefines.h" + VolumeRenderingToolBar::VolumeRenderingToolBar(QWidget *parent) : QToolBar(parent) { auto btnReset = new QToolButton(this); addButton(btnReset, "reset"); @@ -66,11 +68,11 @@ VolumeRenderingToolBar::VolumeRenderingToolBar(QWidget *parent) : QToolBar(paren addButton(btnWindow, "window"); btnWindow->setCheckable(true); - group->addButton(btnFreeRotate,0); - group->addButton(btnRotate,1); - group->addButton(btnZoom,2); - group->addButton(btnPan,3); - group->addButton(btnWindow,7); + group->addButton(btnFreeRotate,VTKIS_VOLUME_ROTATE3D); + group->addButton(btnRotate,VTKIS_VOLUME_ROTATE2D); + group->addButton(btnZoom,VTKIS_VOLUME_ZOOM); + group->addButton(btnPan,VTKIS_VOLUME_PAN); + group->addButton(btnWindow,VTKIS_VOLUME_WINDOW); group->setExclusive(true); connect(group, static_cast(&QButtonGroup::buttonClicked),this,&VolumeRenderingToolBar::modeButtonClicked);