diff --git a/arduinosender/CommunicationMain.py b/devicecommunication/CommunicationMain.py similarity index 100% rename from arduinosender/CommunicationMain.py rename to devicecommunication/CommunicationMain.py diff --git a/arduinosender/__init__.py b/devicecommunication/__init__.py similarity index 100% rename from arduinosender/__init__.py rename to devicecommunication/__init__.py diff --git a/pcbdevice/opencrcontroler/GcodeInterpreter/GcodeInterpreter.ino b/devicesoftware/GcodeInterpreter/GcodeInterpreter.ino similarity index 100% rename from pcbdevice/opencrcontroler/GcodeInterpreter/GcodeInterpreter.ino rename to devicesoftware/GcodeInterpreter/GcodeInterpreter.ino diff --git a/pcbdevice/README.md b/gcodeextractor/README.md similarity index 100% rename from pcbdevice/README.md rename to gcodeextractor/README.md diff --git a/pcbdevice/UI/UI.py b/gcodeextractor/UI/UI.py similarity index 99% rename from pcbdevice/UI/UI.py rename to gcodeextractor/UI/UI.py index c7e5a91..1a69f18 100644 --- a/pcbdevice/UI/UI.py +++ b/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) diff --git a/pcbdevice/UI/__init__.py b/gcodeextractor/UI/__init__.py similarity index 100% rename from pcbdevice/UI/__init__.py rename to gcodeextractor/UI/__init__.py diff --git a/pcbdevice/__init__.py b/gcodeextractor/__init__.py similarity index 100% rename from pcbdevice/__init__.py rename to gcodeextractor/__init__.py diff --git a/pcbdevice/gcode/GcodeBuilder.py b/gcodeextractor/gcode/GcodeBuilder.py similarity index 100% rename from pcbdevice/gcode/GcodeBuilder.py rename to gcodeextractor/gcode/GcodeBuilder.py diff --git a/pcbdevice/gcode/GcodeCreator.py b/gcodeextractor/gcode/GcodeCreator.py similarity index 98% rename from pcbdevice/gcode/GcodeCreator.py rename to gcodeextractor/gcode/GcodeCreator.py index 8636052..fadab77 100644 --- a/pcbdevice/gcode/GcodeCreator.py +++ b/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): diff --git a/pcbdevice/gcode/__init__.py b/gcodeextractor/gcode/__init__.py similarity index 100% rename from pcbdevice/gcode/__init__.py rename to gcodeextractor/gcode/__init__.py diff --git a/pcbdevice/gcode/path.py b/gcodeextractor/gcode/path.py similarity index 100% rename from pcbdevice/gcode/path.py rename to gcodeextractor/gcode/path.py diff --git a/pcbdevice/main.py b/gcodeextractor/main.py similarity index 83% rename from pcbdevice/main.py rename to gcodeextractor/main.py index 608ec35..c92a8ef 100644 --- a/pcbdevice/main.py +++ b/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 pcbdevice.gcode.path import path -from pcbdevice.utils.FileUtils import FileUtils +from gcodeextractor.gcode.GcodeCreator import createSequence +from gcodeextractor.gcode.path import path +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]) diff --git a/pcbdevice/models/Coordinates.py b/gcodeextractor/models/Coordinates.py similarity index 100% rename from pcbdevice/models/Coordinates.py rename to gcodeextractor/models/Coordinates.py diff --git a/pcbdevice/models/__init__.py b/gcodeextractor/models/__init__.py similarity index 100% rename from pcbdevice/models/__init__.py rename to gcodeextractor/models/__init__.py diff --git a/pcbdevice/tests/__init__.py b/gcodeextractor/tests/__init__.py similarity index 100% rename from pcbdevice/tests/__init__.py rename to gcodeextractor/tests/__init__.py diff --git a/pcbdevice/tests/gcode/__init__.py b/gcodeextractor/tests/gcode/__init__.py similarity index 100% rename from pcbdevice/tests/gcode/__init__.py rename to gcodeextractor/tests/gcode/__init__.py diff --git a/pcbdevice/tests/gcode/test_gcodeCreator.py b/gcodeextractor/tests/gcode/test_gcodeCreator.py similarity index 95% rename from pcbdevice/tests/gcode/test_gcodeCreator.py rename to gcodeextractor/tests/gcode/test_gcodeCreator.py index d964f4e..1833add 100644 --- a/pcbdevice/tests/gcode/test_gcodeCreator.py +++ b/gcodeextractor/tests/gcode/test_gcodeCreator.py @@ -1,7 +1,7 @@ from unittest import TestCase -from pcbdevice.gcode.GcodeCreator import createSequence, findDirection, findEndOfLine -from pcbdevice.models.Coordinates import Coordinate +from gcodeextractor.gcode.GcodeCreator import createSequence, findDirection, findEndOfLine +from gcodeextractor.models.Coordinates import Coordinate class TestGcodeCreator(TestCase): diff --git a/pcbdevice/tests/gcode/test_listToGcode.py b/gcodeextractor/tests/gcode/test_listToGcode.py similarity index 94% rename from pcbdevice/tests/gcode/test_listToGcode.py rename to gcodeextractor/tests/gcode/test_listToGcode.py index b09429b..d0578b7 100644 --- a/pcbdevice/tests/gcode/test_listToGcode.py +++ b/gcodeextractor/tests/gcode/test_listToGcode.py @@ -1,7 +1,7 @@ from unittest import TestCase -from pcbdevice.gcode.GcodeBuilder import listToGCode -from pcbdevice.models.Coordinates import Coordinate +from gcodeextractor.gcode.GcodeBuilder import listToGCode +from gcodeextractor.models.Coordinates import Coordinate class TestListToGCode(TestCase): diff --git a/pcbdevice/tests/gcode/test_path.py b/gcodeextractor/tests/gcode/test_path.py similarity index 98% rename from pcbdevice/tests/gcode/test_path.py rename to gcodeextractor/tests/gcode/test_path.py index 5ff8817..deb6376 100644 --- a/pcbdevice/tests/gcode/test_path.py +++ b/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): diff --git a/pcbdevice/tests/resources/expected/imagetest-11.csv b/gcodeextractor/tests/resources/expected/imagetest-11.csv similarity index 100% rename from pcbdevice/tests/resources/expected/imagetest-11.csv rename to gcodeextractor/tests/resources/expected/imagetest-11.csv diff --git a/pcbdevice/tests/resources/expected/imagetest-22.csv b/gcodeextractor/tests/resources/expected/imagetest-22.csv similarity index 100% rename from pcbdevice/tests/resources/expected/imagetest-22.csv rename to gcodeextractor/tests/resources/expected/imagetest-22.csv diff --git a/pcbdevice/tests/resources/expected/imagetest-33.csv b/gcodeextractor/tests/resources/expected/imagetest-33.csv similarity index 100% rename from pcbdevice/tests/resources/expected/imagetest-33.csv rename to gcodeextractor/tests/resources/expected/imagetest-33.csv diff --git a/pcbdevice/tests/resources/expected/test100x100.csv b/gcodeextractor/tests/resources/expected/test100x100.csv similarity index 100% rename from pcbdevice/tests/resources/expected/test100x100.csv rename to gcodeextractor/tests/resources/expected/test100x100.csv diff --git a/pcbdevice/tests/resources/expected/text1.txt b/gcodeextractor/tests/resources/expected/text1.txt similarity index 100% rename from pcbdevice/tests/resources/expected/text1.txt rename to gcodeextractor/tests/resources/expected/text1.txt diff --git a/pcbdevice/tests/resources/expected/text2.txt b/gcodeextractor/tests/resources/expected/text2.txt similarity index 100% rename from pcbdevice/tests/resources/expected/text2.txt rename to gcodeextractor/tests/resources/expected/text2.txt diff --git a/pcbdevice/tests/resources/formatted/test1.csv b/gcodeextractor/tests/resources/formatted/test1.csv similarity index 100% rename from pcbdevice/tests/resources/formatted/test1.csv rename to gcodeextractor/tests/resources/formatted/test1.csv diff --git a/pcbdevice/tests/resources/formatted/test100x100.csv b/gcodeextractor/tests/resources/formatted/test100x100.csv similarity index 100% rename from pcbdevice/tests/resources/formatted/test100x100.csv rename to gcodeextractor/tests/resources/formatted/test100x100.csv diff --git a/pcbdevice/tests/resources/formatted/testimagestest-11.csv b/gcodeextractor/tests/resources/formatted/testimagestest-11.csv similarity index 100% rename from pcbdevice/tests/resources/formatted/testimagestest-11.csv rename to gcodeextractor/tests/resources/formatted/testimagestest-11.csv diff --git a/pcbdevice/tests/resources/formatted/testimagestest-22.csv b/gcodeextractor/tests/resources/formatted/testimagestest-22.csv similarity index 100% rename from pcbdevice/tests/resources/formatted/testimagestest-22.csv rename to gcodeextractor/tests/resources/formatted/testimagestest-22.csv diff --git a/pcbdevice/tests/resources/formatted/testimagestest-33.csv b/gcodeextractor/tests/resources/formatted/testimagestest-33.csv similarity index 100% rename from pcbdevice/tests/resources/formatted/testimagestest-33.csv rename to gcodeextractor/tests/resources/formatted/testimagestest-33.csv diff --git a/pcbdevice/tests/resources/formatted/testvert.csv b/gcodeextractor/tests/resources/formatted/testvert.csv similarity index 100% rename from pcbdevice/tests/resources/formatted/testvert.csv rename to gcodeextractor/tests/resources/formatted/testvert.csv diff --git a/pcbdevice/tests/resources/output/test1.csv b/gcodeextractor/tests/resources/output/test1.csv similarity index 100% rename from pcbdevice/tests/resources/output/test1.csv rename to gcodeextractor/tests/resources/output/test1.csv diff --git a/gcodeextractor/tests/resources/output/text1.txt b/gcodeextractor/tests/resources/output/text1.txt new file mode 100644 index 0000000..8e78941 --- /dev/null +++ b/gcodeextractor/tests/resources/output/text1.txt @@ -0,0 +1,5 @@ +This +is +a + +test diff --git a/gcodeextractor/tests/resources/output/text2.txt b/gcodeextractor/tests/resources/output/text2.txt new file mode 100644 index 0000000..c7cf44c --- /dev/null +++ b/gcodeextractor/tests/resources/output/text2.txt @@ -0,0 +1,5 @@ +G28 +G90 +G0 Z3 + +G0 X15 Y45 diff --git a/pcbdevice/tests/resources/raw/imagestest-11.pbm b/gcodeextractor/tests/resources/raw/imagestest-11.pbm similarity index 100% rename from pcbdevice/tests/resources/raw/imagestest-11.pbm rename to gcodeextractor/tests/resources/raw/imagestest-11.pbm diff --git a/pcbdevice/tests/resources/raw/imagestest-22.pbm b/gcodeextractor/tests/resources/raw/imagestest-22.pbm similarity index 100% rename from pcbdevice/tests/resources/raw/imagestest-22.pbm rename to gcodeextractor/tests/resources/raw/imagestest-22.pbm diff --git a/pcbdevice/tests/resources/raw/imagestest-33.pbm b/gcodeextractor/tests/resources/raw/imagestest-33.pbm similarity index 100% rename from pcbdevice/tests/resources/raw/imagestest-33.pbm rename to gcodeextractor/tests/resources/raw/imagestest-33.pbm diff --git a/pcbdevice/tests/resources/raw/test1.pbm b/gcodeextractor/tests/resources/raw/test1.pbm similarity index 100% rename from pcbdevice/tests/resources/raw/test1.pbm rename to gcodeextractor/tests/resources/raw/test1.pbm diff --git a/pcbdevice/tests/resources/raw/test100x100.pbm b/gcodeextractor/tests/resources/raw/test100x100.pbm similarity index 100% rename from pcbdevice/tests/resources/raw/test100x100.pbm rename to gcodeextractor/tests/resources/raw/test100x100.pbm diff --git a/pcbdevice/tests/resources/raw/test1ascii.pbm b/gcodeextractor/tests/resources/raw/test1ascii.pbm similarity index 100% rename from pcbdevice/tests/resources/raw/test1ascii.pbm rename to gcodeextractor/tests/resources/raw/test1ascii.pbm diff --git a/pcbdevice/tests/utils/__init__.py b/gcodeextractor/tests/utils/__init__.py similarity index 100% rename from pcbdevice/tests/utils/__init__.py rename to gcodeextractor/tests/utils/__init__.py diff --git a/pcbdevice/tests/utils/test_fileUtils.py b/gcodeextractor/tests/utils/test_fileUtils.py similarity index 89% rename from pcbdevice/tests/utils/test_fileUtils.py rename to gcodeextractor/tests/utils/test_fileUtils.py index 69054b2..c79a901 100644 --- a/pcbdevice/tests/utils/test_fileUtils.py +++ b/gcodeextractor/tests/utils/test_fileUtils.py @@ -1,10 +1,10 @@ from unittest import TestCase -from pcbdevice.utils import TestUtils -from pcbdevice.utils.FileUtils import FileUtils -from pcbdevice.utils.TestUtils import readStringFile +from gcodeextractor.utils import TestUtils +from gcodeextractor.utils.FileUtils import FileUtils +from gcodeextractor.utils.TestUtils import readStringFile -resources = './pcbdevice/tests/resources/' +resources = './gcodeextractor/tests/resources/' class TestFileUtils(TestCase): def test_pbmToMatrix(self): diff --git a/pcbdevice/utils/FileUtils.py b/gcodeextractor/utils/FileUtils.py similarity index 100% rename from pcbdevice/utils/FileUtils.py rename to gcodeextractor/utils/FileUtils.py diff --git a/pcbdevice/utils/TestUtils.py b/gcodeextractor/utils/TestUtils.py similarity index 100% rename from pcbdevice/utils/TestUtils.py rename to gcodeextractor/utils/TestUtils.py diff --git a/pcbdevice/utils/__init__.py b/gcodeextractor/utils/__init__.py similarity index 100% rename from pcbdevice/utils/__init__.py rename to gcodeextractor/utils/__init__.py diff --git a/pcbdevice/utils/convertiseur.exe b/gcodeextractor/utils/convertiseur.exe similarity index 100% rename from pcbdevice/utils/convertiseur.exe rename to gcodeextractor/utils/convertiseur.exe diff --git a/pcbdevice/utils/plotimg.py b/gcodeextractor/utils/plotimg.py similarity index 100% rename from pcbdevice/utils/plotimg.py rename to gcodeextractor/utils/plotimg.py