From 4aff8bbf58643cfd9b952cf2586157fcf4759739 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Fri, 16 Sep 2016 03:58:58 -1000 Subject: [PATCH] Split placeSchematic from importSchematic for already-loaded schematics --- src/mcedit2/editorsession.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mcedit2/editorsession.py b/src/mcedit2/editorsession.py index d85f41b..d85a83a 100644 --- a/src/mcedit2/editorsession.py +++ b/src/mcedit2/editorsession.py @@ -1104,10 +1104,12 @@ class EditorSession(QtCore.QObject): def importSchematic(self, filename, importPos=None): try: schematic = WorldEditor(filename, readonly=True) + self.placeSchematic(schematic, importPos, os.path.basename(filename)) except UnknownFormatError: log.exception("Unknown format.") return - + + def placeSchematic(self, schematic, importPos=None, name="Unknown"): ray = self.editorTab.currentView().rayAtCenter() if importPos is not None: pos = importPos @@ -1121,12 +1123,11 @@ class EditorSession(QtCore.QObject): else: pos = pos + face.vector - name = os.path.basename(filename) dim = schematic.getDimension() center = dim.bounds.center bottomCenter = pos - (center[0], 0, center[2]) - imp = PendingImport(schematic.getDimension(), bottomCenter, dim.bounds, name) + imp = PendingImport(schematic.getDimension(), bottomCenter.intfloor(), dim.bounds, name) command = PasteImportCommand(self, imp, "Import %s" % name) self.undoStack.push(command)