FabLab_Chemnitz/mightyscape-1.1-deprecated
FabLab_Chemnitz/mightyscape-1.1-deprecated
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixes in output pro

Browse Source
This commit is contained in:
Mario Voigt 2021-05-04 23:24:50 +02:00
parent e35390696d
commit 0a97914f35
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.pyc *.pyc
/.project /.project
/.pydevproject /.pydevproject
/.nohup.out
extensions/fablabchemnitz/animate_order/drawing.svg extensions/fablabchemnitz/animate_order/drawing.svg
extensions/fablabchemnitz/animate_order/animate_order.html extensions/fablabchemnitz/animate_order/animate_order.html

39
extensions/fablabchemnitz/output_pro/outputpro.py
View File

@ -54,8 +54,10 @@ class OutputProBitmap(inkex.EffectExtension):
if "nt" in os.name: if "nt" in os.name:
icc_dir = 'C:\\Windows\\System32\\spool\\drivers\\color' icc_dir = 'C:\\Windows\\System32\\spool\\drivers\\color'
shell = True
else: else:
icc_dir = '/usr/share/color/icc/colord/' icc_dir = '/usr/share/color/icc/colord/'
shell = False
list_of_profiles = os.listdir(icc_dir) list_of_profiles = os.listdir(icc_dir)
#inkex.utils.debug(list_of_profiles) #inkex.utils.debug(list_of_profiles)
@ -557,16 +559,16 @@ class OutputProBitmap(inkex.EffectExtension):
final_command.append(os.path.join(icc_dir, selected_screen_profile)) final_command.append(os.path.join(icc_dir, selected_screen_profile))
final_command.append(os.path.join(dirpathTempFolder.name, 'result.png')) final_command.append(os.path.join(dirpathTempFolder.name, 'result.png'))
subprocess.Popen(final_command, shell=True).wait() subprocess.Popen(final_command, shell=shell).wait()
file_info = subprocess.Popen(['identify', os.path.join(dirpathTempFolder.name, 'source.png')], shell=True, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') file_info = subprocess.Popen(['identify', os.path.join(dirpathTempFolder.name, 'source.png')], shell=shell, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
image_width = int(file_info.split(' ')[2].split('x')[0]) image_width = int(file_info.split(' ')[2].split('x')[0])
image_height = int(file_info.split(' ')[2].split('x')[1]) image_height = int(file_info.split(' ')[2].split('x')[1])
marksize = (self.dpi_choice.value() / 90) * unittouu(str(self.prepress_paper_cutmarks_marksize_value.text()) + str(self.prepress_paper_cutmarks_marksize_choice.currentText())) marksize = (self.dpi_choice.value() / 90) * unittouu(str(self.prepress_paper_cutmarks_marksize_value.text()) + str(self.prepress_paper_cutmarks_marksize_choice.currentText()))
imposition_space = (self.dpi_choice.value() / 90) * unittouu(str(self.imposition_space_value.text()) + str(self.imposition_space_choice.currentText())) imposition_space = (self.dpi_choice.value() / 90) * unittouu(str(self.imposition_space_value.text()) + str(self.imposition_space_choice.currentText()))
file_info = subprocess.Popen(['identify', '-verbose', os.path.join(dirpathTempFolder.name, 'result-imp.') + list_of_export_formats[self.format_choice.currentIndex()].lower()], shell=True, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') file_info = subprocess.Popen(['identify', '-verbose', os.path.join(dirpathTempFolder.name, 'result-imp.') + list_of_export_formats[self.format_choice.currentIndex()].lower()], shell=shell, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
file_info_final = '' file_info_final = ''
for line in file_info.split('\n'): for line in file_info.split('\n'):
if ' Format: ' in line: if ' Format: ' in line:
@ -628,7 +630,7 @@ class OutputProBitmap(inkex.EffectExtension):
self.preview_original_title.setVisible(False) self.preview_original_title.setVisible(False)
self.preview_result_title.setVisible(False) self.preview_result_title.setVisible(False)
subprocess.Popen(['convert', os.path.join(dirpathTempFolder.name, 'result-imp.') + list_of_export_formats[self.format_choice.currentIndex()].lower(), '-resize', '300x300', os.path.join(dirpathTempFolder.name, 'preview.png')], shell=True).wait() subprocess.Popen(['convert', os.path.join(dirpathTempFolder.name, 'result-imp.') + list_of_export_formats[self.format_choice.currentIndex()].lower(), '-resize', '300x300', os.path.join(dirpathTempFolder.name, 'preview.png')], shell=shell).wait()
elif self.option_box.currentIndex() == 2: elif self.option_box.currentIndex() == 2:
None None
@ -655,7 +657,7 @@ class OutputProBitmap(inkex.EffectExtension):
if list_of_color_modes_jpeg[self.color_mode_choice_jpeg.currentIndex()] == 'RGB': if list_of_color_modes_jpeg[self.color_mode_choice_jpeg.currentIndex()] == 'RGB':
pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff')) pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff'))
subprocess.Popen(pre_command, shell=True).wait() subprocess.Popen(pre_command, shell=shell).wait()
del pre_command[:] del pre_command[:]
pre_command.append('convert') pre_command.append('convert')
pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff')) pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff'))
@ -663,7 +665,7 @@ class OutputProBitmap(inkex.EffectExtension):
pre_command.append(os.path.join(icc_dir, selected_screen_profile)) pre_command.append(os.path.join(icc_dir, selected_screen_profile))
pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff')) pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff'))
subprocess.Popen(pre_command, shell=True).wait() subprocess.Popen(pre_command, shell=shell).wait()
if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'result.tiff')): if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'result.tiff')):
inkex.utils.debug("Error. Missing result.tiff") inkex.utils.debug("Error. Missing result.tiff")
@ -674,9 +676,9 @@ class OutputProBitmap(inkex.EffectExtension):
pre_command.append('-profile') pre_command.append('-profile')
pre_command.append(os.path.join(icc_dir, selected_screen_profile)) pre_command.append(os.path.join(icc_dir, selected_screen_profile))
pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff')) pre_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff'))
subprocess.Popen(pre_command, shell=True).wait() subprocess.Popen(pre_command, shell=shell).wait()
file_info = subprocess.Popen(['identify', os.path.join(dirpathTempFolder.name, 'source.png')], shell=True, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') file_info = subprocess.Popen(['identify', os.path.join(dirpathTempFolder.name, 'source.png')], shell=shell, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
if self.prepress_paper_cutmarks_check.isChecked(): if self.prepress_paper_cutmarks_check.isChecked():
bleedsize = (self.dpi_choice.value() / 90) * unittouu(str(self.prepress_paper_cutmarks_bleedsize_value.text()) + str(self.prepress_paper_cutmarks_bleedsize_choice.currentText())) bleedsize = (self.dpi_choice.value() / 90) * unittouu(str(self.prepress_paper_cutmarks_bleedsize_value.text()) + str(self.prepress_paper_cutmarks_bleedsize_choice.currentText()))
marksize = (self.dpi_choice.value() / 90) * unittouu(str(self.prepress_paper_cutmarks_marksize_value.text()) + str(self.prepress_paper_cutmarks_marksize_choice.currentText())) marksize = (self.dpi_choice.value() / 90) * unittouu(str(self.prepress_paper_cutmarks_marksize_value.text()) + str(self.prepress_paper_cutmarks_marksize_choice.currentText()))
@ -699,7 +701,7 @@ class OutputProBitmap(inkex.EffectExtension):
imposition_command.append('-extent') imposition_command.append('-extent')
imposition_command.append(str(sum(image_width) + (marksize*2) + (imposition_space * (len(image_width) -1))) + 'x' + str(sum(image_height) + (marksize*2) + (imposition_space * (len(image_height) -1))) + '-' + str(marksize) + '-' + str(marksize)) imposition_command.append(str(sum(image_width) + (marksize*2) + (imposition_space * (len(image_width) -1))) + 'x' + str(sum(image_height) + (marksize*2) + (imposition_space * (len(image_height) -1))) + '-' + str(marksize) + '-' + str(marksize))
imposition_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')) imposition_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff'))
subprocess.Popen(imposition_command, shell=True).wait() subprocess.Popen(imposition_command, shell=shell).wait()
last_width = 0 last_width = 0
last_height = 0 last_height = 0
@ -713,7 +715,7 @@ class OutputProBitmap(inkex.EffectExtension):
imposition_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff')) imposition_command.append(os.path.join(dirpathTempFolder.name, 'result.tiff'))
imposition_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')) imposition_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff'))
imposition_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')) imposition_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff'))
subprocess.Popen(imposition_command, shell=True).wait() subprocess.Popen(imposition_command, shell=shell).wait()
last_height += height + imposition_space last_height += height + imposition_space
last_marksize = 0 last_marksize = 0
@ -740,7 +742,7 @@ class OutputProBitmap(inkex.EffectExtension):
cut_marks_command.append(os.path.join(dirpathTempFolder.name, 'cut_mark.tiff')) cut_marks_command.append(os.path.join(dirpathTempFolder.name, 'cut_mark.tiff'))
cut_marks_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')) cut_marks_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff'))
cut_marks_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')) cut_marks_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.tiff'))
subprocess.Popen(cut_marks_command, shell=True).wait() subprocess.Popen(cut_marks_command, shell=shell).wait()
if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')): if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'result-imp.tiff')):
inkex.utils.debug("Error. Missing result-imp.tiff") inkex.utils.debug("Error. Missing result-imp.tiff")
@ -780,7 +782,7 @@ class OutputProBitmap(inkex.EffectExtension):
jpeg_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.jpeg')) jpeg_command.append(os.path.join(dirpathTempFolder.name, 'result-imp.jpeg'))
subprocess.Popen(jpeg_command, shell=True).wait() subprocess.Popen(jpeg_command, shell=shell).wait()
def change_format(self): def change_format(self):
self.general_options_panel_jpeg.setVisible(False) self.general_options_panel_jpeg.setVisible(False)
@ -877,18 +879,18 @@ class OutputProBitmap(inkex.EffectExtension):
'-separate', '-separate',
os.path.join(dirpathTempFolder.name, 'separated' + area_to_export.replace(' ', '') + color + ".png")] os.path.join(dirpathTempFolder.name, 'separated' + area_to_export.replace(' ', '') + color + ".png")]
#inkex.utils.debug(cmd) #inkex.utils.debug(cmd)
p = subprocess.Popen(cmd, shell=True).wait() p = subprocess.Popen(cmd, shell=shell).wait()
self.cmyk_advanced_manipulation_view_separations() self.cmyk_advanced_manipulation_view_separations()
def cmyk_advanced_manipulation_view_separations(self): def cmyk_advanced_manipulation_view_separations(self):
area_to_export = self.area_to_export() area_to_export = self.area_to_export()
file_info = subprocess.Popen(['identify', os.path.join(dirpathTempFolder.name, 'source.png')], shell=True, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') file_info = subprocess.Popen(['identify', os.path.join(dirpathTempFolder.name, 'source.png')], shell=shell, stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
image_size = file_info.split(' ')[2] image_size = file_info.split(' ')[2]
subprocess.Popen(['convert', '-size', image_size, 'xc:black', os.path.join(dirpathTempFolder.name, 'empty.png')], shell=True).wait() subprocess.Popen(['convert', '-size', image_size, 'xc:black', os.path.join(dirpathTempFolder.name, 'empty.png')], shell=shell).wait()
final_command = ['convert'] final_command = ['convert']
@ -912,9 +914,12 @@ class OutputProBitmap(inkex.EffectExtension):
else: else:
final_command.append(os.path.join(dirpathTempFolder.name, 'empty.png')) final_command.append(os.path.join(dirpathTempFolder.name, 'empty.png'))
if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'empty.png')):
inkex.utils.debug("Error. Missing empty.png")
final_command.extend(['-set', 'colorspace', 'cmyk']) final_command.extend(['-set', 'colorspace', 'cmyk'])
final_command.extend(['-combine', os.path.join(dirpathTempFolder.name, 'result.tiff')]) final_command.extend(['-combine', os.path.join(dirpathTempFolder.name, 'result.tiff')])
subprocess.Popen(final_command, shell=True).wait() subprocess.Popen(final_command, shell=shell).wait()
self.generate_preview() self.generate_preview()
@ -962,7 +967,7 @@ class OutputProBitmap(inkex.EffectExtension):
self.debug(_("Inkscape returned the following output when trying to run the file export; the file export may still have worked:")) self.debug(_("Inkscape returned the following output when trying to run the file export; the file export may still have worked:"))
self.debug(cli_output) self.debug(cli_output)
subprocess.Popen(['convert', os.path.join(dirpathTempFolder.name, 'source.png'), os.path.join(dirpathTempFolder.name, 'source.tiff')], shell=True).wait() subprocess.Popen(['convert', os.path.join(dirpathTempFolder.name, 'source.png'), os.path.join(dirpathTempFolder.name, 'source.tiff')], shell=shell).wait()
if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'source.tiff')): if not os.path.isfile(os.path.join(dirpathTempFolder.name, 'source.tiff')):
inkex.utils.debug("Error. Missing source.tiff") inkex.utils.debug("Error. Missing source.tiff")

3
extensions/fablabchemnitz/output_pro/outputpro/cmyk.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import re, subprocess, os import re
import os
import inkex import inkex
from inkex.command import inkscape from inkex.command import inkscape

13
extensions/fablabchemnitz/output_pro/outputpro/cutmarks.py
View File

@ -1,10 +1,15 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import subprocess, os import subprocess
import os
def generate_final_file(isvector, hide_inside_marks, colormode, width, height, space, strokewidth, bleedsize, marksize, temp_dir): def generate_final_file(isvector, hide_inside_marks, colormode, width, height, space, strokewidth, bleedsize, marksize, temp_dir):
if not isvector: if not isvector:
if "nt" in os.name:
shell = True
else:
shell = False
command = [] command = []
final_command = ['convert'] final_command = ['convert']
@ -59,7 +64,7 @@ def generate_final_file(isvector, hide_inside_marks, colormode, width, height, s
width_value += column + space width_value += column + space
number_of_column += 1 number_of_column += 1
command.append(os.path.join(temp_dir, 'cut_mark_' + color + '.png')) command.append(os.path.join(temp_dir, 'cut_mark_' + color + '.png'))
subprocess.Popen(command).wait() subprocess.Popen(command, shell=shell).wait()
del command[:] del command[:]
command.append('convert') command.append('convert')
@ -70,10 +75,10 @@ def generate_final_file(isvector, hide_inside_marks, colormode, width, height, s
command.append('K') command.append('K')
command.append('-separate') command.append('-separate')
command.append(os.path.join(temp_dir, 'cut_mark_' + color + '.png')) command.append(os.path.join(temp_dir, 'cut_mark_' + color + '.png'))
subprocess.Popen(command).wait() subprocess.Popen(command, shell=shell).wait()
del command[:] del command[:]
final_command.append(os.path.join(temp_dir, 'cut_mark_' + color + '.png')) final_command.append(os.path.join(temp_dir, 'cut_mark_' + color + '.png'))
final_command.extend(['-set', 'colorspace', colormode, '-combine', os.path.join(temp_dir, 'cut_mark.tiff')]) final_command.extend(['-set', 'colorspace', colormode, '-combine', os.path.join(temp_dir, 'cut_mark.tiff')])
subprocess.Popen(final_command).wait() subprocess.Popen(final_command, shell=shell).wait()