Auto-format analyze.py and analyze.py
Increase default size of analyze dialog Remove dead code Improve comments
This commit is contained in:
David Vierra
parent
6d0e89f821
commit
d67f115a5c
@ -5,42 +5,40 @@ from __future__ import absolute_import
|
||||
from PySide import QtGui, QtCore
|
||||
import logging
|
||||
import operator
|
||||
import numpy
|
||||
import arrow
|
||||
from mcedit2.util.load_ui import load_ui
|
||||
from mcedit2.util.settings import Settings
|
||||
from mcedit2.util.directories import getUserFilesDirectory
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class AnalyzeOutputDialog(QtGui.QDialog):
|
||||
def __init__(self, editorSession, blockCount, entityCount, tileEntityCount, worldName, parent=None, *args, **kwargs):
|
||||
def __init__(self, editorSession, blockCount, entityCount, tileEntityCount, worldName, parent=None, *args,
|
||||
**kwargs):
|
||||
super(AnalyzeOutputDialog, self).__init__(parent, *args, **kwargs)
|
||||
|
||||
|
||||
self.editorSession = editorSession
|
||||
self.blocktypes = editorSession.worldEditor.blocktypes
|
||||
self.worldName = worldName
|
||||
|
||||
|
||||
load_ui("analyze.ui", baseinstance=self)
|
||||
|
||||
|
||||
self.setupTables(blockCount, entityCount, tileEntityCount)
|
||||
self.txtButton.clicked.connect(self.export_txt)
|
||||
self.csvButton.clicked.connect(self.export_csv)
|
||||
|
||||
self.adjustSize()
|
||||
self.exec_()
|
||||
|
||||
|
||||
self.exec_()
|
||||
|
||||
def setupTables(self, blockCount, entityCount, tileEntityCount):
|
||||
blockTableView = self.blockOutputTableView
|
||||
blockCounts = sorted([(self.editorSession.worldEditor.blocktypes[ i & 0xfff, i >> 12], blockCount[i])
|
||||
for i in blockCount.nonzero()[0]])
|
||||
blockCounts = sorted([(self.editorSession.worldEditor.blocktypes[i & 0xfff, i >> 12], blockCount[i])
|
||||
for i in blockCount.nonzero()[0]])
|
||||
self.blockArrayData = [(output[0].displayName, output[0].ID,
|
||||
output[0].meta, output[1])
|
||||
for n, output in enumerate(blockCounts)]
|
||||
blockArrayHeaders = ['Name', 'ID', 'Data', 'Count']
|
||||
self.setupTable(self.blockArrayData, blockArrayHeaders, blockTableView)
|
||||
|
||||
|
||||
|
||||
entityTableView = self.entityOutputTableView
|
||||
self.entityArrayData = []
|
||||
for c in entityCount, tileEntityCount:
|
||||
@ -51,93 +49,91 @@ class AnalyzeOutputDialog(QtGui.QDialog):
|
||||
|
||||
def setupTable(self, arraydata, headerdata, tableView):
|
||||
tableModel = CustomTableModel(arraydata, headerdata)
|
||||
|
||||
|
||||
tableView.setModel(tableModel)
|
||||
tableView.verticalHeader().setVisible(False)
|
||||
tableView.horizontalHeader().setStretchLastSection(True)
|
||||
tableView.resizeColumnsToContents()
|
||||
tableView.resizeRowsToContents()
|
||||
tableView.resizeRowsToContents()
|
||||
tableView.setSortingEnabled(True)
|
||||
|
||||
|
||||
# -- Exporting stuff --
|
||||
|
||||
|
||||
# -- Exporting stuff --
|
||||
|
||||
def export_csv(self):
|
||||
startingDir = getUserFilesDirectory()
|
||||
name = self.worldName + "_" + arrow.now().format('DD_MM_YYYY_HH_mm_ss')
|
||||
file = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.mainWindow,
|
||||
result = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.mainWindow,
|
||||
self.tr("Export as .csv"),
|
||||
startingDir + "\\" + name,
|
||||
"Comma Seperated Values (*.csv);;Semicolon Seperated Values (*.csv)")
|
||||
if file and file[0]:
|
||||
"Comma Separated Values (*.csv);;Semicolon Separated Values (*.csv)")
|
||||
if result and result[0]:
|
||||
"""
|
||||
Depending on your region, your OS uses ";" or "," as a seperator in .csv files.
|
||||
(Some countries write 0.5 as 0,5; so they use ; to seperate values).
|
||||
If the user selects Semicolon Seperated Values, we seperate with ";" instead of ","
|
||||
Depending on your region, your OS uses ";" or "," as a seperator in .csv files.
|
||||
(Some countries write 0.5 as 0,5; so they use ; to separate values).
|
||||
If the user selects Semicolon Separated Values, we separate with ";" instead of ","
|
||||
"""
|
||||
sep = (";" if (file[1] == "Semicolon Seperated Values (*.csv)") else ",")
|
||||
self.writeFile(file[0], sep)
|
||||
|
||||
sep = (";" if (result[1] == "Semicolon Separated Values (*.csv)") else ",")
|
||||
self.writeFile(result[0], sep)
|
||||
|
||||
def export_txt(self):
|
||||
startingDir = getUserFilesDirectory()
|
||||
name = self.worldName + "_" + arrow.now().format('DD_MM_YYYY_HH_mm_ss')
|
||||
file = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.mainWindow,
|
||||
result = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.mainWindow,
|
||||
self.tr("Export as .txt"),
|
||||
startingDir + "\\" + name,
|
||||
"Text File (*.txt)")
|
||||
if file and file[0]:
|
||||
if result and result[0]:
|
||||
sep = "\t"
|
||||
self.writeFile(file[0], sep)
|
||||
|
||||
self.writeFile(result[0], sep)
|
||||
|
||||
def writeFile(self, filename, sep):
|
||||
with open(filename, 'w') as f:
|
||||
f.write("Blocks:\n")
|
||||
f.write("Name" + sep + "Id" + sep + "Data" + sep + "Count\n")
|
||||
for b in self.blockArrayData:
|
||||
string = b[0] + unicode(sep + str(b[1]) + sep + str(b[2]) + sep + str(b[3]) + "\n", encoding="utf-8") #xxx Unrolled loop
|
||||
f.write(string.encode('utf8'))
|
||||
string = b[0] + unicode(sep + str(b[1]) + sep + str(b[2]) + sep + str(b[3]) + "\n",
|
||||
encoding="utf-8") # xxx Unrolled loop
|
||||
f.write(string.encode('utf8'))
|
||||
f.write("\nEntities:\n")
|
||||
f.write("Name" + sep + "Count\n")
|
||||
for e in self.entityArrayData:
|
||||
string = e[0] + unicode(sep + str(e[1]) + "\n", encoding='utf-8') #xxx Unrolled loop
|
||||
string = e[0] + unicode(sep + str(e[1]) + "\n", encoding='utf-8') # xxx Unrolled loop
|
||||
f.write(string.encode('utf8'))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class CustomTableModel(QtCore.QAbstractTableModel):
|
||||
def __init__(self, arraydata, headerdata, parent=None, *args, **kwargs):
|
||||
QtCore.QAbstractTableModel.__init__(self, parent, *args, **kwargs)
|
||||
self.arraydata = arraydata
|
||||
self.headerdata = headerdata
|
||||
|
||||
|
||||
def rowCount(self, parent):
|
||||
return len(self.arraydata)
|
||||
|
||||
|
||||
def columnCount(self, parent):
|
||||
return len(self.headerdata)
|
||||
|
||||
|
||||
def data(self, index, role):
|
||||
if not index.isValid():
|
||||
if not index.isValid():
|
||||
return None
|
||||
elif role != QtCore.Qt.DisplayRole:
|
||||
elif role != QtCore.Qt.DisplayRole:
|
||||
return None
|
||||
return str(self.arraydata[index.row()][index.column()])
|
||||
|
||||
|
||||
def headerData(self, col, orientation, role):
|
||||
if orientation == QtCore.Qt.Horizontal and role == QtCore.Qt.DisplayRole:
|
||||
return str(self.headerdata[col])
|
||||
return None
|
||||
|
||||
|
||||
def sort(self, Ncol, order):
|
||||
"""
|
||||
Sort table by given column number.
|
||||
"""
|
||||
self.layoutAboutToBeChanged.emit()
|
||||
self.arraydata = sorted(self.arraydata, key=operator.itemgetter(Ncol))
|
||||
self.arraydata = sorted(self.arraydata, key=operator.itemgetter(Ncol))
|
||||
if order == QtCore.Qt.DescendingOrder:
|
||||
self.arraydata.reverse()
|
||||
self.layoutChanged.emit()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -6,35 +6,33 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>409</width>
|
||||
<height>193</height>
|
||||
<width>622</width>
|
||||
<height>585</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Analyze Output</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,2,0,0,0">
|
||||
<item>
|
||||
<widget class="QLabel">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Blocks Found:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTableView" name="blockOutputTableView">
|
||||
</widget>
|
||||
<widget class="QTableView" name="blockOutputTableView"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Entities Found:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTableView" name="entityOutputTableView">
|
||||
</widget>
|
||||
<widget class="QTableView" name="entityOutputTableView"/>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
@ -83,7 +81,7 @@
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>closeButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
"""
|
||||
block_fill.py
|
||||
analyze.py
|
||||
|
||||
Optimized functions for mass-replacing blocks in a world.
|
||||
Get counts of blocks, entities, and tile entities in a selection.
|
||||
"""
|
||||
from __future__ import absolute_import
|
||||
import logging
|
||||
@ -13,11 +13,12 @@ from mceditlib.operations import Operation
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
||||
class AnalyzeOperation(Operation):
|
||||
def __init__(self, dimension, selection):
|
||||
"""
|
||||
Analyze all blocks in a selection.
|
||||
Analyze all blocks in a selection and return counts of block types, entity IDs and tile entity IDs.
|
||||
|
||||
Counts are returned in `self.blocks`, `self.entityCounts` and `self.tileEntityCounts`
|
||||
|
||||
:type dimension: WorldEditorDimension
|
||||
:type selection: `~.BoundingBox`
|
||||
@ -30,50 +31,43 @@ class AnalyzeOperation(Operation):
|
||||
self.entityCounts = defaultdict(int)
|
||||
self.tileEntityCounts = defaultdict(int)
|
||||
|
||||
self.chunkCount = 0
|
||||
self.skipped = 0
|
||||
self.sections = 0
|
||||
log.info("Analyzing %s blocks", selection.volume)
|
||||
|
||||
def done(self):
|
||||
log.info(u"Analyze: Skipped {0}/{1} sections".format(self.skipped, self.sections))
|
||||
#self.dimension.worldEditor.analyzeBlockOutput = self.blocks
|
||||
#self.dimension.worldEditor.analyzeEntityOutput = self.entityCounts
|
||||
#self.dimension.worldEditor.analyzeTileEntityOutput = self.tileEntityCounts
|
||||
|
||||
def operateOnChunk(self, chunk):
|
||||
self.chunkCount += 1
|
||||
|
||||
cx, cz = chunk.cx, chunk.cz
|
||||
|
||||
for cy in chunk.bounds.sectionPositions(cx, cz):
|
||||
section = chunk.getSection(cy, create=False)
|
||||
|
||||
|
||||
if section is None:
|
||||
continue
|
||||
self.sections += 1
|
||||
|
||||
|
||||
sectionMask = self.selection.section_mask(cx, cy, cz)
|
||||
if sectionMask is None:
|
||||
self.skipped += 1
|
||||
continue
|
||||
|
||||
|
||||
maskSize = sectionMask.sum()
|
||||
if maskSize == 0:
|
||||
self.skipped += 1
|
||||
continue
|
||||
|
||||
|
||||
|
||||
blocks = numpy.array(section.Blocks[sectionMask], dtype='uint16')
|
||||
blocks |= (numpy.array(section.Data[sectionMask], dtype='uint16') << 12)
|
||||
b = numpy.bincount(blocks.ravel())
|
||||
|
||||
|
||||
self.blocks[:b.shape[0]] += b
|
||||
|
||||
|
||||
for ref in chunk.Entities:
|
||||
if ref.Position in self.selection:
|
||||
self.entityCounts[ref.id] += 1
|
||||
|
||||
|
||||
for ref in chunk.TileEntities:
|
||||
if ref.Position in self.selection:
|
||||
self.tileEntityCounts[ref.id] += 1
|
||||
|
||||
Reference in New Issue
Block a user