mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-04-19 20:29:40 +08:00
Put ImageReader plugin in a new clean branch from 2.1. The plugin new uses numpy for geometry generation and image smoothing.
This commit is contained in:
Kurt Loeffler
Ghostkeeper
parent
9544602df5
commit
f5939df085
97
plugins/ImageReader/ConfigUI.qml
Normal file
97
plugins/ImageReader/ConfigUI.qml
Normal file
@ -0,0 +1,97 @@
|
||||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.1
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Window 2.1
|
||||
|
||||
import UM 1.1 as UM
|
||||
|
||||
UM.Dialog
|
||||
{
|
||||
width: 250*Screen.devicePixelRatio;
|
||||
minimumWidth: 250*Screen.devicePixelRatio;
|
||||
maximumWidth: 250*Screen.devicePixelRatio;
|
||||
|
||||
height: 200*Screen.devicePixelRatio;
|
||||
minimumHeight: 200*Screen.devicePixelRatio;
|
||||
maximumHeight: 200*Screen.devicePixelRatio;
|
||||
|
||||
modality: Qt.Modal
|
||||
|
||||
title: catalog.i18nc("@title:window", "Convert Image...")
|
||||
|
||||
GridLayout
|
||||
{
|
||||
anchors.fill: parent;
|
||||
Layout.fillWidth: true
|
||||
columnSpacing: 16
|
||||
rowSpacing: 4
|
||||
columns: 2
|
||||
|
||||
Text {
|
||||
text: catalog.i18nc("@action:label","Size")
|
||||
Layout.fillWidth:true
|
||||
}
|
||||
TextField {
|
||||
id: size
|
||||
focus: true
|
||||
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;}
|
||||
text: qsTr("120")
|
||||
onTextChanged: { manager.onSizeChanged(text) }
|
||||
}
|
||||
|
||||
Text {
|
||||
text: catalog.i18nc("@action:label","Base Height")
|
||||
Layout.fillWidth:true
|
||||
}
|
||||
TextField {
|
||||
id: base_height
|
||||
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;}
|
||||
text: qsTr("2")
|
||||
onTextChanged: { manager.onBaseHeightChanged(text) }
|
||||
}
|
||||
|
||||
Text {
|
||||
text: catalog.i18nc("@action:label","Peak Height")
|
||||
Layout.fillWidth:true
|
||||
}
|
||||
TextField {
|
||||
id: peak_height
|
||||
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;}
|
||||
text: qsTr("12")
|
||||
onTextChanged: { manager.onPeakHeightChanged(text) }
|
||||
}
|
||||
|
||||
Text {
|
||||
text: catalog.i18nc("@action:label","Smoothing")
|
||||
Layout.fillWidth:true
|
||||
}
|
||||
TextField {
|
||||
id: smoothing
|
||||
validator: IntValidator {bottom: 0; top: 100;}
|
||||
text: qsTr("1")
|
||||
onTextChanged: { manager.onSmoothingChanged(text) }
|
||||
}
|
||||
|
||||
UM.I18nCatalog{id: catalog; name:"ultimaker"}
|
||||
}
|
||||
|
||||
rightButtons: [
|
||||
Button
|
||||
{
|
||||
id:ok_button
|
||||
text: catalog.i18nc("@action:button","OK");
|
||||
onClicked: { manager.onOkButtonClicked() }
|
||||
enabled: true
|
||||
},
|
||||
Button
|
||||
{
|
||||
id:cancel_button
|
||||
text: catalog.i18nc("@action:button","Cancel");
|
||||
onClicked: { manager.onCancelButtonClicked() }
|
||||
enabled: true
|
||||
}
|
||||
]
|
||||
}
|
||||
197
plugins/ImageReader/ImageReader.py
Normal file
197
plugins/ImageReader/ImageReader.py
Normal file
@ -0,0 +1,197 @@
|
||||
# Copyright (c) 2015 Ultimaker B.V.
|
||||
# Copyright (c) 2013 David Braam
|
||||
# Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import os
|
||||
import numpy
|
||||
|
||||
from PyQt5.QtGui import QImage, qRed, qGreen, qBlue
|
||||
from PyQt5.QtCore import Qt
|
||||
|
||||
from UM.Mesh.MeshReader import MeshReader
|
||||
from UM.Mesh.MeshData import MeshData
|
||||
from UM.Scene.SceneNode import SceneNode
|
||||
from UM.Math.Vector import Vector
|
||||
from UM.Job import Job
|
||||
from .ImageReaderUI import ImageReaderUI
|
||||
|
||||
|
||||
class ImageReader(MeshReader):
|
||||
def __init__(self):
|
||||
super(ImageReader, self).__init__()
|
||||
self._supported_extensions = [".jpg", ".jpeg", ".bmp", ".gif", ".png"]
|
||||
self._ui = ImageReaderUI(self)
|
||||
self._wait = False
|
||||
self._canceled = False
|
||||
|
||||
def read(self, file_name):
|
||||
extension = os.path.splitext(file_name)[1]
|
||||
if extension.lower() in self._supported_extensions:
|
||||
self._ui.showConfigUI()
|
||||
self._wait = True
|
||||
self._canceled = True
|
||||
|
||||
while self._wait:
|
||||
pass
|
||||
# this causes the config window to not repaint...
|
||||
# Job.yieldThread()
|
||||
|
||||
result = None
|
||||
if not self._canceled:
|
||||
result = self._generateSceneNode(file_name, self._ui.size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512)
|
||||
|
||||
return result
|
||||
|
||||
return None
|
||||
|
||||
def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size):
|
||||
mesh = None
|
||||
scene_node = None
|
||||
|
||||
scene_node = SceneNode()
|
||||
|
||||
mesh = MeshData()
|
||||
scene_node.setMeshData(mesh)
|
||||
|
||||
img = QImage(file_name)
|
||||
width = max(img.width(), 2)
|
||||
height = max(img.height(), 2)
|
||||
aspect = height / width
|
||||
|
||||
if img.width() < 2 or img.height() < 2:
|
||||
img = img.scaled(width, height, Qt.IgnoreAspectRatio)
|
||||
|
||||
base_height = max(base_height, 0)
|
||||
|
||||
xz_size = max(xz_size, 1)
|
||||
scale_vector = Vector(xz_size, max(peak_height - base_height, -base_height), xz_size)
|
||||
|
||||
if width > height:
|
||||
scale_vector.setZ(scale_vector.z * aspect)
|
||||
elif height > width:
|
||||
scale_vector.setX(scale_vector.x / aspect)
|
||||
|
||||
if width > max_size or height > max_size:
|
||||
scale_factor = max_size / width
|
||||
if height > width:
|
||||
scale_factor = max_size / height
|
||||
|
||||
width = int(max(round(width * scale_factor), 2))
|
||||
height = int(max(round(height * scale_factor), 2))
|
||||
img = img.scaled(width, height, Qt.IgnoreAspectRatio)
|
||||
|
||||
width_minus_one = width - 1
|
||||
height_minus_one = height - 1
|
||||
|
||||
Job.yieldThread()
|
||||
|
||||
texel_width = 1.0 / (width_minus_one) * scale_vector.x
|
||||
texel_height = 1.0 / (height_minus_one) * scale_vector.z
|
||||
|
||||
height_data = numpy.zeros((height, width), dtype=numpy.float32)
|
||||
|
||||
for x in range(0, width):
|
||||
for y in range(0, height):
|
||||
qrgb = img.pixel(x, y)
|
||||
avg = float(qRed(qrgb) + qGreen(qrgb) + qBlue(qrgb)) / (3 * 255)
|
||||
height_data[y, x] = avg
|
||||
|
||||
Job.yieldThread()
|
||||
|
||||
for i in range(0, blur_iterations):
|
||||
ii = blur_iterations-i
|
||||
copy = numpy.copy(height_data)
|
||||
|
||||
height_data += numpy.roll(copy, ii, axis=0)
|
||||
height_data += numpy.roll(copy, -ii, axis=0)
|
||||
height_data += numpy.roll(copy, ii, axis=1)
|
||||
height_data += numpy.roll(copy, -ii, axis=1)
|
||||
|
||||
height_data /= 5
|
||||
Job.yieldThread()
|
||||
|
||||
height_data *= scale_vector.y
|
||||
height_data += base_height
|
||||
|
||||
heightmap_face_count = 2 * height_minus_one * width_minus_one
|
||||
total_face_count = heightmap_face_count + (width_minus_one * 2) * (height_minus_one * 2) + 2
|
||||
|
||||
mesh.reserveFaceCount(total_face_count)
|
||||
|
||||
# initialize to texel space vertex offsets
|
||||
heightmap_vertices = numpy.zeros(((width - 1) * (height - 1), 6, 3), dtype=numpy.float32)
|
||||
heightmap_vertices = heightmap_vertices + numpy.array([[
|
||||
[0, base_height, 0],
|
||||
[0, base_height, texel_height],
|
||||
[texel_width, base_height, texel_height],
|
||||
[texel_width, base_height, texel_height],
|
||||
[texel_width, base_height, 0],
|
||||
[0, base_height, 0]
|
||||
]], dtype=numpy.float32)
|
||||
|
||||
offsetsz, offsetsx = numpy.mgrid[0:height_minus_one, 0:width-1]
|
||||
offsetsx = numpy.array(offsetsx, numpy.float32).reshape(-1, 1) * texel_width
|
||||
offsetsz = numpy.array(offsetsz, numpy.float32).reshape(-1, 1) * texel_height
|
||||
|
||||
# offsets for each texel quad
|
||||
heightmap_vertex_offsets = numpy.concatenate([offsetsx, numpy.zeros((offsetsx.shape[0], offsetsx.shape[1]), dtype=numpy.float32), offsetsz], 1)
|
||||
heightmap_vertices += heightmap_vertex_offsets.repeat(6, 0).reshape(-1, 6, 3)
|
||||
|
||||
# apply height data to y values
|
||||
heightmap_vertices[:, 0, 1] = heightmap_vertices[:, 5, 1] = height_data[:-1, :-1].reshape(-1)
|
||||
heightmap_vertices[:, 1, 1] = height_data[1:, :-1].reshape(-1)
|
||||
heightmap_vertices[:, 2, 1] = heightmap_vertices[:, 3, 1] = height_data[1:, 1:].reshape(-1)
|
||||
heightmap_vertices[:, 4, 1] = height_data[:-1, 1:].reshape(-1)
|
||||
|
||||
heightmap_indices = numpy.array(numpy.mgrid[0:heightmap_face_count * 3], dtype=numpy.int32).reshape(-1, 3)
|
||||
|
||||
mesh._vertices[0:(heightmap_vertices.size // 3), :] = heightmap_vertices.reshape(-1, 3)
|
||||
mesh._indices[0:(heightmap_indices.size // 3), :] = heightmap_indices
|
||||
|
||||
mesh._vertex_count = heightmap_vertices.size // 3
|
||||
mesh._face_count = heightmap_indices.size // 3
|
||||
|
||||
geo_width = width_minus_one * texel_width
|
||||
geo_height = height_minus_one * texel_height
|
||||
|
||||
# bottom
|
||||
mesh.addFace(0, 0, 0, 0, 0, geo_height, geo_width, 0, geo_height)
|
||||
mesh.addFace(geo_width, 0, geo_height, geo_width, 0, 0, 0, 0, 0)
|
||||
|
||||
# north and south walls
|
||||
for n in range(0, width_minus_one):
|
||||
x = n * texel_width
|
||||
nx = (n + 1) * texel_width
|
||||
|
||||
hn0 = height_data[0, n]
|
||||
hn1 = height_data[0, n + 1]
|
||||
|
||||
hs0 = height_data[height_minus_one, n]
|
||||
hs1 = height_data[height_minus_one, n + 1]
|
||||
|
||||
mesh.addFace(x, 0, 0, nx, 0, 0, nx, hn1, 0)
|
||||
mesh.addFace(nx, hn1, 0, x, hn0, 0, x, 0, 0)
|
||||
|
||||
mesh.addFace(x, 0, geo_height, nx, 0, geo_height, nx, hs1, geo_height)
|
||||
mesh.addFace(nx, hs1, geo_height, x, hs0, geo_height, x, 0, geo_height)
|
||||
|
||||
# west and east walls
|
||||
for n in range(0, height_minus_one):
|
||||
y = n * texel_height
|
||||
ny = (n + 1) * texel_height
|
||||
|
||||
hw0 = height_data[n, 0]
|
||||
hw1 = height_data[n + 1, 0]
|
||||
|
||||
he0 = height_data[n, width_minus_one]
|
||||
he1 = height_data[n + 1, width_minus_one]
|
||||
|
||||
mesh.addFace(0, 0, y, 0, 0, ny, 0, hw1, ny)
|
||||
mesh.addFace(0, hw1, ny, 0, hw0, y, 0, 0, y)
|
||||
|
||||
mesh.addFace(geo_width, 0, y, geo_width, 0, ny, geo_width, he1, ny)
|
||||
mesh.addFace(geo_width, he1, ny, geo_width, he0, y, geo_width, 0, y)
|
||||
|
||||
mesh.calculateNormals(fast=True)
|
||||
|
||||
return scene_node
|
||||
88
plugins/ImageReader/ImageReaderUI.py
Normal file
88
plugins/ImageReader/ImageReaderUI.py
Normal file
@ -0,0 +1,88 @@
|
||||
# Copyright (c) 2015 Ultimaker B.V.
|
||||
# Copyright (c) 2013 David Braam
|
||||
# Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import os
|
||||
|
||||
from PyQt5.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot, QObject
|
||||
from PyQt5.QtQml import QQmlComponent, QQmlContext
|
||||
|
||||
from UM.Application import Application
|
||||
from UM.PluginRegistry import PluginRegistry
|
||||
from UM.Logger import Logger
|
||||
|
||||
from UM.i18n import i18nCatalog
|
||||
catalog = i18nCatalog("cura")
|
||||
|
||||
|
||||
class ImageReaderUI(QObject):
|
||||
show_config_ui_trigger = pyqtSignal()
|
||||
|
||||
def __init__(self, image_reader):
|
||||
super(ImageReaderUI, self).__init__()
|
||||
self.image_reader = image_reader
|
||||
self._ui_view = None
|
||||
self.show_config_ui_trigger.connect(self._actualShowConfigUI)
|
||||
self.size = 120
|
||||
self.base_height = 2
|
||||
self.peak_height = 12
|
||||
self.smoothing = 1
|
||||
|
||||
def showConfigUI(self):
|
||||
self.show_config_ui_trigger.emit()
|
||||
|
||||
def _actualShowConfigUI(self):
|
||||
if self._ui_view is None:
|
||||
self._createConfigUI()
|
||||
self._ui_view.show()
|
||||
|
||||
def _createConfigUI(self):
|
||||
if self._ui_view is None:
|
||||
Logger.log("d", "Creating ImageReader config UI")
|
||||
path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath("ImageReader"), "ConfigUI.qml"))
|
||||
component = QQmlComponent(Application.getInstance()._engine, path)
|
||||
self._ui_context = QQmlContext(Application.getInstance()._engine.rootContext())
|
||||
self._ui_context.setContextProperty("manager", self)
|
||||
self._ui_view = component.create(self._ui_context)
|
||||
|
||||
self._ui_view.setFlags(self._ui_view.flags() & ~Qt.WindowCloseButtonHint & ~Qt.WindowMinimizeButtonHint & ~Qt.WindowMaximizeButtonHint);
|
||||
|
||||
@pyqtSlot()
|
||||
def onOkButtonClicked(self):
|
||||
self.image_reader._canceled = False
|
||||
self.image_reader._wait = False
|
||||
self._ui_view.close()
|
||||
|
||||
@pyqtSlot()
|
||||
def onCancelButtonClicked(self):
|
||||
self.image_reader._canceled = True
|
||||
self.image_reader._wait = False
|
||||
self._ui_view.close()
|
||||
|
||||
@pyqtSlot(str)
|
||||
def onSizeChanged(self, value):
|
||||
if (len(value) > 0):
|
||||
self.size = float(value)
|
||||
else:
|
||||
self.size = 0
|
||||
|
||||
@pyqtSlot(str)
|
||||
def onBaseHeightChanged(self, value):
|
||||
if (len(value) > 0):
|
||||
self.base_height = float(value)
|
||||
else:
|
||||
self.base_height = 0
|
||||
|
||||
@pyqtSlot(str)
|
||||
def onPeakHeightChanged(self, value):
|
||||
if (len(value) > 0):
|
||||
self.peak_height = float(value)
|
||||
else:
|
||||
self.peak_height = 0
|
||||
|
||||
@pyqtSlot(str)
|
||||
def onSmoothingChanged(self, value):
|
||||
if (len(value) > 0):
|
||||
self.smoothing = int(value)
|
||||
else:
|
||||
self.smoothing = 0
|
||||
43
plugins/ImageReader/__init__.py
Normal file
43
plugins/ImageReader/__init__.py
Normal file
@ -0,0 +1,43 @@
|
||||
# Copyright (c) 2015 Ultimaker B.V.
|
||||
# Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
from . import ImageReader
|
||||
|
||||
from UM.i18n import i18nCatalog
|
||||
i18n_catalog = i18nCatalog("uranium")
|
||||
|
||||
def getMetaData():
|
||||
return {
|
||||
"plugin": {
|
||||
"name": i18n_catalog.i18nc("@label", "Image Reader"),
|
||||
"author": "Ultimaker",
|
||||
"version": "1.0",
|
||||
"description": i18n_catalog.i18nc("@info:whatsthis", "Enables ability to generate printable geometry from 2D image files."),
|
||||
"api": 2
|
||||
},
|
||||
"mesh_reader": [
|
||||
{
|
||||
"extension": "jpg",
|
||||
"description": i18n_catalog.i18nc("@item:inlistbox", "JPG Image")
|
||||
},
|
||||
{
|
||||
"extension": "jpeg",
|
||||
"description": i18n_catalog.i18nc("@item:inlistbox", "JPEG Image")
|
||||
},
|
||||
{
|
||||
"extension": "png",
|
||||
"description": i18n_catalog.i18nc("@item:inlistbox", "PNG Image")
|
||||
},
|
||||
{
|
||||
"extension": "bmp",
|
||||
"description": i18n_catalog.i18nc("@item:inlistbox", "BMP Image")
|
||||
},
|
||||
{
|
||||
"extension": "gif",
|
||||
"description": i18n_catalog.i18nc("@item:inlistbox", "GIF Image")
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
def register(app):
|
||||
return { "mesh_reader": ImageReader.ImageReader() }
|
||||
Loading…
x
Reference in New Issue
Block a user