Rearrange widget files.

src/src/Common/SeriesImageSet.cpp

@@ -1,6 +1,6 @@
 #include "SeriesImageSet.h"
 #include <vtkRendererCollection.h>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 #include "IO/DICOM/DicomLoader.h"
 #include <QPainter>
 #include <QDebug>

src/src/UI/Dialog/exportdialog.h

@@ -7,7 +7,7 @@
 #include "IO/Export/dicomexporterthread.h"
 #include "QFileDialog"
 #include "IO/DICOM/DicomLoader.h"
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 
 
 

src/src/UI/Manager/ImageViewManager.cpp

@@ -12,8 +12,8 @@
 #include "IO/DICOM/DicomLoader.h"
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "Rendering/Measure/MeasureFactory.h"
-#include "UI/Widget/ViewContainerWidget.h"
-#include "UI/Widget/thumbnailImage.h"
+#include "UI/Widget/ImageView/ViewContainerWidget.h"
+#include "UI/Widget/Thumbnail/thumbnailImage.h"
 #include "UI/Widget/cine/pqVCRToolbar.h"
 
 ImageViewManager::ImageViewManager(QObject *parent)

src/src/UI/Manager/ImageViewManager.h

@@ -7,7 +7,7 @@
 
 #include <QObject>
 #include <QList>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 
 
 class ImageViewManager : public QObject {

src/src/UI/Widget/ImageView/ViewContainerWidget.cpp

@@ -9,8 +9,8 @@
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "IO/DICOM/DicomLoader.h"
 #include "UI/Manager/ImageViewManager.h"
-#include "thumbnailImage.h"
-#include "cine/pqVCRToolbar.h"
+#include "UI/Widget/Thumbnail/thumbnailImage.h"
+#include "UI/Widget/cine/pqVCRToolbar.h"
 
 ViewContainerWidget::ViewContainerWidget(QWidget *parent)
         : QFrame(parent), mViewManager(new ImageViewManager(this)) {

src/src/UI/Widget/ImageView/dicomimageview.cpp

@@ -12,10 +12,10 @@
 
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "UI/Window/metaDataWindow.h"
-#include "UI/Widget/mytitlebar.h"
-#include "cine/pqVCRController.h"
-#include "cine/pqVCRToolbar.h"
-#include "thumbnailImage.h"
+#include "UI/Widget/Component/mytitlebar.h"
+#include "UI/Widget/cine/pqVCRController.h"
+#include "UI/Widget/cine/pqVCRToolbar.h"
+#include "UI/Widget/Thumbnail/thumbnailImage.h"
 #include "dcmtk/dcmdata/dcfilefo.h"
 
 //-----------------------------------------------------------------------------

src/src/UI/Widget/ImageView/dicomimageview.h

@@ -7,7 +7,7 @@
 #include <QThread>
 
 #include "Common/SeriesImageSet.h"
-#include "UI/Widget/ClickableScrollBar.h"
+#include "UI/Widget/Component/ClickableScrollBar.h"
 #include "Rendering/infinitiViewer.h"
 
 class vtkCornerAnnotation;

src/src/UI/Widget/Import/importwidget.h

@@ -11,7 +11,7 @@
 #include "IO/Network/queryworker.h"
 #include "IO/Network/moveworker.h"
 #include "radiusprogressbar.h"
-//#include "radiusprogressbar.h"
+
 
 class QVBoxLayout;
 class QGridLayout;

src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp

@@ -1,5 +1,5 @@
 #include "pqFontPropertyWidget.h"
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 #include <vtkRenderWindowInteractor.h>
 #include "qcolordialog.h"
 //#include "QFontDialog.h"

src/src/UI/Widget/Thumbnail/thumbnailbarwidget.cpp

@@ -6,7 +6,7 @@
 #include <QDebug>
 #include <QPixmap>
 
-#include "dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 #include "qstyleoption.h"
 #include "qpainter.h"
 /************************************************************************

src/src/UI/Widget/cine/pqVCRController.h

@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QObject>
 #include <QPointer>
 #include <QTimer>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 // pqVCRController is the QObject that encapsulates the
 // VCR control functionality.
 // It provides a slot to set the scene that this object

src/src/UI/Widget/cine/pqVCRToolbar.cxx

@@ -1,7 +1,7 @@
 #include "pqVCRToolbar.h"
 #include "pqVCRController.h"
 #include <QThread>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 QString stylesheet =
 "QToolBar#vcr_toolbar{border:1px solid grey;}"
 "QSpinBox#spinFPS{background-color:transparent;border:0px;height:30px;width:30px;color:#a7d28c;font:bold 14px;}"

src/src/UI/Window/QDicomViewer.cpp

@@ -6,9 +6,10 @@
 #include <QMessageBox>
 #include <QButtonGroup>
 
+
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "UI/Manager/ImageViewManager.h"
-#include "UI/Widget/gridpopwidget.h"
+#include "UI/Widget/Component/gridpopwidget.h"
 #include "UI/Widget/cine/pqVCRToolbar.h"
 
 QDicomViewer::QDicomViewer(QWidget *parent) : QMainWindow(parent),

src/src/UI/Window/QDicomViewer.ui

@@ -148,7 +148,7 @@
   <customwidget>
    <class>ViewContainerWidget</class>
    <extends>QWidget</extends>
-   <header>UI/Widget/viewcontainerwidget.h</header>
+   <header>UI/Widget/ImageView/viewcontainerwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

src/src/UI/Window/customwindow.cpp

@@ -1,5 +1,5 @@
 #include "customwindow.h"
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 
 Customwindow::Customwindow(QWidget *parent)
 	: QDialog(parent)