mirror of
https://github.com/fatiando/moulder.git
synced 2025-12-21 10:31:09 +08:00
Clean code and PEP8 fixes
This commit is contained in:
@@ -1,18 +1,12 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from future.builtins import super
|
from future.builtins import super
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import numpy
|
import numpy
|
||||||
import matplotlib
|
from PyQt5.QtGui import QFont
|
||||||
from matplotlib.figure import Figure
|
|
||||||
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
|
|
||||||
from PyQt5.QtGui import QIcon, QFont
|
|
||||||
from PyQt5.QtCore import Qt
|
from PyQt5.QtCore import Qt
|
||||||
from PyQt5.QtWidgets import QSizePolicy, QMainWindow, QApplication, QAction
|
from PyQt5.QtWidgets import QHBoxLayout, QVBoxLayout, QMessageBox, QLabel
|
||||||
from PyQt5.QtWidgets import QMenu, QWidget, QVBoxLayout, QMessageBox
|
from PyQt5.QtWidgets import QDialog, QPushButton, QRadioButton
|
||||||
from PyQt5.QtWidgets import QSlider, QHBoxLayout, QLabel, QDialog, QPushButton
|
from PyQt5.QtWidgets import QGridLayout, QLineEdit
|
||||||
from PyQt5.QtWidgets import QDialogButtonBox, QGridLayout, QRadioButton, QLineEdit
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigureMeassurementDialog(QDialog):
|
class ConfigureMeassurementDialog(QDialog):
|
||||||
|
|||||||
@@ -1,18 +1,9 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from future.builtins import super
|
from future.builtins import super
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import numpy
|
|
||||||
import matplotlib
|
|
||||||
from matplotlib.figure import Figure
|
from matplotlib.figure import Figure
|
||||||
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
|
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
|
||||||
from PyQt5.QtGui import QIcon
|
from PyQt5.QtWidgets import QSizePolicy
|
||||||
from PyQt5.QtCore import Qt
|
|
||||||
from PyQt5.QtWidgets import QSizePolicy, QMainWindow, QApplication, QAction
|
|
||||||
from PyQt5.QtWidgets import QMenu, QWidget, QVBoxLayout, QMessageBox
|
|
||||||
from PyQt5.QtWidgets import QSlider, QHBoxLayout, QLabel, QDialog
|
|
||||||
from PyQt5.QtWidgets import QDialogButtonBox
|
|
||||||
|
|
||||||
|
|
||||||
class GravityModelCanvas(FigureCanvasQTAgg):
|
class GravityModelCanvas(FigureCanvasQTAgg):
|
||||||
|
|||||||
@@ -1,26 +1,12 @@
|
|||||||
from __future__ import division, absolute_import
|
from __future__ import division, absolute_import
|
||||||
from future.builtins import super, zip
|
from future.builtins import super, zip
|
||||||
|
|
||||||
try:
|
|
||||||
import cPickle as pickle
|
|
||||||
except ImportError:
|
|
||||||
import pickle
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import numpy
|
import numpy
|
||||||
import matplotlib
|
from matplotlib import pyplot, patches
|
||||||
from matplotlib import pyplot, widgets, patches
|
|
||||||
from matplotlib.lines import Line2D
|
from matplotlib.lines import Line2D
|
||||||
from matplotlib.figure import Figure
|
from matplotlib.figure import Figure
|
||||||
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
|
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
|
||||||
from PyQt5.QtGui import QIcon
|
|
||||||
from PyQt5.QtCore import Qt, pyqtSignal
|
from PyQt5.QtCore import Qt, pyqtSignal
|
||||||
from PyQt5.QtWidgets import QSizePolicy, QMainWindow, QApplication, QAction
|
|
||||||
from PyQt5.QtWidgets import QMenu, QWidget, QVBoxLayout, QMessageBox
|
|
||||||
from PyQt5.QtWidgets import QSlider, QHBoxLayout, QLabel, QDialog
|
|
||||||
from PyQt5.QtWidgets import QDialogButtonBox
|
|
||||||
|
|
||||||
|
|
||||||
from fatiando import utils
|
from fatiando import utils
|
||||||
from fatiando.gravmag import talwani
|
from fatiando.gravmag import talwani
|
||||||
|
|||||||
16
moulder.py
16
moulder.py
@@ -1,21 +1,15 @@
|
|||||||
from __future__ import print_function, division
|
from __future__ import print_function, division
|
||||||
from future.builtins import super
|
from future.builtins import super
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
import sys
|
||||||
import numpy
|
import numpy
|
||||||
import matplotlib
|
|
||||||
from matplotlib.figure import Figure
|
|
||||||
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
|
|
||||||
from matplotlib.backends.backend_qt5 import NavigationToolbar2QT
|
from matplotlib.backends.backend_qt5 import NavigationToolbar2QT
|
||||||
from PyQt5.QtGui import QIcon
|
from PyQt5.QtGui import QIcon
|
||||||
from PyQt5.QtCore import Qt
|
from PyQt5.QtCore import Qt
|
||||||
from PyQt5.QtWidgets import QSizePolicy, QMainWindow, QApplication, QAction
|
from PyQt5.QtWidgets import QMainWindow, QApplication, QAction
|
||||||
from PyQt5.QtWidgets import QMenu, QWidget, QVBoxLayout, QMessageBox
|
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QMessageBox, QDoubleSpinBox
|
||||||
from PyQt5.QtWidgets import QSlider, QHBoxLayout, QLabel, QDialog
|
from PyQt5.QtWidgets import QSlider, QLabel
|
||||||
from PyQt5.QtWidgets import QDialogButtonBox, QDoubleSpinBox
|
|
||||||
|
|
||||||
from figure_canvas import GravityModelCanvas
|
|
||||||
from double_slider import QDoubleSlider
|
from double_slider import QDoubleSlider
|
||||||
from interactive import Moulder
|
from interactive import Moulder
|
||||||
from configure_dialog import ConfigureMeassurementDialog
|
from configure_dialog import ConfigureMeassurementDialog
|
||||||
@@ -77,7 +71,7 @@ class MoulderApp(QMainWindow):
|
|||||||
|
|
||||||
def _define_actions(self):
|
def _define_actions(self):
|
||||||
self.configure_action = QAction(QIcon.fromTheme('preferences-system'),
|
self.configure_action = QAction(QIcon.fromTheme('preferences-system'),
|
||||||
'&Configure...', self)
|
'&Configure...', self)
|
||||||
self.open_action = QAction(QIcon.fromTheme('document-open'),
|
self.open_action = QAction(QIcon.fromTheme('document-open'),
|
||||||
'&Open model', self)
|
'&Open model', self)
|
||||||
self.open_action.setShortcut('Ctrl+O')
|
self.open_action.setShortcut('Ctrl+O')
|
||||||
@@ -92,7 +86,7 @@ class MoulderApp(QMainWindow):
|
|||||||
self.quit_action.setShortcut('Ctrl+Q')
|
self.quit_action.setShortcut('Ctrl+Q')
|
||||||
self.about_action = QAction("&About", self)
|
self.about_action = QAction("&About", self)
|
||||||
self.new_polygon_action = QAction(QIcon.fromTheme("list-add"),
|
self.new_polygon_action = QAction(QIcon.fromTheme("list-add"),
|
||||||
"&New Polygon", self)
|
"&New Polygon", self)
|
||||||
self.delete_polygon_action = QAction(QIcon.fromTheme("list-remove"),
|
self.delete_polygon_action = QAction(QIcon.fromTheme("list-remove"),
|
||||||
"&Delete Polygon", self)
|
"&Delete Polygon", self)
|
||||||
self.add_vertex_action = QAction(QIcon.fromTheme("document-new"),
|
self.add_vertex_action = QAction(QIcon.fromTheme("document-new"),
|
||||||
|
|||||||
Reference in New Issue
Block a user