Merge branch 'master' into fileconversion

neutronimaging · Jul 18, 2018 · 6b2a985 · 6b2a985
2 parents f04ff0f + 4774202
commit 6b2a985
Show file tree

Hide file tree

Showing 210 changed files with 9,500 additions and 616 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+core/algorithms/ImagingAlgorithms/.DS_Store
 build*
 *.user
 *.stash

diff --git a/GUI/qt/ImagingTests/ImagingTests.pro b/GUI/qt/ImagingTests/ImagingTests.pro
@@ -0,0 +1,52 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2018-06-29T07:56:02
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = ImagingTests
+TEMPLATE = app
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which has been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+
+SOURCES += \
+        main.cpp \
+        mainwindow.cpp
+
+HEADERS += \
+        mainwindow.h
+
+FORMS += \
+        mainwindow.ui
+
+CONFIG(release, debug|release): LIBS += -L$$PWD/../../../../lib -lkipl -lQtAddons -lReaderConfig -lQtImaging
+else:CONFIG(debug, debug|release):   LIBS += -L$$PWD/../../../../lib/debug -lkipl -lQtAddons -lReaderConfig -lQtImaging
+
+INCLUDEPATH += $$PWD/../../../core/kipl/kipl/include
+DEPENDPATH += $$PWD/../../../core/kipl/kipl/include
+
+INCLUDEPATH += $$PWD/../../../core/modules/ReaderConfig/
+DEPENDPATH += $$PWD/../../../core/modules/ReaderConfig/
+
+INCLUDEPATH += $$PWD/../../../gui/qt/QtAddons
+DEPENDPATH += $$PWD/../../../gui/qt/QtAddons
+
+INCLUDEPATH += $$PWD/../QtAddons
+DEPENDPATH += $$PWD/../QtAddons
+
+INCLUDEPATH += $$PWD/../QtImaging
+DEPENDPATH += $$PWD/../QtImaging
diff --git a/GUI/qt/ImagingTests/main.cpp b/GUI/qt/ImagingTests/main.cpp
@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}
diff --git a/GUI/qt/ImagingTests/mainwindow.cpp b/GUI/qt/ImagingTests/mainwindow.cpp
@@ -0,0 +1,23 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <pixelsizedlg.h>
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
+
+void MainWindow::on_pushButton_clicked()
+{
+    PixelSizeDlg dlg;
+
+    dlg.exec();
+}
diff --git a/GUI/qt/ImagingTests/mainwindow.h b/GUI/qt/ImagingTests/mainwindow.h
@@ -0,0 +1,25 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+private slots:
+    void on_pushButton_clicked();
+
+private:
+    Ui::MainWindow *ui;
+};
+
+#endif // MAINWINDOW_H
diff --git a/GUI/qt/ImagingTests/mainwindow.ui b/GUI/qt/ImagingTests/mainwindow.ui
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <widget class="QPushButton" name="pushButton">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>30</y>
+      <width>113</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Pixel size</string>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>400</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/GUI/qt/QtAddons/uxroiwidget.ui b/GUI/qt/QtAddons/uxroiwidget.ui
@@ -43,6 +43,9 @@
     <property name="alignment">
      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
     </property>
+    <property name="maximum">
+     <number>9999</number>
+    </property>
    </widget>
    <widget class="QSpinBox" name="spinX1">
     <property name="geometry">
@@ -81,6 +84,9 @@
     <property name="alignment">
      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
     </property>
+    <property name="maximum">
+     <number>9999</number>
+    </property>
    </widget>
    <widget class="QSpinBox" name="spinY0">
     <property name="geometry">
@@ -97,6 +103,9 @@
     <property name="alignment">
      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
     </property>
+    <property name="maximum">
+     <number>9999</number>
+    </property>
    </widget>
    <widget class="QPushButton" name="buttonGetROI">
     <property name="geometry">
@@ -120,25 +129,20 @@
      <bool>false</bool>
     </property>
    </widget>
-   <widget class="QLabel" name="label">
+   <widget class="QLabel" name="label_3">
     <property name="geometry">
      <rect>
-      <x>20</x>
+      <x>10</x>
       <y>50</y>
       <width>60</width>
       <height>16</height>
      </rect>
     </property>
-    <property name="font">
-     <font>
-      <pointsize>9</pointsize>
-     </font>
-    </property>
     <property name="text">
      <string>(x0,y0)</string>
     </property>
    </widget>
-   <widget class="QLabel" name="label_2">
+   <widget class="QLabel" name="label">
     <property name="geometry">
      <rect>
       <x>130</x>
@@ -147,22 +151,10 @@
       <height>16</height>
      </rect>
     </property>
-    <property name="font">
-     <font>
-      <pointsize>9</pointsize>
-     </font>
-    </property>
     <property name="text">
      <string>(x1,y1)</string>
     </property>
    </widget>
-   <zorder>label_2</zorder>
-   <zorder>label</zorder>
-   <zorder>spinY1</zorder>
-   <zorder>spinX1</zorder>
-   <zorder>spinX0</zorder>
-   <zorder>spinY0</zorder>
-   <zorder>buttonGetROI</zorder>
   </widget>
  </widget>
  <resources/>

diff --git a/GUI/qt/QtImaging/QtImaging.pro b/GUI/qt/QtImaging/QtImaging.pro
@@ -0,0 +1,81 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2018-06-25T07:52:23
+#
+#-------------------------------------------------
+
+QT       += widgets
+
+QT       -= gui
+
+TARGET = QtImaging
+TEMPLATE = lib
+
+CONFIG += c++11
+
+DEFINES += QTIMAGING_LIBRARY
+
+CONFIG(release, debug|release): DESTDIR = $$PWD/../../../../lib
+else:CONFIG(debug, debug|release): DESTDIR = $$PWD/../../../../lib/debug
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which has been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+unix:!macx {
+    QMAKE_CXXFLAGS += -fopenmp -fPIC -O2
+    QMAKE_LFLAGS += -lgomp
+    LIBS += -lgomp
+}
+
+unix:macx {
+    QMAKE_MAC_SDK = macosx10.12
+    QMAKE_CXXFLAGS += -fPIC -O2
+    INCLUDEPATH += /opt/local/include
+    QMAKE_LIBDIR += /opt/local/lib
+}
+
+win32 {
+    contains(QMAKE_HOST.arch, x86_64):{
+    QMAKE_LFLAGS += /MACHINE:X64
+    }
+    INCLUDEPATH += ../../../external/include .
+    LIBPATH += ../../../external/lib64
+    QMAKE_CXXFLAGS += /openmp /O2
+}
+
+SOURCES += \
+        qtimaging.cpp \
+    pixelsizedlg.cpp
+
+HEADERS += \
+        qtimaging.h \
+        qtimaging_global.h \ 
+    pixelsizedlg.h
+
+unix {
+    target.path = /usr/lib
+    INSTALLS += target
+}
+
+FORMS += \
+    pixelsizedlg.ui
+
+CONFIG(release, debug|release): LIBS += -L$$PWD/../../../../lib -lkipl -lQtAddons -lReaderConfig
+else:CONFIG(debug, debug|release):   LIBS += -L$$PWD/../../../../lib/debug -lkipl -lQtAddons -lReaderConfig
+
+INCLUDEPATH += $$PWD/../../../core/kipl/kipl/include
+DEPENDPATH += $$PWD/../../../core/kipl/kipl/include
+
+INCLUDEPATH += $$PWD/../../../core/modules/ReaderConfig/
+DEPENDPATH += $$PWD/../../../core/modules/ReaderConfig/
+
+INCLUDEPATH += $$PWD/../../../gui/qt/QtAddons
+DEPENDPATH += $$PWD/../../../gui/qt/QtAddons