From 3d815bb6bdf2e5cd4e0bb52f6b3cc50087616385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Luiz=20Albano?= <andre_barros@id.uff.br>
Date: Fri, 22 Mar 2024 19:41:43 -0300
Subject: [PATCH] v0.1.9.2

---
 components/__pycache__/about.cpython-312.pyc  | Bin 6117 -> 6051 bytes
 .../__pycache__/help_window.cpython-312.pyc   | Bin 6244 -> 6178 bytes
 .../tomi_calculations.cpython-312.pyc         | Bin 6463 -> 6397 bytes
 components/about.py                           |   1 -
 components/help_window.py                     |   1 -
 components/tomi_calculations.py               |   1 -
 kraken.py                                     | 420 +++++++++++++-----
 pressao_automatizada.py                       |  14 +-
 uploads/dry_gas.csv                           |  11 +
 uploads/fresh_water.csv                       |  11 +
 uploads/ogx.csv                               |  52 +++
 uploads/oil_limit.csv                         |  11 +
 .../color_constants.cpython-312.pyc           | Bin 423 -> 419 bytes
 .../fluid_pressure.cpython-312.pyc            | Bin 1510 -> 1506 bytes
 utility/__pycache__/icons.cpython-312.pyc     | Bin 2775 -> 2771 bytes
 utility/__pycache__/utilities.cpython-312.pyc | Bin 4981 -> 4977 bytes
 utility/fluid_pressure.py                     |  21 -
 17 files changed, 394 insertions(+), 149 deletions(-)
 create mode 100644 uploads/dry_gas.csv
 create mode 100644 uploads/fresh_water.csv
 create mode 100644 uploads/ogx.csv
 create mode 100644 uploads/oil_limit.csv
 delete mode 100644 utility/fluid_pressure.py

diff --git a/components/__pycache__/about.cpython-312.pyc b/components/__pycache__/about.cpython-312.pyc
index 5b16e9fc8f54c063ed7dff1da9ad46237956e1b0..8093e3d6129ee972901b3705f68e4723581d6660 100644
GIT binary patch
delta 943
zcmZ8fOHUI~7@b>M#bRxtotC1Q5~I*W%fqHh%OgOcZGuoAM7-2A)0qKA=TYxW1!|%$
zj2pwkToT=wsH_ZeVOZ-Qz#m{{sd3>7-5C;%_nV3_%;L;<&iU@0GvB>mdpCQ1J3gP6
zV^4hNm;B+WFY5Y@-t`QiCaoV+0d@KjCvj4nI;f>_TFYR%j-m-i3##MV1fI~cIIB(K
zNo@*GX*rzJ@;LAKNG;%k9JsYXyZk})jDAOaf9N&ZLhv<?V?8{cmcsaw6u~ntF2_mj
zk2op1<!bnNb`8ZlXv+0*JJe(!LNU5~B$qtTOcOd{vAv9#F3p)TF-rweAZjUVh&4^t
zEwhwUtbDCfsuI~W1%v9|0W`Dy%KO+APqC%;VNKCZr7n|;4JNDtv%N;uQVhK;ND@iX
zqOU!Z0N+zp1yO#3$Pi;Dq>qtdhGdXIJv>%1YF1HLk`tzE)vDzcMVE{fOgDWm(dc&e
z*mHDf6uO7$XMYMU(rDlW8l|Z~cVwK&aW~0=I|+~j$WtqT`>uo6MCL)c!NB(B3fJ;;
z<K?+4(_{hE#->n}7|>mRyr==Yxo^fj<RsLW8Q3jLip+*oRu%m=aej*_)^e@VP_D9`
z|9>sbc%7#|{5%rrdg~LGINJ8}0VKBF6+@NcE>d>LqM=)4jFkjV<(nTWXd@F0ScD|h
zM**B19#yEws*`|i0TZ=-mb_{iWkpv+MNt19Zezk3=GXau6Q&Pan?25Y`XV^VGJOdq
z&yB#|a1;bW6IgO^K>eTr^wDgnyTzFt(0GyF4ShoMbe8WzNqUFBf4W6nRt;iQm)BI4
zgjkR5t67SwSZfJIG<1{jOrvMRJ?(buzR`Fqvgyp5s^L>~Bi!LW1D$WfQMwa8egQK=
mBmlT`PM8BJ_nL<^L#nCr2%)S6?wR?Xc19NHy~v^)GXDYft?w)V

delta 1077
zcmZ9KOH9;I6oz}tO9zJm=K*3w#6%dBheT9{nV~#qctjq7L@t9vXIh48Z#%hdqiEtQ
z#>BWXHzp)*jIN9;!on>k?$m{GLnh+Rg*%ajhL!h}kO*CTJ?H%A+<Q)YUbp>d^M3St
zJpz9oZfvPr&%DP(kGR^@fy$7e2+C2N&7%|dNEhxR5gc)2e!ZJSag@YxjKp!A^xz&M
zVTttOUebsANI&j(^8)$+8N`ER2oI42PLL!{l3_edM(~KMBYhN)s+HGQ;P(B`^%wj6
zF4xNmO7InWi*_Y`L<nC|s`0o|gC|5GAt=Wl2}<o-aaYHa%P4%DHH)8o6^pu~Dd{{_
zEz6<m+P1h^icYaFhZC1C@MH@r>g#uUvXRt`rBW*;%X&sO%+!FHb%<)%Rw|*{Nhgy^
zP+6IPW7wFd1C6iU^E?*Amw0)hjA(|X-Bu~|%02lOcm<D{w>8s9%ZfrfS*y3EyAAY`
zye?<eH;Bf#XTe1EG|ovQ9JfQg8Pl;R<eb`SskW0(-_#7nygA1ncwZuEt)XHCl}eBu
zXY0O;bvbTs`#J6l-`XSZe5<|>p0DkrzlsEesKf%5jn(~J4HwfvC>jDJ0mE#n61QIk
zt%%M-1alNTiQ(zwOka9tYK*2JDgoT~=DEc_`@*9JgsuT3j&KP*3HB66p**LlS(&DF
z&A36`X?et6ax%M-X`b`{#NBM7sun5iM%7a!u|HLRC!yIwamLh@ut*nNXVEll+Q&@_
z|LUg?EJ&jR9Q^i9u#W)T7D{wEqw4PE{D>Hn{I#WS|53K!uSFKS;~(Ugz4u>e>475n
z>a-gW1soW<17d*ltRc`?F73JDDK;J0K(nkRcnWp0@!;K9$gwqDvzJ@<ZyXKqnnHPY
zNjIsPUs~368ia^<FI~%;hQ)pdn`&qs2vvK+?psqW))6}0MbCg(y(eZ(eqI_%ZJ94A
zZR9F#0)zq0fU|&e>`AEZ(j1s70Cv=!=)kBuhoZz(99@mm=R5`W(pqQVLv!N!O?J6D
IS1j?!KdDd<q5uE@

diff --git a/components/__pycache__/help_window.cpython-312.pyc b/components/__pycache__/help_window.cpython-312.pyc
index cbf4641774186eb40891e172579b9db1bdd37df8..81ce9d2cc6ef2cb79dec005facea11d62215a95b 100644
GIT binary patch
delta 618
zcmX}pO=uHA6bJBqY0}o}Mw?F)(L()5wrWZ2sj(=gX_H9Rwl;oD7HYaX(v3UWIJ-GS
zrKjReR7TK~hu*|f$)RU2g2bbE$k~e*5d{x|;Jg)F*dK4+|IN<8e#!0R)V`{YDe^hd
z|3i15t0{=>W@ccB<%wv((Sx9viW#wIS%DPTc_N-bYTEBb?IN2e^Q=TlY=JDWMY71s
zq|7R$;^$yjNtGUIz7XRhQFtl7Lp&4PfwzE%DT<tllO;1ju9!)3HK3Fg^YFG}rszcT
zwKx+v5?bzpmKIBakG-j(ucH@N<Q~3?Tt{li4dfPb8>u6@L<{m|tk;m62ob9X_F!F%
zsdcy`?yAM?C8MC%T*_U&YBad5mmH(RXv=f;vgK7e8+w~l*KIiBlR69Mdf{+7DEDiT
zYsq`^gM)o8wW;A*PHPafJj!@mJdI>0)-fA4W#&=dz>^)MCDBHBM|_Udh96+Z6Zz;Q
z-0!VLXQ24d??~P#{1MjvNFFN$UpFk-R(=HLLYLv^7L12-|3)#?R(c;|0MHQq_}0n&
z#-{CXr@h&=Z61^HK<#*zZF${k%WzsQkISBToXCn^A{IP`i}#7+;#(q}J|!1CgJcm6
vnL<vB$z=8H2A2M{o?-R>s=r6)m}7QqdV%lB0ROQ2PP|Ii#jj*Dh+}^N-gKM+

delta 702
zcmY+CPfQa*6vlU!LP1&3wrl}|7!FDkG?jV*`v(f81&knAm1$Ah-BlK6x@C6Pgs7Z2
znRp;`G4a-mA$rl87>_32G@eZp4@Qo?s5ei}+eQ;6nO|PM?|U;Zlc_}yqsk{mIVOqq
z<m*r4a9<ffXI`I+AwQCINe>Xdj)rd22|Ph3@ua5($z>YHahkvhn#4((!YMk1r|2}E
zrfHm}GkC_!g~%+;;0&F^b2N*yG>3C^9?#PSyx{qWEaFAu#MU$Z-5*RmhY^mhdy?K)
zLoZQF6+J4xs)zBC-jA1MDJ$s%dy+nA3~$x=2Y*m$Yvu6D4vL)OQ}XBDp1Z^~^*dE&
z*tW}zdRJSsGqoaOY!z@Fa074?um-?@B4Ax0;$zpK&I4`%3j9*{JG8-@-33(QIVC-o
z(I$&|+hBIFR3hb4#VXEPnoEs}V;8fglXJ_(EGy~DFa&?2OrTi3sSNtW8UDahn219g
zUA93C%`vS?!)H1MW!szvMu#`R>(GVg7_1DpR{@ql#Lph^w}E`eLr`4a8yrEbJ|2vr
z^dnCZIFQ(5sJ+NIQ~=m^kHDVvOOCfMpx?XbWP7v~1v9c*e-T0mmH9#6ZbEe(lbFuV
zg`-c&LL%8Xu5A*FS=G%QLRcRt%D=d&SrwaKQAcHVns2LN{!|^2*;)Qd9pYcqewmH&
tAL{&hO*DC9v3;oi&-<q{PA%OfMv}c327CegBVP*_<cr^UJ$&B>$-mohx)1;W

diff --git a/components/__pycache__/tomi_calculations.cpython-312.pyc b/components/__pycache__/tomi_calculations.cpython-312.pyc
index eda344b60e33d04804d34ae3a8095adb93ec7781..d97d416a7587cf37514120fb84769400c784a5ff 100644
GIT binary patch
delta 985
zcmY+B%TE(g6vpTF0R$Ln5lTygR<OwMC~YYMr9~x5!6+I6LM~M(?FiG%?bJK1iow8w
z5aUX6O<Wi@tTaRy;6`2e2M}GGMiaMeaR(vso+-pI$^2%{cOG-*yWfIG0dZFp%LRTl
z?;gnm>!J&NS-*5>CSJ@W)Ub?%l#sHk9mI!yq!V`%KlYOV4v-)Yk}ljuLO4Xaako)d
ztzITQxQF!OUebsANEnAnKkg?H95M1pjpC?mOE1CqPG9Ne(=kNzLdtt~6K$bl3JE45
zCZuXsg;ed9si@(ri%4>?ee`i>+a#I7om{4V4&BV*@pukm$#8r^m#H2fNhYWozpf?o
zM9$>&cudI+=jY;CD(iYeV=ikHwd_n<drQ$d_Nvk^24D<)$Fo9%?0aPxg;<&B<LnWC
zw+-?{p=3c;<`;63mEPbX9RjU9si}FA(X)vRje$DMuAJF-7}MZSJTwUEB*(J>_N%gq
zrK{X%l&w`=;G^GFwTX~=FVGN_1=*h}mwST0-sZPn%CRc^H6bxj%+InKTZ{h|m-lQO
zl7-&k4|*2>E7CEJ0(vT$sRhF0jZ|9$>SQl%J~YTa+s30tQ^`qF!JN~wlDS~fm6Uwk
z!gG>`PQkRYaV@LLk7bn_cK5NH_GT1jkL-=8mA$sVt+)t-ynsd)u5K8rhu8DaDkc+Z
zawew{Wo9my;l6<_{}-jRP*na<QRSITg7AZ}a$%OABX^B$RQplK&X4L3CT`SHZKJ~n
z%`<>$4*l3&_NlggGz|hYuLwWODh;njr4ky4;`@LHfG)rq;03@KRkR(#_7gNSpTjL0
z3DBf#^f|ldm`0RsJD#8^)>=32tw=7Y8r8B3i>gZDC<<aer>IJ9(WfM}j85%bV_)l9
zoCW(yqWDx~oq|K`u&#+UIqNNr5Ja3VhMn#fV~Nv?9h60gmddO00Nv!J@Z0(uw&5IM
Kd(JTntoaWaljBJM

delta 1039
zcmY+C%}*0S7{+%>`3Q9Bhtd`ZT0v-+LM@cfLLsq6KqDUk4UQEk-IXrxbn9%Z5);Kp
zG~UEHnBdJA6N7r;uJPi<f50^1;Dy919854K&btK(oAkHyKF>Sv&OY0}9bY=d@1j^K
z@M}ZZQ|_#bwdmWr|4#%7vLHLPX3~ONh#&h&00)SKCDMvpNe~A~8*U@*xSfP>$n14#
zYzoyrB0ac=^x|GqJE8TFe%w!@I7$Za02#!CB!**T2oIS)(uVP{;#gjV=O4e8pB%5D
zS`y@wZ_p+xI!LexBZ6GBCdlqhOHsq6=U0&AVLRxPz514xSLOLERSY9fm92G4n`J1>
z`)CJ;QNrQ#`SvfTqKT`9LXAW+sVycmdg6kf$`d7%GZG_eZZyA`7@<jd62`FK))<nu
zx=Z`Y(P@^kg~d)71rPVF(g@qMMNv1~v4uEm#O+|58-=p8qAsO#QYpR2OF9BtWlGob
zBx7Wg89EB;7;C8Bb(+)Q^?Wn}>MZlw<7k4(_A`9qQ+rUH<??%hc7q#XpY65v*Z6Xr
z|BP~uHDS+!#Ezn$WV`l2_zIVQIXEOMo#Zz<1%Q*$X^sNAFO^U$lm`d7<Y+))mUe_t
zoV{|)#LP`)hnor|IXx?t6s(3SD+gP+C;8}gm{u{PXEo)nqER#HC<{1S&;XloHliS-
z&ev7VFsKF4#JsMCU_C5-90f6z)Kc>~ov8DRxeSjB(l|OOO|k`79g46At}qI1eQ<rW
z@Jw(`qx&56EdUZ6#zB7UWlh`oZ4gR1R)rrGHZzuSsf^x)<~hJTpbPK}@EouJC?*W6
z_CxrY&0Q~=253^8K4e|)8^~ZU-1pFRR^ge6x$`+yQ*$e!<9|L1AD~c`N^3gRv*{I0
zqfSu7!*(^LXAJh(6Y$bHFr0@*@vbTc`|4@3&_?#t(@@vMTj*K9QJj7#1I+6^6);b{
k0QLX3*smBQx}4XPA^MgZkdd*$=DcH;j&1hNJ8gx|f5-^)UjP6A

diff --git a/components/about.py b/components/about.py
index 25fa4dc..f2b81f2 100644
--- a/components/about.py
+++ b/components/about.py
@@ -27,7 +27,6 @@
 from CTkToolTip import CTkToolTip
 from ttkwidgets.font import *
 # Local application/library specific imports #
-from utility.fluid_pressure import fluid_pressure
 from chlorophyll import CodeView
 from utility.icons import (add_img, remove_img, font_img, show_plot_img,
                            inventory_img, code_img, folder_img, save_img, new_file_img)
diff --git a/components/help_window.py b/components/help_window.py
index 1b45ed4..ef48257 100644
--- a/components/help_window.py
+++ b/components/help_window.py
@@ -27,7 +27,6 @@
 from CTkToolTip import CTkToolTip
 from ttkwidgets.font import *
 # Local application/library specific imports #
-from utility.fluid_pressure import fluid_pressure
 from chlorophyll import CodeView
 from utility.icons import (add_img, remove_img, font_img, show_plot_img,
                            inventory_img, code_img, folder_img, save_img, new_file_img)
diff --git a/components/tomi_calculations.py b/components/tomi_calculations.py
index 4bec51e..eb0af63 100644
--- a/components/tomi_calculations.py
+++ b/components/tomi_calculations.py
@@ -22,7 +22,6 @@
 from CTkToolTip import CTkToolTip
 from ttkwidgets.font import *
 # Local application/library specific imports #
-from utility.fluid_pressure import fluid_pressure
 from chlorophyll import CodeView
 from utility.icons import (add_img, remove_img, font_img, show_plot_img,
                            inventory_img, code_img, folder_img, save_img, new_file_img)
diff --git a/kraken.py b/kraken.py
index baee95e..1e19232 100644
--- a/kraken.py
+++ b/kraken.py
@@ -8,6 +8,7 @@
 import subprocess
 # Related third party imports #
 from tkinter import scrolledtext
+from sklearn.cluster import KMeans # entender o porque desse import
 from click import command
 import customtkinter as ctk
 import matplotlib.pyplot as plt
@@ -31,7 +32,6 @@
 from components.about import AboutPage
 from components.help_window import HelpWindow
 from components.tomi_calculations import TOMICalc
-from utility.fluid_pressure import fluid_pressure
 from chlorophyll import CodeView
 from utility.icons import (add_img, remove_img, font_img, show_plot_img,
                            inventory_img, code_img, folder_img, save_img, new_file_img)
@@ -218,33 +218,6 @@ def __init__(self, master, app):
         self.master = master
         self.app = app
 
-    def file_dialog_standard(self, frame, width=width, height=height, border_width=border_width):
-        class CTkCustomOptionMenu(ctk.CTkOptionMenu):
-            def destroy(self):
-                self.tk.call('destroy', self._w)
-
-        file_names = os.listdir("./uploads")
-
-        self.selected_file = tk.StringVar(frame)
-        self.arq_label = ctk.CTkLabel(frame,
-                                text="Selecione o arquivo: ",
-                                font=("Segoe UI", 16),
-                                width=width, height=height)
-        self.arq_label.pack(fill='x', padx=5, pady=5)
-
-        self.arq_option_menu = CTkCustomOptionMenu(
-                                                master=frame,
-                                                variable=self.selected_file,
-                                                values=file_names,
-                                                fg_color="#fdfdfd",
-                                                button_color=BTN_FG_COLOR,
-                                                button_hover_color=BTN_FG_HOVER_COLOR,
-                                                text_color=TEXT_COLOR,
-                                                text_color_disabled="#292929",
-                                                width=75,
-                                                )
-        self.arq_option_menu.pack(fill='x', padx=5, pady=5)
-
     def open_calculations_window(self):
         self.cal_window = tk.Toplevel(self.master)
         self.cal_window.attributes('-toolwindow', True)
@@ -295,27 +268,29 @@ def open_calculations_window(self):
     def plot_first_tab(self, tab, width=width, height=height, border_width=border_width):
 
         # Defining the 8 frames
-
-        self.plot_tab_frames = [ctk.CTkFrame(tab, corner_radius=1, border_color=BORDER_COLOR,
-                                        fg_color=FG_COLOR_IN2, border_width=border_width)
-                                for _ in range(8)]
-
-        self.plot_tab_frames[0].grid(row=1, column=0, rowspan=1,
-                                     columnspan=2, padx=5, pady=5, sticky='nsew') # TextBox, title
-        self.plot_tab_frames[1].grid(row=2, column=0, rowspan=1,
-                                     columnspan=1, padx=5, pady=5, sticky='nsew') # prof max and min
-        self.plot_tab_frames[2].grid(row=2, column=1, rowspan=1,
-                                     columnspan=1, padx=5, pady=5, sticky='nsew') #
-        self.plot_tab_frames[3].grid(row=3, column=0, rowspan=1,
-                                     columnspan=1, padx=5, pady=5, sticky='nsew') # Radio buttons
-        self.plot_tab_frames[4].grid(row=3, column=1, rowspan=1,
-                                     columnspan=1, padx=5, pady=5, sticky='nsew')
-        self.plot_tab_frames[5].grid(row=4, column=0, rowspan=1,
-                                     columnspan=1, padx=5, pady=5, sticky='nsew')
-        self.plot_tab_frames[6].grid(row=4, column=1, rowspan=1,
-                                     columnspan=1, padx=5, pady=5, sticky='nsew')
-        self.plot_tab_frames[7].grid(row=5, column=0, rowspan=1,
-                                     columnspan=2, padx=5, pady=5, sticky='nsew')
+        def frames_calc(self):
+            self.plot_tab_frames = [ctk.CTkFrame(tab, corner_radius=1, border_color=BORDER_COLOR,
+                                            fg_color=FG_COLOR_IN2, border_width=border_width)
+                                    for _ in range(8)]
+
+            self.plot_tab_frames[0].grid(row=1, column=0, rowspan=1,
+                                        columnspan=2, padx=5, pady=5, sticky='nsew') # TextBox, title
+            self.plot_tab_frames[1].grid(row=2, column=0, rowspan=1,
+                                        columnspan=1, padx=5, pady=5, sticky='nsew') # prof max and min
+            self.plot_tab_frames[2].grid(row=2, column=1, rowspan=1,
+                                        columnspan=1, padx=5, pady=5, sticky='nsew') #
+            self.plot_tab_frames[3].grid(row=3, column=0, rowspan=1,
+                                        columnspan=1, padx=5, pady=5, sticky='nsew') # Radio buttons
+            self.plot_tab_frames[4].grid(row=3, column=1, rowspan=1,
+                                        columnspan=1, padx=5, pady=5, sticky='nsew')
+            self.plot_tab_frames[5].grid(row=4, column=0, rowspan=1,
+                                        columnspan=1, padx=5, pady=5, sticky='nsew')
+            self.plot_tab_frames[6].grid(row=4, column=1, rowspan=1,
+                                        columnspan=1, padx=5, pady=5, sticky='nsew')
+            self.plot_tab_frames[7].grid(row=5, column=0, rowspan=1,
+                                        columnspan=2, padx=5, pady=5, sticky='nsew')
+
+        frames_calc(self)
 
         self.calculator_text_label = \
             "Plotagem Simples"
@@ -366,12 +341,12 @@ def plot_first_tab(self, tab, width=width, height=height, border_width=border_wi
         #---------------------------- Frame 3 --------------------------------------------------------
         #------------------------ Radio Button Frame -------------------------------------------------
         self.radiobtn_frame = ctk.CTkFrame(self.plot_tab_frames[2],
-                                fg_color="transparent",
-                                height=height)
+                                           fg_color="transparent",
+                                           height=height)
         self.radiobtn_frame.pack(side="left", padx=5, pady=5)
 
         self.prof_cota_var = tk.StringVar()
-        self.prof_cota_ou_nao = ctk.CTkLabel(self.radiobtn_frame, text="Profundidade está em cota?: ",
+        self.prof_cota_ou_nao = ctk.CTkLabel(self.radiobtn_frame, text="Cota?: ",
                                                 font=("Segoe UI", 12))
         self.prof_cota_ou_nao.grid(row=0, column=0, columnspan=2, padx=5, pady=5)
 
@@ -388,7 +363,7 @@ def plot_first_tab(self, tab, width=width, height=height, border_width=border_wi
                                                     value="Não",
                                                     text="Não")
         self.prof_cota_radio_n.grid(row=1, column=1, padx=5, pady=5)
-
+        ############## Mesa Rotatoria
         self.mesa_rot_frame = ctk.CTkFrame(self.plot_tab_frames[4],
                                                 fg_color="transparent",
                                                 height=height)
@@ -406,9 +381,9 @@ def plot_first_tab(self, tab, width=width, height=height, border_width=border_wi
 
         custom_tooltip(
                 self.mesa_rot_entry,
-                "Mesa Rotativa é a distância entre a superfície do oceano \n"
-                "(do solo no caso de poços terrestres), e a profundidade em cota é \n"
-                "calculada usando o valor de altura da mesa rotativa",
+                "Mesa Rotativa se refere à distância entre a superfície do oceano"\
+                "(ou nível do solo para poços terrestres) até uma certa profundidade,"\
+                "calculada usando o valor de altura da mesa rotativa.",
                 delay=1
             )
         #------------------------ Frame 4 -------------------------------------------------
@@ -420,7 +395,7 @@ def plot_first_tab(self, tab, width=width, height=height, border_width=border_wi
                                                     placeholder_text="Insira aqui...")
         custom_tooltip(self.plot_title_entry, "Insira um título para o gráfico", delay=1)
 
-        self.skip_rows = ctk.CTkLabel(self.plot_tab_frames[5], text="Pular linhas*: ",
+        self.skip_rows = ctk.CTkLabel(self.plot_tab_frames[5], text="Header?: ",
                                         font=("Segoe UI", 16), height=height)
 
         self.skip_rows_entry = custom_CTkEntry(self.plot_tab_frames[5], width=200,
@@ -469,17 +444,20 @@ def plot_first_tab(self, tab, width=width, height=height, border_width=border_wi
         #------------------------------------ Plot btn ------------------------------------
         self.calc_btn = create_custom_button(root=self.plot_tab_frames[7],
                                             text="Plotar",
-                                            command=self.plot_final,
+                                            command=self.call_plot_simple,
                                             width=200)
         self.calc_btn.pack(side="top", padx=5, pady=5)
 
     def second_tab(self, tab, width=220, height=height, border_width=border_width):
-        # Defining the frames
 
+        # Defining the frames
         self.second_tab_frames = [ctk.CTkFrame(tab, corner_radius=1,border_color=BORDER_COLOR,
                                 fg_color=FG_COLOR_IN2, border_width=border_width)
                                 for _ in range(4+1)]
 
+        tab.columnconfigure((0,1), weight=1)
+        tab.rowconfigure((0,1,2,3,4), weight=1)
+
         self.second_tab_frames[0].grid(row=0, column=0, rowspan=1, columnspan=2,
                                        padx=5, pady=5, sticky='nsew')
         self.second_tab_frames[1].grid(row=1, column=0, rowspan=2, columnspan=2,
@@ -515,7 +493,7 @@ def second_tab(self, tab, width=220, height=height, border_width=border_width):
         self.file_dialog_standard(self.second_tab_frames[1])
 
         ####### Frame 3 - Pressure input
-        self.pressure_units = ["psi/m", "Kgf/cm2/m", "Kgf/cm2/ft", "psi/ft"]
+        self.pressure_units = ["psi/ft", "psi/m", "Kgf/cm2/m", "bar/m"]
         self.pressure_choice = tk.StringVar()
         self.pressure_choice.set(self.pressure_units[0])
 
@@ -523,7 +501,7 @@ def second_tab(self, tab, width=220, height=height, border_width=border_width):
                                 text="Unidade da pressão: ",
                                 font=("Segoe UI", 16),
                                 width=width, height=height)
-        self.press_label.pack(fill='x', padx=5, pady=5)
+        self.press_label.pack(fill='both', padx=5, pady=5)
 
         self.press_option_menu = ctk.CTkOptionMenu(
                                                 master=self.second_tab_frames[2],
@@ -536,49 +514,72 @@ def second_tab(self, tab, width=220, height=height, border_width=border_width):
                                                 text_color_disabled="#292929",
                                                 width=50,
                                                 )
-        self.press_option_menu.pack(fill='x', padx=5, pady=5)
+        self.press_option_menu.pack(fill='both', padx=5, pady=5)
 
         ####### Frame 4 - Kmeans Cluster
-        self.kmeans_label = ctk.CTkLabel(self.second_tab_frames[3], text="Agrupamento: ",
-                                        font=("Segoe UI", 16), height=height)
-        self.kmeans_entry = custom_CTkEntry(self.second_tab_frames[3],
-                                            placeholder_text="Insira aqui...")
+        self.second_tab_frames[3].columnconfigure((0,1), weight=1, uniform='a')
+        self.second_tab_frames[3].rowconfigure((0,1), weight=1, uniform='a')
+
+        # Kmeans Frame
+        self.kmeans_frame = ctk.CTkFrame(self.second_tab_frames[3], fg_color="transparent")
+        self.kmeans_frame.grid(row=0, column=0, columnspan=2, padx=5, pady=5, sticky='nsew')
 
+        self.kmeans_label = ctk.CTkLabel(self.kmeans_frame, text="Agrupamento: ", font=("Segoe UI", 16), height=height)
         self.kmeans_label.pack(side="left", padx=5, pady=5)
+
+        self.kmeans_entry = custom_CTkEntry(self.kmeans_frame, placeholder_text="Insira aqui...")
         self.kmeans_entry.pack(side="right", expand=True, padx=5, pady=5)
+
         custom_tooltip(self.kmeans_entry, "Insira o número de agrupamentos para dividir o dado", delay=1)
 
+        # Radio Button Frame
+        self.radiobtn_frame = ctk.CTkFrame(self.second_tab_frames[3], fg_color="transparent")
+        self.radiobtn_frame.columnconfigure((0,1), weight=1)
+        self.header_bool = tk.StringVar()
+        self.header_sim_ou_nao = ctk.CTkLabel(self.radiobtn_frame,
+                                              text="O arquivo possui header?: ",
+                                              font=("Segoe UI", 14))
+        self.toggle_frame = ctk.CTkFrame(self.radiobtn_frame, fg_color="transparent")
+
+        self.header_y = ctk.CTkRadioButton(self.toggle_frame,
+                                           command=self.radiobutton_event(self.header_bool),
+                                           variable=self.header_bool, value="Sim", text="Sim")
+        self.header_n = ctk.CTkRadioButton(self.toggle_frame,
+                                           command=self.radiobutton_event(self.header_bool),
+                                           variable=self.header_bool, value="Não", text="Não")
+
+        self.radiobtn_frame.grid(row=1, column=0, columnspan=2, padx=5, pady=5, sticky='nswe')
+        self.header_sim_ou_nao.grid(row=0, column=0, columnspan=2, padx=5, pady=5, sticky='nswe')
+        self.toggle_frame.grid(row=1, column=0, columnspan=2, padx=5, pady=5, sticky='nswe')
+        self.header_y.pack(side='left', expand=True)
+        self.header_n.pack(side='left', expand=True)
+
         ####### Frame 5 - Plot btn
         self.calc_btn = create_custom_button(root=self.second_tab_frames[4],
                                             text="Plotar",
-                                            command=self.third_tab,
+                                            command=self.call_plot_trends,
                                             width=200)
         self.calc_btn.pack(side="top", padx=5, pady=5)
 
     def third_tab(self):
         pass
 
-    def radiobutton_event(self):
+    def radiobutton_event(self, var):
         # Get the currently selected value
-        self.selected_value = self.prof_cota_var.get()
+        self.selected_value = var.get()
 
         if self.selected_value == "Sim":
             return "Sim"
         elif self.selected_value == "Não":
             return "Não"
 
-    def open_file(self):
-        skip_rows_str = self.skip_rows_entry.get()
-        if skip_rows_str == "":
-            skipped_rows = 0
-        else:
-            skipped_rows = int(skip_rows_str)
+    def open_file(self, skiprows=0):
         arq_label_selected_file = "./uploads/" + self.selected_file.get()
         try:
             pressao_df = pd.read_csv(arq_label_selected_file,
                                     delimiter='[;,]',
-                                    skiprows=skipped_rows,
-                                    names=["A", "B"],
+                                    skiprows=skiprows,
+                                    names=["prof", "pressao"],
                                     engine='python')
             pressao_df = pressao_df.dropna()
             return pressao_df
@@ -588,15 +589,49 @@ def open_file(self):
             return None
 
     # dataframe = self.open_file()
+    def file_dialog_standard(self, frame, width=width, height=height, border_width=border_width):
+        class CTkCustomOptionMenu(ctk.CTkOptionMenu):
+            def destroy(self):
+                self.tk.call('destroy', self._w)
+
+        file_names = os.listdir("./uploads")
+
+        self.selected_file = tk.StringVar(frame)
+        self.arq_label = ctk.CTkLabel(frame,
+                                text="Selecione o arquivo: ",
+                                font=("Segoe UI", 16),
+                                width=width, height=height)
+        self.arq_label.pack(fill='x', padx=5, pady=5)
+
+        self.arq_option_menu = CTkCustomOptionMenu(
+                                                master=frame,
+                                                variable=self.selected_file,
+                                                values=file_names,
+                                                fg_color="#fdfdfd",
+                                                button_color=BTN_FG_COLOR,
+                                                button_hover_color=BTN_FG_HOVER_COLOR,
+                                                text_color=TEXT_COLOR,
+                                                text_color_disabled="#292929",
+                                                width=75,
+                                                )
+        self.arq_option_menu.pack(fill='x', padx=5, pady=5)
+
+    def plot_simple(self, x, y, title, xlabel, ylabel, ymin, ymax, dataframe):
 
-    def plot_simples(self, x, y, title, xlabel, ylabel, ymin, ymax, dataframe):
-         # Check radio button selection
-        self.radiobutton_event()
-        # Check radio button selection
-        if not self.selected_value:  # substitua 'selected_value' por 'selected_file'
-            msg = custom_messagebox(title="Erro", message="É obrigatório selecionar se a profundidade é em cota ou não.",
+        if not self.radiobutton_event(self.prof_cota_var):
+            msg = custom_messagebox(title="Erro", message="É obrigatório selecionar se o arquivo possui header ou não.",
                                 icon="./img/icons/cancel.png", option_1="Cancelar", width=400)
 
+        self.boolean = self.radiobutton_event(self.prof_cota_var)
+        self.skip_rows_bool = self.skip_rows_entry.get()
+
+        if self.skip_rows_bool == "Sim":
+            self.dataframe = self.open_file(skiprows=1)
+            print("Sim was selected")
+        else:
+            self.dataframe = self.open_file()
+            print("Não was selected")
+
         ymin = int(self.prof_min_entry.get()) if self.prof_min_entry.get() else None
         ymax = int(self.prof_max_entry.get()) if self.prof_max_entry.get() else None
 
@@ -628,9 +663,9 @@ def plot_simples(self, x, y, title, xlabel, ylabel, ymin, ymax, dataframe):
             custom_messagebox(title="Error", message=f"Um erro ocorreu: {e}",
                         icon="./img/icons/cancel.png", option_1="OK", width=400)
 
-    def plot_final(self):
-        self.dataframe = self.open_file()
-        self.plot_simples(self.dataframe.iloc[:, 1],
+    def call_plot_simple(self):
+        # self.dataframe = self.open_file()
+        self.plot_simple(self.dataframe.iloc[:, 1],
                           self.dataframe.iloc[:, 0],
                           self.plot_title_entry.get(),
                           self.x_label_entry.get(),
@@ -639,37 +674,194 @@ def plot_final(self):
                           self.prof_max_entry.get(),
                           self.dataframe)
 
-    def plot_dos_dados(self):
-        pass
-
-
-    def calculate(self):
-        def inv_polynomial(dobs, degree, x):
-            """
-            Funcao para calcular os parâmetros de uma regressao polinomial
-            Dados de entrada:
-                d = dados observados
-                degree = grau do polinomio
-                x = valores das posicoes onde d foi medido, tem que ter a mesma dimensao de d
-
-            Output:
-                m = parametros
-                G = matriz de modelagem direta
-            """
-            nl = max(np.shape(dobs))
+    def plot_trends(self):
+        if not self.radiobutton_event(self.header_bool):
+            msg = custom_messagebox(title="Erro",
+                                    message="É obrigatório selecionar se o arquivo possui header ou não.",
+                                    icon="./img/icons/cancel.png",
+                                    option_1="Cancelar", width=400)
 
-            G = np.ones((nl,1))
-            for pw in range(1,degree+1):
+        self.boolean = self.radiobutton_event(self.header_bool)
 
-                G = np.c_[G, x**pw ]
-
-            m = np.dot(np.dot(inv(np.dot(G.T,G)),G.T), dobs)
-
-            return m, G
-
-        # m, G = inv_polynomial(dobs=pressao_ogx_93_ma['Profundidade'], degree=1, x=pressao_ogx_93_ma['Pressão de\nFormação\n(Kgf/cm2)'])
-        # print(f"y = {m[0]:.2f} + {m[1]:.2f}x")
+        if self.boolean == "Sim":
+            df = self.open_file(skiprows=1)
+            print("Há header no arquivo")
+        else:
+            df = self.open_file()
+            print("Não há header no arquivo")
+
+        prof = df["prof"]
+        pressao = df["pressao"]
+
+        def calculate_slope(ps_a, ps_b):
+            if len(ps_a) != len(ps_b):
+                raise ValueError("ps_a and ps_b must have the same length")
+            coefficients = np.polyfit(ps_a, ps_b, 1)
+            return coefficients[0]
+
+        slopes = []
+        slope_indices = {}
+        for i in range(len(prof) - 1):
+            x_values = np.array([prof[i], prof[i + 1]])
+            y_values = np.array([pressao[i], pressao[i + 1]])
+            slope = calculate_slope(x_values, y_values) * -1
+            slopes.append(slope)
+            slope_indices[slope] = [i, i + 1]
+
+        # Convert the list of slopes to a numpy array
+        slopes_array = np.array([slopes, slopes])
+
+        # Perform KMeans clustering on the slopes
+        kmeans_number = int(self.kmeans_entry.get())
+        kmeans = KMeans(n_clusters=kmeans_number, random_state=0).fit(slopes_array.T)
+
+        # Classify the data based on the clusters
+        classified_data = [list(kmeans.labels_)[0]] + list(kmeans.labels_)
+
+        def convert_classification(class_data):
+            if class_data[0] == 1:
+                return [1 - label for label in class_data]
+            return class_data
+
+        # Convert the classification labels if necessary
+        converted_data = convert_classification(classified_data)
+
+        # Separate the data into two groups based on the classification
+        top_values = [(prof[i], pressao[i]) for i, label in enumerate(converted_data) if label == 1]
+        bottom_values = [(prof[i], pressao[i]) for i, label in enumerate(converted_data) if label == 0]
+
+        # Calculate the line of best fit for each group
+        top_prof, top_pressao = zip(*top_values)
+        bottom_prof, bottom_pressao = zip(*bottom_values)
+
+        slope_top, intercept_top = np.polyfit(top_prof, top_pressao, 1)
+        slope_bottom, intercept_bottom = np.polyfit(bottom_prof, bottom_pressao, 1)
+
+        pressure_unit = self.pressure_choice.get()
+        # four pressure units to choose from (psi/ft, psi/m, Kgf/cm2/m, bar/m)
+
+        fluid_pressure = {
+        "dry_gas_zero": {"name":"Dry gas zero","gradient":{"psi/ft":0.0,"psi/m":0.0,"kgf/cm2/m":0.0,"bar/m":0.0}},
+        "dry_gas": {"name":"Dry gas","gradient":{"psi/ft":0.0,"psi/m":0.0,"kgf/cm2/m":0.0,"bar/m":0.0}},
+        "wet_gas": {"name":"Wet gas","gradient":{"psi/ft":0.140,"psi/m":0.459,"kgf/cm2/m":0.030,"bar/m":0.032}},
+        "oil_limit": {"name":"Oil limit","gradient":{"psi/ft":0.300,"psi/m":0.984,"kgf/cm2/m":0.069,"bar/m":0.069}},
+        "oil_60": {"name":"Oil 60°","gradient":{"psi/ft":0.387,"psi/m":1.270,"kgf/cm2/m":0.089,"bar/m":0.087}},
+        "oil_20": {"name":"Oil 20° (heavy)","gradient":{"psi/ft":0.404,"psi/m":1.325,"kgf/cm2/m":0.093,"bar/m":0.091}},
+        "fresh_water": {"name":"Fresh water","gradient":{"psi/ft":0.433,"psi/m":1.421,"kgf/cm2/m":0.100,"bar/m":0.098}},
+        "sea_water": {"name":"Sea Water","gradient":{"psi/ft":0.444,"psi/m":1.457,"kgf/cm2/m":0.102,"bar/m":0.101}},
+        "salt_sat_water": {"name":"Salt sat. Water","gradient":{"psi/ft":0.520,"psi/m":1.706,"kgf/cm2/m":0.120,"bar/m":0.118}},
+        "salt_max": {"name":"Salt sat. Water Max","gradient":{"psi/ft":100.000,"psi/m":100.000,"kgf/cm2/m":100.000,"bar/m":100.000}}
+        }
+
+        # Get a list of all fluid keys
+        fluid_keys = list(fluid_pressure.keys())
+
+        # Initialize an empty dictionary for pressure values
+        pressure_values = {}
+
+        # Iterate over each pair of consecutive fluids
+        for i in range(len(fluid_keys) - 1):
+            # Get the top and bottom fluids
+            top_fluid = fluid_keys[i]
+            bottom_fluid = fluid_keys[i + 1]
+
+            # Get the pressure gradient values for the top and bottom fluids
+            top_pressure = fluid_pressure[top_fluid]["gradient"][pressure_unit]
+            bottom_pressure = fluid_pressure[bottom_fluid]["gradient"][pressure_unit]
+
+            # Store the pressure values in the dictionary
+            pressure_values[top_fluid] = [top_pressure, bottom_pressure]
+
+        # Remove the first key-value pair from the dictionary
+        first_key = next(iter(pressure_values))
+        pressure_values.pop(first_key)
+
+        # Initialize the top fluid
+        top_fluid = 0
+
+        # Find the fluid that matches the top slope
+        for fluid, pressures in pressure_values.items():
+            if -1.*round(slope_top,4) >= pressures[0] and -1.*round(slope_top,4) < pressures[1]:
+                top_fluid = fluid
+
+        # Find the fluid that matches the bottom slope
+        for fluid, pressures in pressure_values.items():
+            if -1.*round(slope_bottom,4) >= pressures[0] and -1.*round(slope_bottom,4) < pressures[1]:
+                bottom_fluid = fluid
+
+        # Get the names of the top and bottom fluids
+        top_fluid_name = fluid_pressure[top_fluid]['name']
+        bottom_fluid_name = fluid_pressure[bottom_fluid]['name']
+
+        # Print the names of the top and bottom fluids
+        print(top_fluid_name, "|", bottom_fluid_name)
+
+
+        x_intercept = (intercept_bottom - intercept_top) / (slope_top - slope_bottom)
+        y_intercept = slope_top * x_intercept + intercept_top
+        print('O ponto de interseção das retas é',x_intercept,y_intercept)
+
+        diff = np.diff(top_prof)
+        print(diff)
+
+        # Extended top curve
+        mean_cota_top = np.mean(np.diff(top_prof))
+        extended_cota_top = [(np.abs(mean_cota_top) + np.max(top_prof))] + list(top_prof)
+        extended_pressure_top = np.array(extended_cota_top)*slope_top + intercept_top
+
+        # Extended bot curve
+        mean_cota_bot = np.mean(np.diff(bottom_prof))
+        extended_cota_bot =  list(bottom_prof) + [(np.min(bottom_prof) + mean_cota_bot)]
+        extended_pressure_bot = np.array(extended_cota_bot)*slope_bottom + intercept_bottom
+
+        # Calculate the line of best fit for the top and bottom fluids
+        line_top = slope_top * np.array(top_prof) + intercept_top
+        line_bottom = slope_bottom * np.array(bottom_prof) + intercept_bottom
+
+        plt.figure(figsize=(13,5))
+
+        plt.subplot(131)
+        plt.plot(top_pressao,top_prof,'o',c="C0",label='top curve '+str(round(slope_top,4)))
+        plt.plot(bottom_pressao,bottom_prof,'o',c="C3",label='bot curve '+str(round(slope_bottom,4)))
+        plt.legend(fontsize='small')
+        plt.xlabel('Pressão (PSI)')
+        plt.ylabel('Cota (M)')
+        plt.grid()
+        # plt.show() # Plota o gráfico com os clusters divididos
+
+        plt.subplot(132)
+        # Plot the data points for the top and bottom fluids
+        plt.plot(top_pressao, top_prof, 'o', c="C0", label=top_fluid_name)
+        plt.plot(bottom_pressao, bottom_prof, 'o', c="C3", label=bottom_fluid_name)
+
+        # Plot the lines of best fit for the top and bottom fluids
+        plt.plot(line_top, top_prof, c="C9", label=f'{top_fluid_name} {round(slope_top, 4)}')
+        plt.plot(line_bottom, bottom_prof, c="C1", label=f'{bottom_fluid_name} {round(slope_bottom, 4)}')
+
+        # Add a legend, labels, and a grid
+        plt.legend(fontsize='small')
+        plt.xlabel('Pressão (PSI)')
+        plt.ylabel('Cota (M)')
+        plt.grid()
+
+        plt.subplot(133)
+        plt.plot(top_pressao,top_prof,'o',c="C0",label=top_fluid_name)
+        plt.plot(bottom_pressao,bottom_prof,'o',c="C3",label=bottom_fluid_name)
+
+        plt.plot(extended_pressure_top,extended_cota_top,c="C9",label=bottom_fluid_name+" "+str(round(slope_bottom,4)))
+        plt.plot(extended_pressure_bot,extended_cota_bot,c="C1",label=top_fluid_name+" "+str(round(slope_top,4)))
+        plt.plot(y_intercept,x_intercept,'s',c="k",label="Intersection "+str(round(x_intercept,4)) )
 
+        plt.legend(fontsize='small')
+        plt.xlabel('Pressure (PSI)')
+        plt.ylabel('Level (M)')
+        plt.grid()
+
+        plt.tight_layout()
+        plt.show()
+
+    def call_plot_trends(self):
+        self.plot_trends()
 
 
 class SheetEditor:
diff --git a/pressao_automatizada.py b/pressao_automatizada.py
index d0e8b59..53b47e9 100644
--- a/pressao_automatizada.py
+++ b/pressao_automatizada.py
@@ -6,7 +6,7 @@
 
 fluid_pressure = fluid_pressure() # dictionary of fluid pressures
 
-df = pd.read_csv('./uploads/pressao_exemplo_2.csv',
+df = pd.read_csv('./uploads/ogx.csv',
 				  sep=";",
 				  skiprows=1,
 				  names=["prof", "pressao"])
@@ -32,13 +32,7 @@ def calculate_slope(ps_a, ps_b):
     coefficients = np.polyfit(ps_a, ps_b, 1)
 
     return coefficients[0]
-# testing the function
-# calculate_slope(
-# 				np.array([prof[0], prof[1]]),
-# 				np.array([pressao[0], pressao[1]])
-# 				)
 
-# Calculate the slope between each pair of consecutive points
 slopes = []
 slope_indices = {}
 for i in range(len(prof) - 1):
@@ -48,8 +42,6 @@ def calculate_slope(ps_a, ps_b):
 	slopes.append(slope)
 	slope_indices[slope] = [i, i + 1]
 
-# print(slope_indices)
-
 # Convert the list of slopes to a numpy array
 slopes_array = np.array([slopes, slopes])
 
@@ -148,12 +140,12 @@ def convert_classification(class_data):
 
 # Extended top curve
 mean_cota_top = np.mean(np.diff(top_prof))
-extended_cota_top = list(top_prof) + [mean_cota_top + np.min(top_prof)]
+extended_cota_top = [(np.abs(mean_cota_top) + np.max(top_prof))] + list(top_prof)
 extended_pressure_top = np.array(extended_cota_top)*slope_top + intercept_top
 
 # Extended bot curve
 mean_cota_bot = np.mean(np.diff(bottom_prof))
-extended_cota_bot =  [(np.max(bottom_prof) - mean_cota_bot)] + list(bottom_prof)
+extended_cota_bot =  list(bottom_prof) + [(np.min(bottom_prof) + mean_cota_bot)]
 extended_pressure_bot = np.array(extended_cota_bot)*slope_bottom + intercept_bottom
 
 # Calculate the line of best fit for the top and bottom fluids
diff --git a/uploads/dry_gas.csv b/uploads/dry_gas.csv
new file mode 100644
index 0000000..0da2aec
--- /dev/null
+++ b/uploads/dry_gas.csv
@@ -0,0 +1,11 @@
+prof; pressao
+-1175.00; 1980.00
+-1180.00; 1985.00
+-1185.00; 1990.00
+-1190.00; 1995.00
+-1195.00; 2000.00
+-1200.00; 2005.00
+-1205.00; 2010.00
+-1210.00; 2015.00
+-1215.00; 2020.00
+-1220.00; 2025.00
\ No newline at end of file
diff --git a/uploads/fresh_water.csv b/uploads/fresh_water.csv
new file mode 100644
index 0000000..8eb5219
--- /dev/null
+++ b/uploads/fresh_water.csv
@@ -0,0 +1,11 @@
+prof; pressao
+-1200.00; 2000.00
+-1210.00; 2010.00
+-1220.00; 2020.00
+-1230.00; 2030.00
+-1240.00; 2040.00
+-1250.00; 2050.00
+-1260.00; 2060.00
+-1270.00; 2070.00
+-1280.00; 2080.00
+-1290.00; 2090.00
diff --git a/uploads/ogx.csv b/uploads/ogx.csv
new file mode 100644
index 0000000..d745085
--- /dev/null
+++ b/uploads/ogx.csv
@@ -0,0 +1,52 @@
+prof;pressao
+-1306.0;172.1
+-1306.1;172.0
+-1309.5;172.3
+-1309.7;172.3
+-1309.0;172.1
+-1312.0;172.4
+-1315.5;172.8
+-1319.0;173.2
+-1322.5;173.7
+-1322.2;173.5
+-1322.0;173.5
+-1325.3;173.8
+-1325.5;173.8
+-1327.2;173.9
+-1326.5;173.8
+-1327.0;173.8
+-1332.5;174.4
+-1339.0;175.2
+-1344.0;175.7
+-1348.5;176.2
+-1353.5;176.8
+-1359.2;177.4
+-1359.2;177.4
+-1359.5;177.3
+-1359.7;177.3
+-1362.0;177.5
+-1375.0;179.1
+-1378.0;179.3
+-1380.5;179.6
+-1383.5;179.9
+-1386.2;180.1
+-1394.3;181.1
+-1406.2;182.6
+-1420.0;184.3
+-1450.0;188.1
+-1514.5;196.1
+-465.0;62.4
+-465.5;62.5
+-475.5;63.7
+-495.0;66.2
+-495.3;66.2
+-525.0;70.0
+-668.3;88.5
+-668.5;88.5
+-724.5;95.7
+-777.2;102.4
+-921.0;120.7
+-982.8;128.5
+-1070.2;139.6
+-1091.0;142.2
+-1146.0;148.4
diff --git a/uploads/oil_limit.csv b/uploads/oil_limit.csv
new file mode 100644
index 0000000..8798c1e
--- /dev/null
+++ b/uploads/oil_limit.csv
@@ -0,0 +1,11 @@
+prof; pressao
+-1236.50; 2026.35
+-1245.50; 2027.77
+-1251.00; 2029.19
+-1255.50; 2028.45
+-1260.30; 2030.62
+-1265.00; 2032.04
+-1267.00; 2034.88
+-1270.00; 2039.15
+-1275.00; 2044.84
+-1280.00; 2056.21
diff --git a/utility/__pycache__/color_constants.cpython-312.pyc b/utility/__pycache__/color_constants.cpython-312.pyc
index 7ee3b127a6b7af4c706d90e8985d503fbb85d1c9..f867948ebe7416db32b10894e8d1ebd9d319ca63 100644
GIT binary patch
delta 65
zcmZ3^yqKB$G%qg~0}$k2|FMyqi&4WV*(xTqIJKxa#xpswC@01xKe;qFHLs*N#yzvd
Tqcka|peVJtI5B^+BV!r>rG^$w

delta 69
zcmZ3?yquZ)G%qg~0}zz&{JD{vi&4id*(xTqIJKxaCNVK5DKRfU#w9<wG&eP`q&UVs
Xv&5q`DaO4hF(sfVwYYe)En^x00U#Hx

diff --git a/utility/__pycache__/fluid_pressure.cpython-312.pyc b/utility/__pycache__/fluid_pressure.cpython-312.pyc
index a8450fba7171d2e612a6e269d40e28137f92fc0a..8b0405ddcf2a98d93d9a606b717d2a1dc1156562 100644
GIT binary patch
delta 65
zcmaFH{fL|EG%qg~0}!OTY~)H}(Qr(*iU}=FEh>)jOinDyiE+tKF3nBND=Cg~&n)pM
TO^PWfN-Zu<%-=kN#g7pHok11>

delta 69
zcmaFF{fwLIG%qg~0}$j2Zsba0(Q!?-iU}=FEh>&lOw372%*&5)$xklLP0cGQj&aW{
X@hDA-aW6_t2`EY}F5Wza#g7pH^2`@Y

diff --git a/utility/__pycache__/icons.cpython-312.pyc b/utility/__pycache__/icons.cpython-312.pyc
index a308a504b41375faef7519522a3de00cd1cbbf06..db47166d9e575c677d713b8de28dc3bfdccf9500 100644
GIT binary patch
delta 66
zcmcaEdRdhFG%qg~0}wQBe7}+VE4zk8vQ<oIacWU<jAwFUQBI6YesXDUYF<fkjC*E@
UM`=<_K~ZXPabo^v9gfvZ00Yh!^Z)<=

delta 70
zcmcaCdR>(JG%qg~0}!l@|FDt!E4z+OvQ<oIacWU<Ok!eAQes|yj7xrUX>Mv>NpXyO
YW{F2>QjB|1VoE?!YH{&q4UW}J0AiIHL;wH)

diff --git a/utility/__pycache__/utilities.cpython-312.pyc b/utility/__pycache__/utilities.cpython-312.pyc
index bb49c40019044ccdb41cc24c2ca2b0ed70f4db6f..73a2ff07a5294b3ba3754f6d074d49405aa11154 100644
GIT binary patch
delta 66
zcmeyW_EC-dG%qg~0}yZ>`MZ(3iAlpI*(xTqIJKxa#xpswC@01xKe;qFHLs*N#yzvd
Uqcka|peVJtI5B_oPNqEq0QLzOE&u=k

delta 70
zcmeyU_EnAhG%qg~0}zz&{JD|4iAl#H*(xTqIJKxaCNVK5DKRfU#w9<wG&eP`q&UVs
Yv&5q`DaO4hF(sfVwYYfmR;E1y0B{`|0RR91

diff --git a/utility/fluid_pressure.py b/utility/fluid_pressure.py
deleted file mode 100644
index cfc87fc..0000000
--- a/utility/fluid_pressure.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def fluid_pressure():
-    """
-    This function defines a dictionary of fluid pressures.
-    Each key in the dictionary represents a type of fluid, and the value is another dictionary.
-    This nested dictionary contains the name of the fluid and its pressure gradient in various units.
-    """
-    fluid_pressure = {
-        "dry_gas_zero": {"name":"Dry gas zero","gradient":{"psi/ft":0.0,"psi/m":0.0,"kgf/cm2/m":0.0,"bar/m":0.0}},
-        "dry_gas": {"name":"Dry gas","gradient":{"psi/ft":0.0,"psi/m":0.0,"kgf/cm2/m":0.0,"bar/m":0.0}},
-        "wet_gas": {"name":"Wet gas","gradient":{"psi/ft":0.140,"psi/m":0.459,"kgf/cm2/m":0.030,"bar/m":0.032}},
-        "oil_limit": {"name":"Oil limit","gradient":{"psi/ft":0.300,"psi/m":0.984,"kgf/cm2/m":0.069,"bar/m":0.069}},
-        "oil_60": {"name":"Oil 60°","gradient":{"psi/ft":0.387,"psi/m":1.270,"kgf/cm2/m":0.089,"bar/m":0.087}},
-        "oil_20": {"name":"Oil 20° (heavy)","gradient":{"psi/ft":0.404,"psi/m":1.325,"kgf/cm2/m":0.093,"bar/m":0.091}},
-        "fresh_water": {"name":"Fresh water","gradient":{"psi/ft":0.433,"psi/m":1.421,"kgf/cm2/m":0.100,"bar/m":0.098}},
-        "sea_water": {"name":"Sea Water","gradient":{"psi/ft":0.444,"psi/m":1.457,"kgf/cm2/m":0.102,"bar/m":0.101}},
-        "salt_sat_water": {"name":"Salt sat. Water","gradient":{"psi/ft":0.520,"psi/m":1.706,"kgf/cm2/m":0.120,"bar/m":0.118}},
-        "salt_max": {"name":"Salt sat. Water Max","gradient":{"psi/ft":100.000,"psi/m":100.000,"kgf/cm2/m":100.000,"bar/m":100.000}}
-    }
-    return fluid_pressure
-
-# REF: Ryder & Kennedy, 2011
\ No newline at end of file