convolution et interpolation ok

apachefranklin · apachefranklin · commit 83d47661d894 · 2020-08-19T07:52:26.000+01:00
diff --git a/imgprocess/img_api.py b/imgprocess/img_api.py
@@ -16,38 +16,36 @@
 result_path=img_path+"result/"
 
 def _constrate(request):
+    print(request.FILES)
     image_file=request.FILES["imguploaded"]
-    #print(str(image_file))
-    file_name,file_extension=os.path.splitext(str(image_file))
-    saved_name=get_random_string(15)+file_extension
-    #we save file to the disk
-    handle_uploaded_file(request.FILES['imguploaded'],"imgprocess/static/imageprocess/images/"+saved_name)
-    #file_name,file_extension="bonjour",".jpeg"
-    imgglib=ImgLib()
-    img_final=Image.open("imgprocess/static/imageprocess/images/"+saved_name)
-    img_matrix=np.reshape(list(img_final.getdata()),img_final.size)
-    #print(img_matrix.shape)
-    #img_matrix=imgglib.get_image_matrix("imgprocess/static/imageprocess/images/"+saved_name)
+    image_info=save_image(image_file,img_path)
+    
     saturation_min=int(request.POST["saturation-min"])
     saturation_max=int(request.POST["saturation-max"])
-
-    #appel de la tranformation lineaire
-    final_matrix=imgglib.linea_transformation(img_matrix,saturation_min,saturation_max)
-    #final_matrix=np.reshape(final_matrix,(final_matrix.shape[0]*final_matrix.shape[1]))
+    if(image_info["type"]=="tuple"):
+        final_matrix=ImgLib().linea_transformation_rgb(image_info["matrix"],saturation_min,saturation_max)
+    else:
+        final_matrix=ImgLib().linea_transformation(image_info["matrix"],saturation_min,saturation_max)
+    
+    extension=image_info["extension"]
+   
+    if(image_info["extension"].lower()==".pgm"):
+        extension=".png"
+   
     img=Image.fromarray(final_matrix.astype(np.uint8))
-    #maintenant nous devons creer un nom pour notre fichier
+    new_image_name=get_random_string(20)+extension
+    img.save("imgprocess/static/imageprocess/images/result/"+new_image_name)
+    ImgLib.save_matrix_as_pgm(final_matrix,new_image_name)
     
-    img.save("imgprocess/static/imageprocess/images/result/"+saved_name)
-    return JsonResponse({"original_name":str(image_file),"extention":file_extension,"saved_name":saved_name})
+    return JsonResponse({"original_name":str(image_file),"extention":image_info["extension"],"saved_name":new_image_name,"pgm_name":new_image_name+".pgm"})
 
 def _egalisation_histogramme(request):
     """At the end we need to send the preview histogramme, the new histgramme
     and the final image"""
     image_info=save_image(request.FILES["imguploaded"],None)
-    
     #we get the name of the preview_histogramme
-    preview_his_name=get_random_string(20)+image_info["extension"];
-    plt.hist(image_info["list"]);
+    preview_his_name=get_random_string(20)+".png"
+    plt.hist(image_info["list"])
 
     plt.savefig(hist_path+preview_his_name)
     plt.close()
@@ -56,25 +54,31 @@ def _egalisation_histogramme(request):
     image_info["preview_hist"]=preview_his_name
 
     #we call function of equalisation on the matrix of image
-    egalisation_his_matrix=ImgLib().histogram_normalisation(image_info["matrix"])
-    #we get now the new image 
-
-    print(egalisation_his_matrix)
-
+    if(image_info["type"]=="tuple"):
+        egalisation_his_matrix=ImgLib().histgramm_normalisation_rbg(image_info["matrix"])
+    else:
+        egalisation_his_matrix=ImgLib().histogram_normalisation(image_info["matrix"])
+    #we get now the new image
     new_image=Image.fromarray(egalisation_his_matrix.astype(np.uint8))
-    new_image_name=get_random_string(18)+image_info["extension"]
+    extension=image_info["extension"]
+    if(image_info["extension"].lower()==".pgm"):
+        extension=".png"
+    new_image_name=get_random_string(18)+extension
     new_image.save(result_path+new_image_name)
+    #sauvegarde du fichier pgm de l'image
+    ImgLib.save_matrix_as_pgm(egalisation_his_matrix,new_image_name)
 
     #now we reshape our egalisation_his_matirx at the list and we create the plot
-    new_image_as_list=egalisation_his_matrix.ravel()
-    new_his_name=get_random_string(24)+image_info["extension"]
+    new_image_as_list=ImgLib.get_normalize_vector(egalisation_his_matrix)["h"]
+    new_his_name=get_random_string(24)+".png"
     plt.plot(new_image_as_list)
-    plt.savefig(hist_path_result+new_his_name);
+    plt.savefig(hist_path_result+new_his_name)
     plt.close()
     image_info["new_hist"]=new_his_name
     image_info["saved_name"]=new_image_name
     image_info["matrix"]=None
-    
+    image_info["list"]=None
+    image_info["pgm_name"]=new_image_name+".pgm"
     return JsonResponse(image_info)
 
 
@@ -104,12 +108,18 @@ def _make_operation(request):
     
     new_img_matrix=new_img_matrix.astype(np.uint8)
     new_img=Image.fromarray(new_img_matrix)
-
-    new_image_name=get_random_string(random.randint(15,20))+image_info_1["extension"]
+    
+    new_image_name=get_random_string(random.randint(15,20))+".png"
+    
     new_img.save(result_path+new_image_name)
+    
+    #sauvegarde au format pgm de l'image
+    ImgLib.save_matrix_as_pgm(new_img_matrix,new_image_name)
 
     image_info_1["matrix"]=None
     image_info_1["saved_name"]=new_image_name
+    image_info_1["list"]=None
+    image_info_1["pgm_name"]=new_image_name+".pgm"
     return JsonResponse(image_info_1)
 
 
@@ -118,20 +128,55 @@ def _convolution(request):
     about convolution, now we consider only the 3*3 convolution matrix"""
     conv_field=request.POST["convolution_matrix"]
     conv_field=conv_field.split("\r\n")
-    conv_matrix=np.zeros((3,3))
+    length=len(conv_field)
+    conv_matrix=np.zeros((length,length))
     for i in range(len(conv_field)):
         elts=conv_field[i].split()
         elts=[float(elt) for elt in elts]
         conv_matrix[i,]=elts
+        
     image_info=save_image(request.FILES["imguploaded"],img_path)
     new_img_matrix=ImgLib().convolution(image_info["matrix"],conv_matrix)
 
     new_img_matrix=new_img_matrix.astype(np.uint8)
     new_img=Image.fromarray(new_img_matrix)
 
-    new_image_name=get_random_string(random.randint(15,20))+image_info["extension"]
+    new_image_name=get_random_string(random.randint(15,20))+".png"
+   
     new_img.save(img_path+new_image_name)
+    #sauvegarde au format pgm de l'image
+    ImgLib.save_matrix_as_pgm(new_img_matrix,new_image_name)
 
     image_info["matrix"]=None
     image_info["saved_name"]=new_image_name
-    return JsonResponse(image_info)
+    image_info["list"]=None
+    image_info["pgm_name"]=new_image_name+".pgm"
+    return JsonResponse(image_info)
+
+
+def _interpolation(request):
+    image_info=save_image(request.FILES["imguploaded"],None)
+    zoom_factor=request.POST["zoom-factor"]
+    new_matrix=ImgLib.basic_interpolation(image_info["matrix"],zoom_factor)
+    
+    new_img_matrix=new_matrix.astype(np.uint8)
+
+    new_img=Image.fromarray(new_img_matrix)
+
+    #on definit un nouveau nom pour notre image
+    extension=image_info["extension"]
+    if(extension.lower()==".pgm"):
+        extension=".png"
+    
+    new_image_name=get_random_string(24)+extension
+
+    new_img.save(result_path+new_image_name)
+
+    #sauvegarde au format pgm de l'image
+    ImgLib.save_matrix_as_pgm(new_img_matrix,new_image_name)
+
+    image_info["matrix"]=None
+    image_info["saved_name"]=new_image_name
+    image_info["list"]=None
+    image_info["pgm_name"]=new_image_name+".pgm"
+    return JsonResponse(image_info)
diff --git a/imgprocess/static/shared/css/imageprocess.css b/imgprocess/static/shared/css/imageprocess.css
@@ -67,6 +67,8 @@ label.btn-image-preview{
 }
 
 img:not(.viewver){
-    cursor: -moz-zoom-in;
+    cursor: crosshair;
     cursor:zoom-in;
+    -moz-cursor:zoom-in;
+    -moz-cursor:-moz-zoom-in;
 }
diff --git a/imgprocess/templates/about.html b/imgprocess/templates/about.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block content %}
+<br />
+<br />
+<div class="container">
+    <div class="row">
+        <div class="col-3">
+            <div class="card shadow-lg border-0">
+                <div class="card-img">
+                    <img src="{% static 'shared/author/apache.jpg' %}" width="100%"  />
+                </div>
+
+                <div class="text-center text-black-50">
+                    <br />
+                    <br />
+                    Franklin Apache
+                    <br />
+                    <br />
+                    
+                    <a href="https://www.github.com/apachefranklin">Github</a>
+                    <br />
+                    <br />
+                    <br />
+                    
+                </div>
+                
+            </div>
+        </div>
+    </div>
+
+</div>
+
+  
+{% endblock content %}
diff --git a/imgprocess/templates/base.html b/imgprocess/templates/base.html
@@ -16,7 +16,7 @@
         <a class="brand-logo" href="{% url 'home' %}">Image process</h1>
         <ul class="nav">
             <li class="nav-item">
-                <a href="#" class="nav-link">About author</a>
+                <a href="{% url 'imageprocess:about' %}" class="nav-link">About author</a>
             </li>
             <li class="nav-item">
                 <a href="#" class="nav-link">About App</a>
diff --git a/imgprocess/templates/imgprocess/convolution.html b/imgprocess/templates/imgprocess/convolution.html
@@ -22,7 +22,7 @@ <h4>Preview</h4>
             <div class="col-6">
                 <h4>Masque de convolution</h4>
                 <div class="card border-0 shadow-lg" id="img_preview">
-                <textarea class="form-control form-control-lg" name="convolution_matrix" placeholder="Enter the convolution mask" width="100%" height="100%"></textarea>    
+                <textarea required="required" class="form-control form-control-lg" name="convolution_matrix" placeholder="Enter the convolution mask" width="100%" height="100%"></textarea>    
                 </div>
                 
             </div>
diff --git a/imgprocess/templates/imgprocess/filtre_median.html b/imgprocess/templates/imgprocess/filtre_median.html
diff --git a/imgprocess/templates/imgprocess/index.html b/imgprocess/templates/imgprocess/index.html
@@ -27,6 +27,24 @@ <h3>EGALISATION HISTOGRAMME</h3>
             </a>
         </div>
 
+        <div class="col-lg-3 col-12">
+            <a class="nav-link" href="{% url 'imageprocess:egalisation' %}">
+                <div class="card shadow-lg border-0">
+                    
+                    <h3>FILTRE MEDIAN</h3>
+                    
+                </div>        
+            </a>
+        </div>
+        <div class="col-lg-3 col-12">
+            <a class="nav-link" href="{% url 'imageprocess:interpolation' %}">
+                <div class="card shadow-lg border-0">
+                    
+                    <h3>INTERPOLATION</h3>
+                    
+                </div>        
+            </a>
+        </div>
         <!-- Transformation lieneaire -->
         <div class="col-lg-6 col-12 shadow-lg">
             <h3>Basic operation</h3>
diff --git a/imgprocess/templates/imgprocess/interpolation.html b/imgprocess/templates/imgprocess/interpolation.html
@@ -0,0 +1,43 @@
+{% extends 'base.html' %}
+
+
+{% block content %}
+    <br />
+    <div class="container">
+        <h1>Welcome to Interpolation</h1>
+        <hr />
+        <br />
+        <form class="" id="form_upload_image" enctype="multipart/form-data"  method="post" action="{% url 'imageprocess:pinterpolation' %}">
+        {% csrf_token %}
+        <div class="row">
+        <div class="col-12">
+            <!-- <textarea class="form-control form-control-lg"> -->
+            </textarea>
+        </div>
+            <div class="col">
+                <label>Zoom factor</label>
+                <input type="number" name="zoom-factor" placeholder="enter the zoom factor" value="1" max="254" min="1" required="true" class="form-control" />
+            </div>
+        </div>
+        <div class="row img-list-work">
+            <div class="col-6">
+                <h4>Preview</h4>
+                <div class="card border-0 shadow-lg" id="img_preview">
+                    
+                </div>
+                <label>upload image</label>
+                <input type="file" name="imguploaded"  class="form-control form-control-file" onChange="showPreview(this,'#img_preview')" />
+            </div>
+            <div class="col-6">
+                <h4>Result</h4>
+                <div class="card border-0 shadow-lg" id="result-box">
+                    
+                </div>
+            </div>
+        </div>
+        <br />
+        <br />
+        <button type="submit" class="btn btn-info rounded btn-lg second-color shadow-lg text-white">BASIC INTERPOLATION</button>
+        </form>
+    </div>
+{% endblock content %}
diff --git a/imgprocess/urls.py b/imgprocess/urls.py
@@ -5,6 +5,7 @@
 
 urlpatterns=[
     path("home",views.index,name="home"),
+    path("about",views.author,name="about"),
     path("constrate",views.constraste,name="constraste"),
     path("performconstrate",img_api._constrate,name="pluminecance"),
 
@@ -13,5 +14,8 @@
     path("two_image_operation",views.basic_operation,name="operation"),
     path("poperation",img_api._make_operation,name="poperation"),
     path("convolution",views.convolution,name="convolution"),
-    path("pconvolution",img_api._convolution,name="pconvolution")
+    path("pconvolution",img_api._convolution,name="pconvolution"),
+
+    path("interpolation",views.interpolation,name="interpolation"),
+    path("pinterpolation",img_api._interpolation,name="pinterpolation")
 ]
diff --git a/imgprocess/utils/img_lib.py b/imgprocess/utils/img_lib.py
diff --git a/imgprocess/utils/utility.py b/imgprocess/utils/utility.py
diff --git a/imgprocess/views.py b/imgprocess/views.py

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ label.btn-image-preview{`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`img:not(.viewver){`
`70`		`- cursor: -moz-zoom-in;`
	`70`	`+ cursor: crosshair;`
`71`	`71`	`cursor:zoom-in;`
	`72`	`+ -moz-cursor:zoom-in;`
	`73`	`+ -moz-cursor:-moz-zoom-in;`
`72`	`74`	`}`