From 862229580463dc749ccd25a6e385d7286f3ef84d Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Thu, 8 Feb 2018 14:41:20 -0300 Subject: [PATCH] Another reorganization of moulder directory --- moulder/__init__.py | 1 + moulder/main_window.py | 5 ++--- moulder/ui/__init__.py | 3 +++ moulder/{ => ui}/configure_dialog.py | 2 +- moulder/{ => ui}/double_slider.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 moulder/ui/__init__.py rename moulder/{ => ui}/configure_dialog.py (98%) rename moulder/{ => ui}/double_slider.py (95%) diff --git a/moulder/__init__.py b/moulder/__init__.py index 1817940..eafd2d7 100644 --- a/moulder/__init__.py +++ b/moulder/__init__.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import sys from PyQt5.QtWidgets import QApplication diff --git a/moulder/main_window.py b/moulder/main_window.py index 18f84ab..00534a9 100644 --- a/moulder/main_window.py +++ b/moulder/main_window.py @@ -1,4 +1,4 @@ -from __future__ import print_function, division +from __future__ import print_function, division, absolute_import from future.builtins import super import sys @@ -10,9 +10,8 @@ from PyQt5.QtWidgets import QMainWindow, QAction from PyQt5.QtWidgets import QWidget, QVBoxLayout, QMessageBox, QDoubleSpinBox from PyQt5.QtWidgets import QSlider, QLabel -from .double_slider import QDoubleSlider +from .ui import QDoubleSlider, ConfigureMeassurementDialog from .moulder import Moulder -from .configure_dialog import ConfigureMeassurementDialog DENSITY_RANGE = [-2000, 2000] diff --git a/moulder/ui/__init__.py b/moulder/ui/__init__.py new file mode 100644 index 0000000..342cc96 --- /dev/null +++ b/moulder/ui/__init__.py @@ -0,0 +1,3 @@ +from __future__ import absolute_import +from .configure_dialog import ConfigureMeassurementDialog +from .double_slider import QDoubleSlider diff --git a/moulder/configure_dialog.py b/moulder/ui/configure_dialog.py similarity index 98% rename from moulder/configure_dialog.py rename to moulder/ui/configure_dialog.py index bfaf5ff..1d9a618 100644 --- a/moulder/configure_dialog.py +++ b/moulder/ui/configure_dialog.py @@ -1,4 +1,4 @@ -from __future__ import print_function +from __future__ import print_function, absolute_import from future.builtins import super import numpy diff --git a/moulder/double_slider.py b/moulder/ui/double_slider.py similarity index 95% rename from moulder/double_slider.py rename to moulder/ui/double_slider.py index 460159c..cca681f 100644 --- a/moulder/double_slider.py +++ b/moulder/ui/double_slider.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from future.builtins import super from PyQt5.QtWidgets import QSlider