non_h and h parts

app.py

@@ -7,14 +7,17 @@ gc_full_key = "full name"
 GC_FULL_NAMES = ['Hydrogen sulphide',
                  'Carbone dioxide', 'Nitrogen', 'Methane', 'Ethane', 'Propane', 'N-butane', 'Iso-butane', 'N-pentane',
                  'Iso-pentane', 'N-hexane',
-                 'N-heptane', 'C7+', 'Hydrogen', 'Air', 'Water', 'Oxygen']
+                 'N-heptane', 'C7_PLUS_', 'Hydrogen', 'Air', 'Water', 'Oxygen']
 GC_SHORT_NAMES = ['H2S', 'CO2', 'N2', "C1", "C2", "C3", "nC4", "iC4", "nC5", "iC5", "C6",
-                  "C7", "C7+", "H2", "Air", "H2O", "O2"]
+                  "C7", "C7_PLUS_", "H2", "Air", "H2O", "O2"]
 
 GC_NAMES = []
 for full_name, short_name in zip(GC_FULL_NAMES, GC_SHORT_NAMES):
     GC_NAMES.append({gc_full_key: full_name, gc_formula_k: short_name})
 
+hydrocarbons = GC_NAMES[3:13]
+non_hc = GC_NAMES[:3]
+add_non_hc = GC_NAMES[13:]
 
 sg_k = 'sg_value'
 pc_k = 'p_crit_value'
@@ -23,16 +26,11 @@ gc_state_k = 'gc_state'
 for key in [sg_k, pc_k, tc_k]:
     if key not in ss:
         ss[key] = 0
-# Display the selected options
-
-
-if st.button("Rerun"):
-    st.rerun()
 
 if st.button("Calculate"):
     ss[sg_k] = 30
-    # Force a rerun to update the display
-    # st.rerun()
+    ss[tc_k] = 15
+    ss[pc_k] = 20
 
 UD = "User defined"
 SG_LIST = [UD,
@@ -51,8 +49,8 @@ else:
 
 def text_for_gc(col, gc):
     # Generate unique class names for each image
-    hover_class = f'hoverable_{i}'
-    tooltip_class = f'tooltip_{i}'
+    hover_class = f'hoverable_{gc[gc_formula_k]}'
+    tooltip_class = f'tooltip_{gc[gc_formula_k]}'
 
     # Define the unique CSS for each image
     hover_css = f'''
@@ -96,21 +94,31 @@ def text_for_gc(col, gc):
 params = []
 ss[gc_state_k] = UD
 if sg_source != SG_GC:
-    cur_gc = GC_NAMES[:3]
+    curr_non_hc = non_hc
+    cur_hc = None
 else:
-    cur_gc = GC_NAMES
+    curr_non_hc = non_hc + add_non_hc
+    cur_hc = hydrocarbons
 with st.expander("Gas components") as gc_exp:
-    for i in range(0, len(cur_gc), 3):
-        cols = st.columns(3)
-        j = i
-        for col in cols:
-            if j >= len(cur_gc):
-                break
-            gc11, gc12 = col.columns([1, 1.5])
-            text_for_gc(gc11, cur_gc[j])
-            params.append(gc12.text_input(cur_gc[j][gc_formula_k], value=0, label_visibility='collapsed',
-                                          help=cur_gc[j][gc_formula_k]))
-            j += 1
+
+    def get_components_block(cur_gc, text):
+        st.text(f'{text}')
+        # st.markdown("***")
+        for i in range(0, len(cur_gc), 3):
+            cols = st.columns(3)
+            j = i
+            for col in cols:
+                if j >= len(cur_gc):
+                    break
+                gc11, gc12 = col.columns([1, 1.5])
+                text_for_gc(gc11, cur_gc[j])
+                params.append(gc12.text_input(cur_gc[j][gc_formula_k], value=0, label_visibility='collapsed',
+                                              help=cur_gc[j][gc_formula_k]))
+                j += 1
+
+    get_components_block(curr_non_hc, "non hydrocarbons")
+    if cur_hc:
+        get_components_block(cur_hc, "hydrocarbons")
 
 
 CRIT_LIST = [UD]