refactor: created a proper project structure

Rubenknex · Jul 22, 2016 · b49d827 · b49d827
1 parent 18c0cf9
commit b49d827
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 4 deletions.
diff --git a/qtplot.bat b/qtplot.bat
@@ -1 +1 @@
-python "%~dp0qtplot.py" %1
+python "%~dp0qtplot/qtplot.py" %1
diff --git a/canvas.py → qtplot/canvas.py b/canvas.py → qtplot/canvas.py
@@ -106,7 +106,7 @@ def __init__(self, parent=None):
         self.data_program = gloo.Program(data_vert, data_frag)
 
         path = os.path.dirname(os.path.realpath(__file__))
-        path = os.path.join(path, 'colormaps/transform/Seismic.npy')
+        path = os.path.join(path, '../colormaps/transform/Seismic.npy')
         self.colormap = Colormap(path)
 
         self.colormap_program = gloo.Program(colormap_vert, colormap_frag)

diff --git a/colormap.py → qtplot/colormap.py b/colormap.py → qtplot/colormap.py
diff --git a/data.py → qtplot/data.py b/data.py → qtplot/data.py
diff --git a/export.py → qtplot/export.py b/export.py → qtplot/export.py
diff --git a/linecut.py → qtplot/linecut.py b/linecut.py → qtplot/linecut.py
diff --git a/operations.py → qtplot/operations.py b/operations.py → qtplot/operations.py
diff --git a/qtplot.py → qtplot/qtplot.py b/qtplot.py → qtplot/qtplot.py
@@ -187,13 +187,18 @@ def init_ui(self):
         self.cb_cmaps.activated.connect(self.on_cmap_change)
 
         path = os.path.dirname(os.path.realpath(__file__))
-        path = os.path.join(path, 'colormaps')
+        path = os.path.join(path, '../colormaps')
 
         cmap_files = []
         for dir, _, files in os.walk(path):
             for filename in files:
                 reldir = os.path.relpath(dir, path)
                 relfile = os.path.join(reldir, filename)
+
+                # Remove .\ for files in the root of the directory
+                if relfile[:2] == '.\\':
+                    relfile = relfile[2:]
+
                 cmap_files.append(relfile)
 
         self.cb_cmaps.addItems(cmap_files)
@@ -501,7 +506,7 @@ def on_cmap_change(self, event):
         selected_cmap = str(self.cb_cmaps.currentText())
 
         path = os.path.dirname(os.path.realpath(__file__))
-        path = os.path.join(path, 'colormaps', selected_cmap)
+        path = os.path.join(path, '../colormaps', selected_cmap)
 
         new_colormap = Colormap(path)
 

diff --git a/settings.py → qtplot/settings.py b/settings.py → qtplot/settings.py
diff --git a/util.py → qtplot/util.py b/util.py → qtplot/util.py
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,6 @@
+numpy
+scipy
+pandas
+matplotlib
+pyopengl
+vispy
diff --git a/setup.py b/setup.py
diff --git a/test.py → tests/test.py b/test.py → tests/test.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		python "%~dp0qtplot.py" %1
		python "%~dp0qtplot/qtplot.py" %1