diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 095aa4c4..6774960f 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -17,7 +17,7 @@ import re import webbrowser import os import tkinter -from PyQt4 import QtCore +from PyQt4 import Qt, QtCore, QtGui import time # Just used for debugging. Double check before removing. from xml.dom.minidom import parseString as parse_xml_string from contextlib import contextmanager @@ -27,10 +27,10 @@ from contextlib import contextmanager ######################################## import FlatCAMVersion from FlatCAMWorker import Worker -from ObjectCollection import * -from FlatCAMObj import * -from PlotCanvas import * -from FlatCAMGUI import * +import ObjectCollection +from FlatCAMObj import FlatCAMCNCjob, FlatCAMExcellon, FlatCAMGerber, FlatCAMGeometry, FlatCAMObj +from PlotCanvas import PlotCanvas +from FlatCAMGUI import FlatCAMGUI, GlobalOptionsUI, FlatCAMActivityView, FlatCAMInfoBar from FlatCAMCommon import LoudDict from FlatCAMShell import FCShell from FlatCAMDraw import FlatCAMDraw @@ -39,6 +39,8 @@ from MeasurementTool import Measurement from DblSidedTool import DblSidedTool import tclCommands +from camlib import * + ######################################## ## App ## @@ -471,7 +473,7 @@ class App(QtCore.QObject): #self.options_write_form() self.on_options_combo_change(0) # Will show the initial form - self.collection = ObjectCollection() + self.collection = ObjectCollection.ObjectCollection() self.ui.project_tab_layout.addWidget(self.collection.view) #### End of Data #### @@ -1065,7 +1067,7 @@ class App(QtCore.QObject): t3 = time.time() self.log.debug("%f seconds converting units." % (t3 - t2)) - FlatCAMApp.App.log.debug("Moving new object back to main thread.") + self.log.debug("Moving new object back to main thread.") # Move the object to the main thread and let the app know that it is available. obj.moveToThread(QtGui.QApplication.instance().thread()) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 6599f873..d3d6bf37 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -221,7 +221,7 @@ class FlatCAMObj(QtCore.QObject): try: self.form_fields[option].set_value(self.options[option]) except KeyError: - self.app.log.warn("Tried to set an option or field that does not exist: %s" % option) + self.app.log.warning("Tried to set an option or field that does not exist: %s" % option) def read_form_item(self, option): """ diff --git a/ObjectCollection.py b/ObjectCollection.py index 211c5a82..377e88db 100644 --- a/ObjectCollection.py +++ b/ObjectCollection.py @@ -6,7 +6,6 @@ # MIT Licence # ############################################################ -#from PyQt4.QtCore import QModelIndex from FlatCAMObj import * import inspect # TODO: Remove import FlatCAMApp @@ -162,13 +161,13 @@ class ObjectCollection(): self.object_list.append(obj) # Create the model item to insert into the QListView - icon = QtGui.QIcon(self.icons[obj.kind])#self.icons["gerber"]) - item = QtGui.QStandardItem(icon, name) + icon = QtGui.QIcon(self.icons[obj.kind]) #self.icons["gerber"]) + item = QtGui.QStandardItem(icon, str(name)) item.setCheckable(True) - if obj.options["plot"] == True: - item.setCheckState(2)#Qt.Checked) + if obj.options["plot"] is True: + item.setCheckState(2) #Qt.Checked) else: - item.setCheckState(0) #Qt.Unchecked) + item.setCheckState(0) #Qt.Unchecked) self.model.appendRow(item) @@ -289,7 +288,7 @@ class ObjectCollection(): :param name: Name of the FlatCAM Object :return: None """ - iobj = self.createIndex(self.get_names().index(name), 0) # Column 0 + iobj = self.model.createIndex(self.get_names().index(name), 0) # Column 0 self.view.selectionModel().select(iobj, QtGui.QItemSelectionModel.Select) def set_inactive(self, name): @@ -300,7 +299,7 @@ class ObjectCollection(): :param name: Name of the FlatCAM Object :return: None """ - iobj = self.createIndex(self.get_names().index(name), 0) # Column 0 + iobj = self.model.createIndex(self.get_names().index(name), 0) # Column 0 self.view.selectionModel().select(iobj, QtGui.QItemSelectionModel.Deselect) def set_all_inactive(self): diff --git a/tclCommands/TclCommand.py b/tclCommands/TclCommand.py index 554d319e..45a0e6c6 100644 --- a/tclCommands/TclCommand.py +++ b/tclCommands/TclCommand.py @@ -5,6 +5,7 @@ import abc import collections from PyQt4 import QtCore from contextlib import contextmanager +from FlatCAMObj import FlatCAMGerber, FlatCAMExcellon, FlatCAMGeometry, FlatCAMCNCjob, FlatCAMObj class TclCommand(object): diff --git a/tclCommands/TclCommandAddCircle.py b/tclCommands/TclCommandAddCircle.py index a83777fa..868848a4 100644 --- a/tclCommands/TclCommandAddCircle.py +++ b/tclCommands/TclCommandAddCircle.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandAddCircle(TclCommand): diff --git a/tclCommands/TclCommandAddPolygon.py b/tclCommands/TclCommandAddPolygon.py index 5c6d7923..79fd5b02 100644 --- a/tclCommands/TclCommandAddPolygon.py +++ b/tclCommands/TclCommandAddPolygon.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandAddPolygon(TclCommandSignaled): diff --git a/tclCommands/TclCommandAddPolyline.py b/tclCommands/TclCommandAddPolyline.py index 18e58096..f449e0c2 100644 --- a/tclCommands/TclCommandAddPolyline.py +++ b/tclCommands/TclCommandAddPolyline.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandAddPolyline(TclCommandSignaled): diff --git a/tclCommands/TclCommandAddRectangle.py b/tclCommands/TclCommandAddRectangle.py index 7b1e6b9f..e190a399 100644 --- a/tclCommands/TclCommandAddRectangle.py +++ b/tclCommands/TclCommandAddRectangle.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandAddRectangle(TclCommandSignaled): diff --git a/tclCommands/TclCommandAlignDrill.py b/tclCommands/TclCommandAlignDrill.py index 6fbaf7c0..1cd1f129 100644 --- a/tclCommands/TclCommandAlignDrill.py +++ b/tclCommands/TclCommandAlignDrill.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandAlignDrill(TclCommandSignaled): diff --git a/tclCommands/TclCommandAlignDrillGrid.py b/tclCommands/TclCommandAlignDrillGrid.py index a90397b6..2cac28a1 100644 --- a/tclCommands/TclCommandAlignDrillGrid.py +++ b/tclCommands/TclCommandAlignDrillGrid.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandAlignDrillGrid(TclCommandSignaled): diff --git a/tclCommands/TclCommandCncjob.py b/tclCommands/TclCommandCncjob.py index 773c7234..09a1260a 100644 --- a/tclCommands/TclCommandCncjob.py +++ b/tclCommands/TclCommandCncjob.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandCncjob(TclCommandSignaled): diff --git a/tclCommands/TclCommandCutout.py b/tclCommands/TclCommandCutout.py index 40e83b01..8d0cc4f8 100644 --- a/tclCommands/TclCommandCutout.py +++ b/tclCommands/TclCommandCutout.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandCutout(TclCommand): diff --git a/tclCommands/TclCommandDelete.py b/tclCommands/TclCommandDelete.py index 455dfe60..8706722b 100644 --- a/tclCommands/TclCommandDelete.py +++ b/tclCommands/TclCommandDelete.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandDelete(TclCommand): diff --git a/tclCommands/TclCommandDrillcncjob.py b/tclCommands/TclCommandDrillcncjob.py index 2ecc451c..cba89704 100644 --- a/tclCommands/TclCommandDrillcncjob.py +++ b/tclCommands/TclCommandDrillcncjob.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandDrillcncjob(TclCommandSignaled): diff --git a/tclCommands/TclCommandExportGcode.py b/tclCommands/TclCommandExportGcode.py index 84d0b676..d5f10df2 100644 --- a/tclCommands/TclCommandExportGcode.py +++ b/tclCommands/TclCommandExportGcode.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandExportGcode(TclCommandSignaled): diff --git a/tclCommands/TclCommandExportSVG.py b/tclCommands/TclCommandExportSVG.py index 7084e980..07fb65b6 100644 --- a/tclCommands/TclCommandExportSVG.py +++ b/tclCommands/TclCommandExportSVG.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandExportSVG(TclCommand): diff --git a/tclCommands/TclCommandExteriors.py b/tclCommands/TclCommandExteriors.py index 6c93bb59..750ec6ce 100644 --- a/tclCommands/TclCommandExteriors.py +++ b/tclCommands/TclCommandExteriors.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandExteriors(TclCommandSignaled): @@ -54,7 +53,7 @@ class TclCommandExteriors(TclCommandSignaled): if obj is None: self.raise_tcl_error("Object not found: %s" % name) - if not isinstance(obj, Geometry): + if not isinstance(obj, FlatCAMGeometry): self.raise_tcl_error('Expected Geometry, got %s %s.' % (name, type(obj))) def geo_init(geo_obj, app_obj): diff --git a/tclCommands/TclCommandGeoCutout.py b/tclCommands/TclCommandGeoCutout.py index 1b905845..bca56b72 100644 --- a/tclCommands/TclCommandGeoCutout.py +++ b/tclCommands/TclCommandGeoCutout.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandGeoCutout(TclCommandSignaled): diff --git a/tclCommands/TclCommandGeoUnion.py b/tclCommands/TclCommandGeoUnion.py index d0294e93..3ecbb6d4 100644 --- a/tclCommands/TclCommandGeoUnion.py +++ b/tclCommands/TclCommandGeoUnion.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandGeoUnion(TclCommand): diff --git a/tclCommands/TclCommandGetNames.py b/tclCommands/TclCommandGetNames.py index db4524f0..e6e0a461 100644 --- a/tclCommands/TclCommandGetNames.py +++ b/tclCommands/TclCommandGetNames.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandGetNames(TclCommand): diff --git a/tclCommands/TclCommandGetSys.py b/tclCommands/TclCommandGetSys.py index 635decad..2cb213c4 100644 --- a/tclCommands/TclCommandGetSys.py +++ b/tclCommands/TclCommandGetSys.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandGetSys(TclCommand): diff --git a/tclCommands/TclCommandImportSvg.py b/tclCommands/TclCommandImportSvg.py index fa940439..b49dac02 100644 --- a/tclCommands/TclCommandImportSvg.py +++ b/tclCommands/TclCommandImportSvg.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandImportSvg(TclCommandSignaled): diff --git a/tclCommands/TclCommandInteriors.py b/tclCommands/TclCommandInteriors.py index 00a6a1a6..70d37c48 100644 --- a/tclCommands/TclCommandInteriors.py +++ b/tclCommands/TclCommandInteriors.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandInteriors(TclCommandSignaled): diff --git a/tclCommands/TclCommandIsolate.py b/tclCommands/TclCommandIsolate.py index 93ad41d0..dc1ab1fa 100644 --- a/tclCommands/TclCommandIsolate.py +++ b/tclCommands/TclCommandIsolate.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandIsolate(TclCommandSignaled): diff --git a/tclCommands/TclCommandJoinExcellon.py b/tclCommands/TclCommandJoinExcellon.py index ef2654ca..64c20e78 100644 --- a/tclCommands/TclCommandJoinExcellon.py +++ b/tclCommands/TclCommandJoinExcellon.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandJoinExcellon(TclCommand): diff --git a/tclCommands/TclCommandJoinGeometry.py b/tclCommands/TclCommandJoinGeometry.py index 90beac4f..18ca2d38 100644 --- a/tclCommands/TclCommandJoinGeometry.py +++ b/tclCommands/TclCommandJoinGeometry.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandJoinGeometry(TclCommand): diff --git a/tclCommands/TclCommandMillHoles.py b/tclCommands/TclCommandMillHoles.py index 88dbeb79..214b4226 100644 --- a/tclCommands/TclCommandMillHoles.py +++ b/tclCommands/TclCommandMillHoles.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandMillHoles(TclCommandSignaled): diff --git a/tclCommands/TclCommandMirror.py b/tclCommands/TclCommandMirror.py index db7ec3c8..437d741b 100644 --- a/tclCommands/TclCommandMirror.py +++ b/tclCommands/TclCommandMirror.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandMirror(TclCommandSignaled): diff --git a/tclCommands/TclCommandNew.py b/tclCommands/TclCommandNew.py index bf386d0c..2607035a 100644 --- a/tclCommands/TclCommandNew.py +++ b/tclCommands/TclCommandNew.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandNew(TclCommand): diff --git a/tclCommands/TclCommandNewGeometry.py b/tclCommands/TclCommandNewGeometry.py index 349f8842..b543c439 100644 --- a/tclCommands/TclCommandNewGeometry.py +++ b/tclCommands/TclCommandNewGeometry.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandNewGeometry(TclCommandSignaled): diff --git a/tclCommands/TclCommandOffset.py b/tclCommands/TclCommandOffset.py index 7031c0db..09f5f28e 100644 --- a/tclCommands/TclCommandOffset.py +++ b/tclCommands/TclCommandOffset.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandOffset(TclCommand): diff --git a/tclCommands/TclCommandOpenExcellon.py b/tclCommands/TclCommandOpenExcellon.py index 69f8ce70..3b731fa6 100644 --- a/tclCommands/TclCommandOpenExcellon.py +++ b/tclCommands/TclCommandOpenExcellon.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandOpenExcellon(TclCommandSignaled): diff --git a/tclCommands/TclCommandOpenGCode.py b/tclCommands/TclCommandOpenGCode.py index 99314365..10c475b4 100644 --- a/tclCommands/TclCommandOpenGCode.py +++ b/tclCommands/TclCommandOpenGCode.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandOpenGCode(TclCommandSignaled): diff --git a/tclCommands/TclCommandOpenGerber.py b/tclCommands/TclCommandOpenGerber.py index 0dd00d38..0ad4bba7 100644 --- a/tclCommands/TclCommandOpenGerber.py +++ b/tclCommands/TclCommandOpenGerber.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandOpenGerber(TclCommandSignaled): @@ -48,7 +47,7 @@ class TclCommandOpenGerber(TclCommandSignaled): # How the object should be initialized def obj_init(gerber_obj, app_obj): - if not isinstance(gerber_obj, Geometry): + if not isinstance(gerber_obj, FlatCAMGerber): self.raise_tcl_error('Expected FlatCAMGerber, got %s %s.' % (outname, type(gerber_obj))) # Opening the file happens here diff --git a/tclCommands/TclCommandOpenProject.py b/tclCommands/TclCommandOpenProject.py index 97d39ad6..971f4f96 100644 --- a/tclCommands/TclCommandOpenProject.py +++ b/tclCommands/TclCommandOpenProject.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandOpenProject(TclCommandSignaled): diff --git a/tclCommands/TclCommandOptions.py b/tclCommands/TclCommandOptions.py index 443416cf..7f185621 100644 --- a/tclCommands/TclCommandOptions.py +++ b/tclCommands/TclCommandOptions.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandOptions(TclCommandSignaled): diff --git a/tclCommands/TclCommandPaint.py b/tclCommands/TclCommandPaint.py index 8a118290..f3222adb 100644 --- a/tclCommands/TclCommandPaint.py +++ b/tclCommands/TclCommandPaint.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandPaint(TclCommandSignaled): diff --git a/tclCommands/TclCommandPanelize.py b/tclCommands/TclCommandPanelize.py index 4dcd907e..7ddf3273 100644 --- a/tclCommands/TclCommandPanelize.py +++ b/tclCommands/TclCommandPanelize.py @@ -1,7 +1,5 @@ -from ObjectCollection import * from copy import copy,deepcopy - -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandPanelize(TclCommand): diff --git a/tclCommands/TclCommandPlot.py b/tclCommands/TclCommandPlot.py index d9d045b0..687b34db 100644 --- a/tclCommands/TclCommandPlot.py +++ b/tclCommands/TclCommandPlot.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandPlot(TclCommand): diff --git a/tclCommands/TclCommandSaveProject.py b/tclCommands/TclCommandSaveProject.py index 43bf73f3..c4a44c5d 100644 --- a/tclCommands/TclCommandSaveProject.py +++ b/tclCommands/TclCommandSaveProject.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandSaveProject(TclCommandSignaled): diff --git a/tclCommands/TclCommandScale.py b/tclCommands/TclCommandScale.py index 8a8f4068..3b561992 100644 --- a/tclCommands/TclCommandScale.py +++ b/tclCommands/TclCommandScale.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandScale(TclCommand): diff --git a/tclCommands/TclCommandSetActive.py b/tclCommands/TclCommandSetActive.py index 21aee2bf..19d9f000 100644 --- a/tclCommands/TclCommandSetActive.py +++ b/tclCommands/TclCommandSetActive.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandSetActive(TclCommand): diff --git a/tclCommands/TclCommandSetSys.py b/tclCommands/TclCommandSetSys.py index 2e0bab7c..aff86124 100644 --- a/tclCommands/TclCommandSetSys.py +++ b/tclCommands/TclCommandSetSys.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandSetSys(TclCommand): diff --git a/tclCommands/TclCommandSubtractPoly.py b/tclCommands/TclCommandSubtractPoly.py index 54cbf8f4..427b85f7 100644 --- a/tclCommands/TclCommandSubtractPoly.py +++ b/tclCommands/TclCommandSubtractPoly.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandSubtractPoly(TclCommandSignaled): diff --git a/tclCommands/TclCommandSubtractRectangle.py b/tclCommands/TclCommandSubtractRectangle.py index 1ec2838c..73d91284 100644 --- a/tclCommands/TclCommandSubtractRectangle.py +++ b/tclCommands/TclCommandSubtractRectangle.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandSubtractRectangle(TclCommandSignaled): diff --git a/tclCommands/TclCommandVersion.py b/tclCommands/TclCommandVersion.py index 86b539fd..a2977289 100644 --- a/tclCommands/TclCommandVersion.py +++ b/tclCommands/TclCommandVersion.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommand +from tclCommands.TclCommand import * class TclCommandVersion(TclCommand): diff --git a/tclCommands/TclCommandWriteGCode.py b/tclCommands/TclCommandWriteGCode.py index 1068def1..17919150 100644 --- a/tclCommands/TclCommandWriteGCode.py +++ b/tclCommands/TclCommandWriteGCode.py @@ -1,5 +1,4 @@ -from ObjectCollection import * -from tclCommands.TclCommand import TclCommandSignaled +from tclCommands.TclCommand import * class TclCommandWriteGCode(TclCommandSignaled):