Update app.py

app.py

@@ -287,6 +287,31 @@ def nasa_sdo_images(obj,size,date1,date2):
     html_in+="</div>"
     return html_in
 
+def get_concat_h_cut(in1, in2):
+    im1=Image.open(in1)
+    im2=Image.open(in2)
+    dst = Image.new('RGB', (im1.width + im2.width,
+                            min(im1.height, im2.height)))
+    dst.paste(im1, (0, 0))
+    dst.paste(im2, (im1.width, 0))
+    return dst
+
+
+def get_concat_v_cut(in1, in2, theme='dark'):
+    im1=Image.open(in1)
+    im2=Image.open(in2)
+    if theme=='dark':
+        color=(31,41,55)
+    if theme=='light':
+        color=(255,255,255)
+    dst = Image.new('RGB', (min(im1.width, im2.width), im1.height + im2.height),color=color)
+    dst.paste(im1, (0, 0))
+    dst.paste(im2, (0, im1.height))
+    return dst
+
+
+
+
 def nasa_sdo_composite(obj,size,date1,date2):
     html_in=f"<style>{css}</style><div class='img_box_soho'>"
     if int(date2[6:8])-int(date1[6:8]) >0:
@@ -326,13 +351,16 @@ def nasa_sdo_composite(obj,size,date1,date2):
     print("$$$$$$$$$$$$$$$$$")
     link_box.sort(reverse=True)
     print(link_box)
+    out_box=[]
     for ea in link_box:
         if cnt<=max_cnt:
+            out_link=f'{sdo_source_format}{ea}'
+            out_box.append(out_link)
             cnt+=1
             html_in+=f'<div class="img_class_sdo"><a href="{sdo_source_format}{ea}" target="_blank">{ea}</a><br><img src={sdo_source_format}{ea}></div>'
         
     html_in+="</div>"
-    return html_in
+    return html_in, out_box
             
 def run():
     out=make_tree()
@@ -361,7 +389,37 @@ def get_date(year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2):
     print(date1)
     print(date2)
     return date1,date2
-
+def comp_combine(inp_ims: list):
+    im_box=[]
+    v_box=[]
+    rows=2
+    cols=2
+    for i,im in enumerate(inp_ims):
+        urllib.request.urlretrieve(im, f"tmp-{i}.jpg")
+        im_box.append(f"tmp-{i}.png")
+    im_cnt=len(im_box)
+    cnt=1
+    col_start=[im_box[0]]
+    
+    for rr in range(rows):
+        for cc in range(cols):
+            col_out=get_concat_h_cut(col_start[0],im_box[cnt])
+            col_start[0]=col_out
+            cnt+=1
+            if cnt>im_cnt:
+                rr=range(rows)
+                cc=range(cols)
+        v_box.append(col_out)
+    print(v_box)
+    v_cnt=0
+    v_box_cnt=len(v_box)
+    v_start=[v_box[0]]
+    for vv in range(v_box_cnt):
+        print(rr)
+        v_out=get_concat_v_cut(v_start[0],v_box[v_cnt])
+        v_start[0]=v_out
+    return v_out
+    
 with gr.Blocks() as app:
     datetimestamp=str(datetime.datetime.now()).split(".")[0]
     datestamp=datetimestamp.replace(" ","-").split("-")
@@ -405,8 +463,17 @@ with gr.Blocks() as app:
                 sdo_drop2=gr.Dropdown(label="Size", multiselect=True, choices=["All"]+sdo_size,value=512)
             
             with gr.Tab("Composite"):
-                sdo_comp_btn=gr.Button("Load")
-                sdo_comp_html=gr.HTML()                
+                with gr.Row():
+                    comp_num=gr.Number(label="Return",precision=0,value=4)
+                    comp_col=gr.Number(label="Columns",precision=0)
+                    comp_row=gr.Number(label="Rows",precision=0)
+                with gr.Row():
+                    comp_combine_btn=gr.Button("Combine")
+                    sdo_comp_btn=gr.Button("Load")
+                img_out=gr.Image()
+                comp_combine_html=gr.HTML()                
+                sdo_comp_html=gr.HTML()
+                image_comp_list=gr.Textbox(visible=True)
             with gr.Tab("Images"):
                 sdo_btn=gr.Button("Load")
                 sdo_html=gr.HTML()
@@ -422,8 +489,11 @@ with gr.Blocks() as app:
             soho_vid_btn=gr.Button("Load")
             html_vid_nasa=gr.HTML()
 
+    ###### Composite Images ##########
+    comp_combine_btn.click(comp_combine,image_comp_list,img_out)
+    sdo_comp_btn.click(get_date,[year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2],[date1,date2]).then(nasa_sdo_composite,[sdo_drop1,sdo_drop2,date1,date2],[sdo_comp_html,image_comp_list])
+
     ###### NASA Images ##########
-    sdo_comp_btn.click(get_date,[year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2],[date1,date2]).then(nasa_sdo_composite,[sdo_drop1,sdo_drop2,date1,date2],sdo_comp_html)
     sdo_btn.click(get_date,[year1,month1,day1,hour1,minute1,year2,month2,day2,hour2,minute2],[date1,date2]).then(nasa_sdo_images,[sdo_drop1,sdo_drop2,date1,date2],sdo_html)
     soho_btn.click(make_nasa_soho_image_trigger,None,html_nasa)
     soho_vid_btn.click(make_nasa_soho_videos,None,html_vid_nasa)