AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split placeSchematic from importSchematic for already-loaded schematics

Browse Source
This commit is contained in:
David Vierra 2016-09-16 03:58:58 -10:00
parent 4ed9d10174
commit 4aff8bbf58
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mcedit2/editorsession.py
View File

@ -1104,10 +1104,12 @@ class EditorSession(QtCore.QObject):
def importSchematic(self, filename, importPos=None): def importSchematic(self, filename, importPos=None):
try: try:
schematic = WorldEditor(filename, readonly=True) schematic = WorldEditor(filename, readonly=True)
self.placeSchematic(schematic, importPos, os.path.basename(filename))
except UnknownFormatError: except UnknownFormatError:
log.exception("Unknown format.") log.exception("Unknown format.")
return return
def placeSchematic(self, schematic, importPos=None, name="Unknown"):
ray = self.editorTab.currentView().rayAtCenter() ray = self.editorTab.currentView().rayAtCenter()
if importPos is not None: if importPos is not None:
pos = importPos pos = importPos
@ -1121,12 +1123,11 @@ class EditorSession(QtCore.QObject):
else: else:
pos = pos + face.vector pos = pos + face.vector
name = os.path.basename(filename)
dim = schematic.getDimension() dim = schematic.getDimension()
center = dim.bounds.center center = dim.bounds.center
bottomCenter = pos - (center[0], 0, center[2]) 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) command = PasteImportCommand(self, imp, "Import %s" % name)
self.undoStack.push(command) self.undoStack.push(command)