Merge pull request #66 from marc4492/rename_modules

Rename modules

gcodeextractor/UI/UI.py

@@ -4,7 +4,7 @@ from tkinter.filedialog import askdirectory, askopenfilename, asksaveasfilename
 from tkinter.ttk import Combobox
 import subprocess
 
-from pcbdevice.main import main
+from gcodeextractor.main import main
 
 root = Tk()
 frame = Frame(root)

gcodeextractor/gcode/GcodeCreator.py

@@ -1,4 +1,4 @@
-from pcbdevice.models.Coordinates import Coordinate
+from gcodeextractor.models.Coordinates import Coordinate
 
 
 def findEndOfLine(image, direction, line, column, sequence):

gcodeextractor/main.py

@@ -1,22 +1,22 @@
 import math
 
-from pcbdevice.gcode.GcodeBuilder import listToGCode
+from gcodeextractor.gcode.GcodeBuilder import listToGCode
 
-from pcbdevice.gcode.GcodeCreator import createSequence
+from gcodeextractor.gcode.GcodeCreator import createSequence
-from pcbdevice.gcode.path import path
+from gcodeextractor.gcode.path import path
-from pcbdevice.utils.FileUtils import FileUtils
+from gcodeextractor.utils.FileUtils import FileUtils
 import argparse
 import subprocess
 
 def main(inputPath, outputPath, isAscii, heightReal, widthReal, tool, unit):
-	converterPath = '.\\pcbdevice\\utils\\convertiseur.exe'
+	converterPath = '.\\gcodeextractor\\utils\\convertiseur.exe'
 	
 	if outputPath.rfind('\\') != -1:
 		asciiPbmPath = outputPath[0:outputPath.rfind('\\')] + '\\pcbImageAscii.pbm'
 	elif outputPath.rfind('/') != -1:
 		asciiPbmPath = outputPath[0:outputPath.rfind('/')] + '/pcbImageAscii.pbm'
 	else:
-		asciiPbmPath = '.\\pcbdevice\\resources\\output\\pcbImageAscii.pbm'
+		asciiPbmPath = '.\\gcodeextractor\\resources\\output\\pcbImageAscii.pbm'
 		
 	if not isAscii:
 		subprocess.check_call([converterPath, inputPath, asciiPbmPath])

gcodeextractor/tests/gcode/test_gcodeCreator.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 
-from pcbdevice.gcode.GcodeCreator import createSequence, findDirection, findEndOfLine
+from gcodeextractor.gcode.GcodeCreator import createSequence, findDirection, findEndOfLine
-from pcbdevice.models.Coordinates import Coordinate
+from gcodeextractor.models.Coordinates import Coordinate
 
 
 class TestGcodeCreator(TestCase):

gcodeextractor/tests/gcode/test_listToGcode.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 
-from pcbdevice.gcode.GcodeBuilder import listToGCode
+from gcodeextractor.gcode.GcodeBuilder import listToGCode
-from pcbdevice.models.Coordinates import Coordinate
+from gcodeextractor.models.Coordinates import Coordinate
 
 
 class TestListToGCode(TestCase):

gcodeextractor/tests/gcode/test_path.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from pcbdevice.gcode.path import scanHorizontal, scanVertical, twoRemoving
+from gcodeextractor.gcode.path import scanHorizontal, scanVertical, twoRemoving
 
 
 class TestPath(TestCase):

gcodeextractor/tests/resources/output/text1.txt

@@ -0,0 +1,5 @@
+This
+is
+a
+
+test

gcodeextractor/tests/resources/output/text2.txt

@@ -0,0 +1,5 @@
+G28
+G90
+G0 Z3
+
+G0 X15 Y45

gcodeextractor/tests/utils/test_fileUtils.py

@@ -1,10 +1,10 @@
 from unittest import TestCase
 
-from pcbdevice.utils import TestUtils
+from gcodeextractor.utils import TestUtils
-from pcbdevice.utils.FileUtils import FileUtils
+from gcodeextractor.utils.FileUtils import FileUtils
-from pcbdevice.utils.TestUtils import readStringFile
+from gcodeextractor.utils.TestUtils import readStringFile
 
-resources = './pcbdevice/tests/resources/'
+resources = './gcodeextractor/tests/resources/'
 
 class TestFileUtils(TestCase):
 	def test_pbmToMatrix(self):