From 804bc74885c9e1f3dda8e9d4ae6725eb2762e018 Mon Sep 17 00:00:00 2001
From: Max Sponsel <m_sponsel@web.de>
Date: Tue, 15 Sep 2020 11:51:22 +0200
Subject: [PATCH] =?UTF-8?q?Lookup-Table=20f=C3=BCr=20die=20Entfrenung=20de?=
 =?UTF-8?q?r=20Gamma=20Korrektur=20implementiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Zur Besseren Performance wird eine Lookup Table benötigt. Diese gleicht dynamisch alles Werte ab anstatt bei jedem einzelnen Pixelwert die Berechnung durchzuführen.
---
 Code/Dyschromasie-Applikation.py              |   2 +-
 Code/Farbaenderung.py                         |  28 ++++++++++++------
 Code/__pycache__/Farbaenderung.cpython-38.pyc | Bin 2435 -> 3068 bytes
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Code/Dyschromasie-Applikation.py b/Code/Dyschromasie-Applikation.py
index 268cdd0..3a1c5b0 100644
--- a/Code/Dyschromasie-Applikation.py
+++ b/Code/Dyschromasie-Applikation.py
@@ -3,7 +3,7 @@ import PIL
 import tkinter as tk
 import cv2
 import numpy as np
-from Farbaenderung import gammaCorrection, reverseGammaCorrection, Dyschromasie
+from Farbaenderung import Dyschromasie
 from Scrollbar import ScrollFrame
 
 root = tk.Tk()
diff --git a/Code/Farbaenderung.py b/Code/Farbaenderung.py
index cfc00f5..e75d756 100644
--- a/Code/Farbaenderung.py
+++ b/Code/Farbaenderung.py
@@ -2,19 +2,28 @@ import numpy as np
 import cv2
 
 
-def gammaCorrection(v):
+
+def createGammaLookup():
+    return np.array([removeGammaCorrection(i) for i in np.arange(0, 256)]).astype("float64")
+
+
+def createReverseGammaLookup():
+    return np.array([applyGammaCorrection(i/255) for i in np.arange(0.0, 256.0)]).astype("uint8")
+
+
+def removeGammaCorrection(v):
     if v <= 0.04045 * 255:
         return (v / 255) / 12.92
     elif v > 0.04045 * 255:
         return (((v / 255) + 0.055) / 1.055) ** 2.4
 
 
-def reverseGammaCorrection(v_reverse):
+def applyGammaCorrection(v_reverse):
     if abs(v_reverse) <= 0.0031308:
         return round(255 * (12.92 * abs(v_reverse)))
     elif abs(v_reverse) > 0.0031308:
         if (round(255 * (1.055 * abs(v_reverse) ** 0.41666 - 0.055))) > 255:
-            return 255 - (round(255 * (1.055 * abs(v_reverse) ** 0.41666 - 0.055))- 255)
+            return 255 - (round(255 * (1.055 * abs(v_reverse) ** 0.41666 - 0.055)) - 255)
         else:
             return round(255 * (1.055 * abs(v_reverse) ** 0.41666 - 0.055))
 
@@ -40,6 +49,9 @@ class Dyschromasie:
                            [0.02980165, -0.19318073, 1.16364789]])
 
     def Simulate(self):
+
+        removeGammaCorrectionLUT = createGammaLookup()
+
         if self.sim_kind == 'p':
             sim_mat = np.array([[(1 - self.sim_faktor), 1.05118294 * self.sim_faktor, -0.05116099 * self.sim_faktor],
                                 [0, 1, 0],
@@ -56,13 +68,10 @@ class Dyschromasie:
         # Gammakorrektur durchfuehren
         self.cb_image = np.copy(self.img_mat).astype('float64')
 
-        for i in range(self.rows):
-            for j in range(self.cols):
-                for x in range(3):
-                    self.cb_image[i, j, x] = gammaCorrection(self.img_mat[i, j, x])
+        self.cb_image = cv2.LUT(self.img_mat, removeGammaCorrectionLUT)
 
         rechen_Mat = np.copy(self.T_reversed.dot(sim_mat).dot(self.T))
-        
+
         # Einzelne Pixelwertberechnung
         for i in range(self.rows):
             for j in range(self.cols):
@@ -74,6 +83,7 @@ class Dyschromasie:
         for i in range(self.rows):
             for j in range(self.cols):
                 for x in range(3):
-                    self.sim_image[i, j, x] = reverseGammaCorrection(self.cb_image[i, j, x])
+                    self.sim_image[i, j, x] = applyGammaCorrection(self.cb_image[i, j, x])
 
         return self.sim_image
+
diff --git a/Code/__pycache__/Farbaenderung.cpython-38.pyc b/Code/__pycache__/Farbaenderung.cpython-38.pyc
index 3dfd5d3e70b2531da029048812c01fddc10ebd42..51c5059b32d898a9f27185b3259d16e0844f9f59 100644
GIT binary patch
delta 1802
zcmbtU&2Jk;6rY*>^jB)<gSskBQ<4HMRaBsqN<;y*RSQy^18Faoio4m_xK6#h?(Etk
ztt}rMaja_XkxML2;lzP6HzZC-T<69y{{vs|&Dx3kfjF?y{AQl#z2BSn^4=TF{c*Bz
zuTaPm_!gf%sQoo8oT1l-?=4^8Cb#xT)!;VIz;50mJj-)?gy#mVYH_+rD)~b++em(6
z3;pYGirxZ<$v)+jvpqa9u5o?DZjb>T(S3~@BeXL&T#A<CkHN0P+JqI&1Jp^E+|T!D
zOuBSHhwQPwNe)Pb$_3&1VaL1W_`Y*J6vA`kMi?A0$?~h0By9+!5^VVA(|&fX*@$8{
z^jqr|@}dKiF!JQQD?BGoIc|sHqjqa`tr@ybGg^nk#75u)4+)^Owws|7U%7msOBS@G
z;RxaEO4AWeQ1@Vu;@y@v_N?3^te{g_dc~IsKS%gVLPat8m6iW*;tZfti7UfFC9aqz
zj+4`n^)z`EdiXb7Lk8!aR;#%?mB2n`P+)eZLcqrh8z2YkICU4(aK7|9o{0V{gLN=f
z-}un_Od9P*5MLEYdgSb*@loZg{BI7hJ|}6z3K>59iiy(jmv`P*L=YJ598nUX-mih)
z4BBBJgxWL@OK8cr^rx*7{2~?*P6E`Qe&PQ3?0fmCcmt#glbW*?NkfF~fLCZW)2WFx
z<d<E{f;zH9c>n?q=3y<-6((lkfBSP*;Jd{fK=PgT{Np8*&LAuzoJBZ?fPM24x3p`u
zM$m|BwdG_-mwgNg15thU1Jq?q2Bb&3WCyzK5fe9K2K~iA*2{!zxX%-=r+Xbbk27wl
z9Zq$vu8nAq1+lU>!Ty`n9`sPl8rx6!?EVzdG{NN;%qC7UWAp5bG!wUAW5A6GBf;Xi
z5d=}Q<IFy4n_W5rry!>~x&3^XfnGlkmxU2bk)9UM!1=_0-XQm{^mHW^m9)|`x*8ae
z9lNV{jcs;{Ao)aEBhTsMA}ls0x0UM>Xq4a~`Ba)>|NNN!nsR2uGrXW&z1=h8*$H*m
z+}2J(vmp^WMp-#~0?q<h5AY`W#5zykOdRXoJ4a=4h(%hN6GbclRRvf{qJV&vA$2!w
z?TRIoPoQkOTeXJoz~Ir`&IeMveeZ7ayS30a)HFISE}4lMeyS<3N-LIFhOJtD?F0pu
zs)Yu=6IZh^Rv&sn?T!-*99NR=Nc#0F<+<7L+f5jxAA(9`Uj-!0WXXoTNQ+5i-@SPp
z3BFuZ5H2CCAgm%>L_mTmb~VCP1D}SAvq>Ry&c##3mPXL_AsdSL0$QoG;XDwSM-`|*
b-Ph4cd(97dyXmb%^Q0YXQ(ISmmYw|v<tdCi

delta 1198
zcmZuxOHUI~6ux(+^XSkQg1jP%Qi1A@5Pa1~!~ia211u!b$=I3JL1s#CrvyTqYU)-4
znT<=jG0}w!<62k#0hf1SbSH_4f51e~nQ22SHo4zDr}z85b5C<_e-AeL;;ZqvM&L6(
zsq5GF<D+zX|Kj+_0x@M%c}`5FA*@LzT_zdz5NS*PGx4Et_{aY)PA1-v4CQo-$#B4A
ze~9jmCkuw-7;{C&tej^TT?vlLDk`Z;W3X7%zY_U4ETBY0Kt^HrZtla&xBMoH_$lek
z_0SMcQOXCHwPmrgwb1PygR?RM0q1^LV>B(Wn15gToZ?D;qiA@uGhC|Ju6Nm=lJ_q4
z1C{k6oIvP9IEgTT@J~@y*KODKbbZACCG$F-;$`Mwm48q|s$`v*^ohW3dGtUq1<1uA
zVv4x;6EhO-1<{mD!IXj>qJmfuo3ut<FVM@Ne;Vq6hb*O~Z~LiXUO#3q(<N&ciMHfg
zw@te&Xz*fElOD)sPm@-Ou6S4?+MsvHgWEMB$h07vu8E#%#)7z>u0^~alvahRSdHYx
zVbTEky3)?Gr1Z1&t@Nc;B6bk3QYaG#PNE4>P3kB#+f^uC6RT3d4BYa<Fu|*Z-gzNQ
z_GrDdxJOG@Tjok|^CVD`&__JXI_wv_>}Narn1D7?ZR?IUl1FVoo%gU_!+M1kVD=MB
z{)^}sP5JMlQ}qN)z+o`DNr*DN!Sry!-Q<$Nn6VR#6p!SJn>!3Aj>|^b+u5|ZntP<%
zj#03<#0<A!b&O&ZdD@EJ8g!G3X3^txg-6S_6N(s4dPZjRgRrkD_`PEQ$L4gM)9p14
zUfg5L)$bYJu~A;OoyvycSr<TB&H@nXf6`7X37UXsGvR;LR_0H^w`>&Q48j<~d4wT^
zG{QNA48qY{2_k$LEDkW>Z}*&C#V8|l$*nl>8=x^4b6e94yA0Y0xc@WZYSt;5l@03#
Pys+?(L#3*yDysGu3lkAt