mirror of
https://github.com/ciromattia/kcc
synced 2026-10-11 12:02:31 +00:00
Draft of FakePanelView mode
This commit is contained in:
Paweł Jastrzębski
+51
-9
@@ -272,7 +272,7 @@ def applyImgOptimization(img, isSplit=False, toRight=False):
|
|||||||
img.cropWhiteSpace(10.0)
|
img.cropWhiteSpace(10.0)
|
||||||
if options.cutpagenumbers:
|
if options.cutpagenumbers:
|
||||||
img.cutPageNumber()
|
img.cutPageNumber()
|
||||||
img.resizeImage(options.upscale, options.stretch, options.black_borders, isSplit, toRight)
|
img.resizeImage(options.upscale, options.stretch, options.black_borders, isSplit, toRight, options.landscapemode)
|
||||||
if not options.notquantize:
|
if not options.notquantize:
|
||||||
img.quantizeImage()
|
img.quantizeImage()
|
||||||
|
|
||||||
@@ -313,19 +313,61 @@ def dirImgProcess(path):
|
|||||||
if facing == "right":
|
if facing == "right":
|
||||||
splitCount += 1
|
splitCount += 1
|
||||||
facing = "left"
|
facing = "left"
|
||||||
img0 = image.ComicPage(split[0], options.profile)
|
if options.fakepanelview:
|
||||||
applyImgOptimization(img0, True, toRight1)
|
img0 = image.ComicPage(split[0], options.profile)
|
||||||
img0.saveToDir(dirpath, options.notquantize)
|
applyImgOptimization(img0, True)
|
||||||
img1 = image.ComicPage(split[1], options.profile)
|
splitA = img0.splitPageFakePanelView(dirpath, options.righttoleft)
|
||||||
applyImgOptimization(img1, True, toRight2)
|
img00 = image.ComicPage(splitA[0], options.profile)
|
||||||
img1.saveToDir(dirpath, options.notquantize)
|
img00.saveToDir(dirpath, options.notquantize)
|
||||||
|
img01 = image.ComicPage(splitA[1], options.profile)
|
||||||
|
img01.saveToDir(dirpath, options.notquantize)
|
||||||
|
img02 = image.ComicPage(splitA[2], options.profile)
|
||||||
|
img02.saveToDir(dirpath, options.notquantize)
|
||||||
|
img03 = image.ComicPage(splitA[3], options.profile)
|
||||||
|
img03.saveToDir(dirpath, options.notquantize)
|
||||||
|
img04 = image.ComicPage(splitA[4], options.profile)
|
||||||
|
img04.saveToDir(dirpath, options.notquantize)
|
||||||
|
img1 = image.ComicPage(split[1], options.profile)
|
||||||
|
applyImgOptimization(img1, True)
|
||||||
|
splitB = img1.splitPageFakePanelView(dirpath, options.righttoleft)
|
||||||
|
img10 = image.ComicPage(splitB[0], options.profile)
|
||||||
|
img10.saveToDir(dirpath, options.notquantize)
|
||||||
|
img11 = image.ComicPage(splitB[1], options.profile)
|
||||||
|
img11.saveToDir(dirpath, options.notquantize)
|
||||||
|
img12 = image.ComicPage(splitB[2], options.profile)
|
||||||
|
img12.saveToDir(dirpath, options.notquantize)
|
||||||
|
img13 = image.ComicPage(splitB[3], options.profile)
|
||||||
|
img13.saveToDir(dirpath, options.notquantize)
|
||||||
|
img14 = image.ComicPage(splitB[4], options.profile)
|
||||||
|
img14.saveToDir(dirpath, options.notquantize)
|
||||||
|
else:
|
||||||
|
img0 = image.ComicPage(split[0], options.profile)
|
||||||
|
applyImgOptimization(img0, True, toRight1)
|
||||||
|
img0.saveToDir(dirpath, options.notquantize)
|
||||||
|
img1 = image.ComicPage(split[1], options.profile)
|
||||||
|
applyImgOptimization(img1, True, toRight2)
|
||||||
|
img1.saveToDir(dirpath, options.notquantize)
|
||||||
else:
|
else:
|
||||||
if facing == "right":
|
if facing == "right":
|
||||||
facing = "left"
|
facing = "left"
|
||||||
else:
|
else:
|
||||||
facing = "right"
|
facing = "right"
|
||||||
applyImgOptimization(img)
|
if options.fakepanelview:
|
||||||
img.saveToDir(dirpath, options.notquantize)
|
applyImgOptimization(img)
|
||||||
|
split = img.splitPageFakePanelView(dirpath, options.righttoleft)
|
||||||
|
img0 = image.ComicPage(split[0], options.profile)
|
||||||
|
img0.saveToDir(dirpath, options.notquantize)
|
||||||
|
img1 = image.ComicPage(split[1], options.profile)
|
||||||
|
img1.saveToDir(dirpath, options.notquantize)
|
||||||
|
img2 = image.ComicPage(split[2], options.profile)
|
||||||
|
img2.saveToDir(dirpath, options.notquantize)
|
||||||
|
img3 = image.ComicPage(split[3], options.profile)
|
||||||
|
img3.saveToDir(dirpath, options.notquantize)
|
||||||
|
img4 = image.ComicPage(split[4], options.profile)
|
||||||
|
img4.saveToDir(dirpath, options.notquantize)
|
||||||
|
else:
|
||||||
|
applyImgOptimization(img)
|
||||||
|
img.saveToDir(dirpath, options.notquantize)
|
||||||
|
|
||||||
|
|
||||||
def genEpubStruct(path):
|
def genEpubStruct(path):
|
||||||
|
|||||||
+47
-3
@@ -139,7 +139,7 @@ class ComicPage:
|
|||||||
palImg.putpalette(self.palette)
|
palImg.putpalette(self.palette)
|
||||||
self.image = self.image.quantize(palette=palImg)
|
self.image = self.image.quantize(palette=palImg)
|
||||||
|
|
||||||
def resizeImage(self, upscale=False, stretch=False, black_borders=False, isSplit=False, toRight=False):
|
def resizeImage(self, upscale=False, stretch=False, black_borders=False, isSplit=False, toRight=False, landscapeMode=False):
|
||||||
method = Image.ANTIALIAS
|
method = Image.ANTIALIAS
|
||||||
if black_borders:
|
if black_borders:
|
||||||
fill = 'black'
|
fill = 'black'
|
||||||
@@ -147,7 +147,7 @@ class ComicPage:
|
|||||||
fill = 'white'
|
fill = 'white'
|
||||||
if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
|
if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
|
||||||
if not upscale:
|
if not upscale:
|
||||||
if isSplit and options.landscapemode:
|
if isSplit and landscapeMode:
|
||||||
borderw = (self.size[0] - self.image.size[0])
|
borderw = (self.size[0] - self.image.size[0])
|
||||||
borderh = (self.size[1] - self.image.size[1]) / 2
|
borderh = (self.size[1] - self.image.size[1]) / 2
|
||||||
self.image = ImageOps.expand(self.image, border=(0, borderh), fill=fill)
|
self.image = ImageOps.expand(self.image, border=(0, borderh), fill=fill)
|
||||||
@@ -172,7 +172,7 @@ class ComicPage:
|
|||||||
ratioDev = float(self.size[0]) / float(self.size[1])
|
ratioDev = float(self.size[0]) / float(self.size[1])
|
||||||
if (float(self.image.size[0]) / float(self.image.size[1])) < ratioDev:
|
if (float(self.image.size[0]) / float(self.image.size[1])) < ratioDev:
|
||||||
diff = int(self.image.size[1] * ratioDev) - self.image.size[0]
|
diff = int(self.image.size[1] * ratioDev) - self.image.size[0]
|
||||||
if isSplit and options.landscapemode:
|
if isSplit and landscapeMode:
|
||||||
diff = 2
|
diff = 2
|
||||||
self.image = ImageOps.expand(self.image, border=(diff / 2, 0), fill=fill)
|
self.image = ImageOps.expand(self.image, border=(diff / 2, 0), fill=fill)
|
||||||
elif (float(self.image.size[0]) / float(self.image.size[1])) > ratioDev:
|
elif (float(self.image.size[0]) / float(self.image.size[1])) > ratioDev:
|
||||||
@@ -218,6 +218,50 @@ class ComicPage:
|
|||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def splitPageFakePanelView(self, targetdir, righttoleft=False):
|
||||||
|
width, height = self.image.size
|
||||||
|
topleftbox = (0, 0, width / 2, height / 2)
|
||||||
|
toprightbox = (width / 2, 0, width, height / 2)
|
||||||
|
bottomleftbox = (0, height / 2, width / 2, height)
|
||||||
|
bototmrightbox = (width / 2, height / 2, width, height)
|
||||||
|
filename = os.path.splitext(os.path.basename(self.origFileName))
|
||||||
|
file0 = targetdir + '/' + filename[0] + '-0' + filename[1]
|
||||||
|
file1 = targetdir + '/' + filename[0] + '-1' + filename[1]
|
||||||
|
file2 = targetdir + '/' + filename[0] + '-2' + filename[1]
|
||||||
|
file3 = targetdir + '/' + filename[0] + '-3' + filename[1]
|
||||||
|
file4 = targetdir + '/' + filename[0] + '-4' + filename[1]
|
||||||
|
try:
|
||||||
|
if righttoleft:
|
||||||
|
page0 = self.image
|
||||||
|
page1 = self.image.crop(toprightbox)
|
||||||
|
page2 = self.image.crop(topleftbox)
|
||||||
|
page3 = self.image.crop(bototmrightbox)
|
||||||
|
page4 = self.image.crop(bottomleftbox)
|
||||||
|
else:
|
||||||
|
page0 = self.image
|
||||||
|
page1 = self.image.crop(topleftbox)
|
||||||
|
page2 = self.image.crop(toprightbox)
|
||||||
|
page3 = self.image.crop(bottomleftbox)
|
||||||
|
page4 = self.image.crop(bototmrightbox)
|
||||||
|
if page0.mode == "P":
|
||||||
|
page0.save(file0, "PNG")
|
||||||
|
page1.save(file1, "PNG")
|
||||||
|
page2.save(file2, "PNG")
|
||||||
|
page3.save(file3, "PNG")
|
||||||
|
page4.save(file4, "PNG")
|
||||||
|
else:
|
||||||
|
page0.save(file0)
|
||||||
|
page1.save(file1)
|
||||||
|
page2.save(file2)
|
||||||
|
page3.save(file3)
|
||||||
|
page4.save(file4)
|
||||||
|
os.remove(self.origFileName)
|
||||||
|
except IOError as e:
|
||||||
|
raise RuntimeError('Cannot write image in directory %s: %s' % (targetdir, e))
|
||||||
|
return file0, file1, file2, file3, file4
|
||||||
|
|
||||||
|
|
||||||
def frameImage(self):
|
def frameImage(self):
|
||||||
foreground = tuple(self.palette[:3])
|
foreground = tuple(self.palette[:3])
|
||||||
background = tuple(self.palette[-3:])
|
background = tuple(self.palette[-3:])
|
||||||
|
|||||||
Reference in New Issue
Block a user