From 9d25e5bd6e9d5ba380daf1ae3837369815a3a42f Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Thu, 30 Jun 2022 17:23:39 +0800
Subject: [PATCH] Move measure about widget to UI/Widget package.

---
 src/src/Rendering/Measure/RulerAnnotationActor.cpp              | 2 +-
 src/src/Rendering/Measure/TextAnnotationActor.cpp               | 2 +-
 src/src/{measure => UI/Widget/Measure}/HoverButton.cpp          | 0
 src/src/{measure => UI/Widget/Measure}/HoverButton.h            | 0
 src/src/{measure => UI/Widget/Measure}/calibrationWidget.cpp    | 0
 src/src/{measure => UI/Widget/Measure}/calibrationWidget.h      | 0
 src/src/{measure => UI/Widget/Measure}/calibrationWidget.ui     | 0
 src/src/{measure => UI/Widget/Measure}/pqFontPropertyWidget.cpp | 2 +-
 src/src/{measure => UI/Widget/Measure}/pqFontPropertyWidget.h   | 0
 src/src/{measure => UI/Widget/Measure}/pqFontPropertyWidget.ui  | 0
 src/src/UI/Window/QDicomViewer.h                                | 2 +-
 11 files changed, 4 insertions(+), 4 deletions(-)
 rename src/src/{measure => UI/Widget/Measure}/HoverButton.cpp (100%)
 rename src/src/{measure => UI/Widget/Measure}/HoverButton.h (100%)
 rename src/src/{measure => UI/Widget/Measure}/calibrationWidget.cpp (100%)
 rename src/src/{measure => UI/Widget/Measure}/calibrationWidget.h (100%)
 rename src/src/{measure => UI/Widget/Measure}/calibrationWidget.ui (100%)
 rename src/src/{measure => UI/Widget/Measure}/pqFontPropertyWidget.cpp (99%)
 rename src/src/{measure => UI/Widget/Measure}/pqFontPropertyWidget.h (100%)
 rename src/src/{measure => UI/Widget/Measure}/pqFontPropertyWidget.ui (100%)

diff --git a/src/src/Rendering/Measure/RulerAnnotationActor.cpp b/src/src/Rendering/Measure/RulerAnnotationActor.cpp
index 2829abb..81c5fef 100644
--- a/src/src/Rendering/Measure/RulerAnnotationActor.cpp
+++ b/src/src/Rendering/Measure/RulerAnnotationActor.cpp
@@ -15,7 +15,7 @@
 
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "Rendering/Core/ControlPointActor.h"
-#include "measure/calibrationWidget.h"
+#include "UI/Widget/Measure/calibrationWidget.h"
 
 vtkStandardNewMacro(RulerAnnotationActor)
 
diff --git a/src/src/Rendering/Measure/TextAnnotationActor.cpp b/src/src/Rendering/Measure/TextAnnotationActor.cpp
index 554fc81..a396a27 100644
--- a/src/src/Rendering/Measure/TextAnnotationActor.cpp
+++ b/src/src/Rendering/Measure/TextAnnotationActor.cpp
@@ -12,7 +12,7 @@
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 
-#include "measure/pqFontPropertyWidget.h"
+#include "UI/Widget/Measure/pqFontPropertyWidget.h"
 #include "Interaction/ActorDraggableInteractorStyle.h"
 
 vtkStandardNewMacro(TextAnnotationActor)
diff --git a/src/src/measure/HoverButton.cpp b/src/src/UI/Widget/Measure/HoverButton.cpp
similarity index 100%
rename from src/src/measure/HoverButton.cpp
rename to src/src/UI/Widget/Measure/HoverButton.cpp
diff --git a/src/src/measure/HoverButton.h b/src/src/UI/Widget/Measure/HoverButton.h
similarity index 100%
rename from src/src/measure/HoverButton.h
rename to src/src/UI/Widget/Measure/HoverButton.h
diff --git a/src/src/measure/calibrationWidget.cpp b/src/src/UI/Widget/Measure/calibrationWidget.cpp
similarity index 100%
rename from src/src/measure/calibrationWidget.cpp
rename to src/src/UI/Widget/Measure/calibrationWidget.cpp
diff --git a/src/src/measure/calibrationWidget.h b/src/src/UI/Widget/Measure/calibrationWidget.h
similarity index 100%
rename from src/src/measure/calibrationWidget.h
rename to src/src/UI/Widget/Measure/calibrationWidget.h
diff --git a/src/src/measure/calibrationWidget.ui b/src/src/UI/Widget/Measure/calibrationWidget.ui
similarity index 100%
rename from src/src/measure/calibrationWidget.ui
rename to src/src/UI/Widget/Measure/calibrationWidget.ui
diff --git a/src/src/measure/pqFontPropertyWidget.cpp b/src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp
similarity index 99%
rename from src/src/measure/pqFontPropertyWidget.cpp
rename to src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp
index ecd8857..f40b908 100644
--- a/src/src/measure/pqFontPropertyWidget.cpp
+++ b/src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp
@@ -1,7 +1,7 @@
 #include "pqFontPropertyWidget.h"
 #include "UI/Widget/dicomimageview.h"
 #include <vtkRenderWindowInteractor.h>
-#include "QColorDialog.h"
+#include "qcolordialog.h"
 //#include "QFontDialog.h"
 
 //pqFontPropertyWidget* pqFontPropertyWidget::instance = nullptr;
diff --git a/src/src/measure/pqFontPropertyWidget.h b/src/src/UI/Widget/Measure/pqFontPropertyWidget.h
similarity index 100%
rename from src/src/measure/pqFontPropertyWidget.h
rename to src/src/UI/Widget/Measure/pqFontPropertyWidget.h
diff --git a/src/src/measure/pqFontPropertyWidget.ui b/src/src/UI/Widget/Measure/pqFontPropertyWidget.ui
similarity index 100%
rename from src/src/measure/pqFontPropertyWidget.ui
rename to src/src/UI/Widget/Measure/pqFontPropertyWidget.ui
diff --git a/src/src/UI/Window/QDicomViewer.h b/src/src/UI/Window/QDicomViewer.h
index 830e12f..b10f51f 100644
--- a/src/src/UI/Window/QDicomViewer.h
+++ b/src/src/UI/Window/QDicomViewer.h
@@ -5,7 +5,7 @@
 #include <QSettings>
 #include "UI/Dialog/exportdialog.h"
 #include "customwindow.h"
-#include "measure/pqFontPropertyWidget.h"
+#include "UI/Widget/Measure/pqFontPropertyWidget.h"
 
 /**
  * @brief 主窗口Class