Merge branch 'main' of https://github.com/multiverseweb/Dataverse

index.html

@@ -57,13 +57,13 @@
             </button>
         </div>
             <button id="defaultButton" onclick="systemDefault()">
-                <img src="website/web_images/settings.png" class="copy" id="default">
+                <img src="website/web_images/settings.webp" class="copy" id="default">
             </button>
     </div>
-    <button class="top" id="top" onclick="topFunction()"><img src="website/web_images/top.png" alt=""></button>
+    <button class="top" id="top" onclick="topFunction()"><img src="website/web_images/top.webp" alt=""></button>
     <nav id="navbar">
         <img src="website/web_images/3dlogo.svg" alt="Dataverse Logo" class="logo" id="normal">
-        <img src="website/web_images/3d_glow.png" alt="Dataverse Logo" class="logo" id="glow">
+        <img src="website/web_images/3d_glow.webp" alt="Dataverse Logo" class="logo" id="glow">
         <div class="scrollBar" id="progress_bar"></div> <!--PROGRESS BAR-->
         <button style="
         background-color: dimgray;
@@ -170,14 +170,14 @@
             </p>
         </div>
         <div class="about_right">
-            <img src="website/web_images/about_up.png" class="preview up">
-            <img src="website/web_images/about_down.png" class="preview down">
+            <img src="website/web_images/about_up.webp" class="preview up">
+            <img src="website/web_images/about_down.webp" class="preview down">
         </div>
     </div>
     <div class="section" id="finance">
         <div class="finance_left">
-            <img src="website/web_images/finance_up.png" class="preview up">
-            <img src="website/web_images/finance_down.png" class="preview down">
+            <img src="website/web_images/finance_up.webp" class="preview up">
+            <img src="website/web_images/finance_down.webp" class="preview down">
         </div>
         <div class="finance_right">
             <p class="subheading">Track Finances!</p>
@@ -196,38 +196,38 @@
             <img src="https://i0.wp.com/learnbyinsight.com/wp-content/uploads/2020/09/sub-plot.png?resize=600%2C398&ssl=1"
                 alt="">
             <img src="https://docs.sympy.org/latest/_images/plotting-16.png" alt="">
-            <img src="website/web_images/galaxy.png" alt="">
+            <img src="website/web_images/galaxy.webp" alt="">
             <img src="website/web_images/3d.gif" alt="">
             <img src="website/web_images/volcano.gif" alt="">
             <img src="website/web_images/live.gif" alt="">
             <img src="https://i0.wp.com/learnbyinsight.com/wp-content/uploads/2020/09/sub-plot.png?resize=600%2C398&ssl=1"
                 alt="">
             <img src="https://docs.sympy.org/latest/_images/plotting-16.png" alt="">
-            <img src="website/web_images/galaxy.png" alt="">
+            <img src="website/web_images/galaxy.webp" alt="">
             <img src="website/web_images/3d.gif" alt="">
 
 
         </div>
         <div class="examples" id="examples2">
 
             <img src="https://matplotlib.org/stable/_images/sphx_glr_polar_scatter_001.png" alt="">
-            <img src="website/web_images/wordcloud.png" alt="">
+            <img src="website/web_images/wordcloud.webp" alt="">
             <img src="https://www.pythoncharts.com/matplotlib/radar-charts/images/radar-chart-step1.png" alt="">
             <img src="https://discourse.matplotlib.org/uploads/default/original/2X/4/4a1f2f7f8f90b98517aa85b8b984d4c9a3a94c72.jpeg"
                 alt="">
             <img src="https://miro.medium.com/v2/resize:fit:1188/1*kpksgzDd6qKP2h6GM7OVCA.png" alt="">
             <img src="https://miro.medium.com/v2/resize:fit:1140/1*Lc5VzM9Yo4775Omc-vqddQ.png" alt="">
-            <img src="website/web_images/portal.png" alt="">
-            <img src="website/web_images/stars.png" alt="">
+            <img src="website/web_images/portal.webp" alt="">
+            <img src="website/web_images/stars.webp" alt="">
             <img src="https://matplotlib.org/stable/_images/sphx_glr_polar_scatter_001.png" alt="">
-            <img src="website/web_images/wordcloud.png" alt="">
+            <img src="website/web_images/wordcloud.webp" alt="">
             <img src="https://www.pythoncharts.com/matplotlib/radar-charts/images/radar-chart-step1.png" alt="">
             <img src="https://discourse.matplotlib.org/uploads/default/original/2X/4/4a1f2f7f8f90b98517aa85b8b984d4c9a3a94c72.jpeg"
                 alt="">
             <img src="https://miro.medium.com/v2/resize:fit:1188/1*kpksgzDd6qKP2h6GM7OVCA.png" alt="">
             <img src="https://miro.medium.com/v2/resize:fit:1140/1*Lc5VzM9Yo4775Omc-vqddQ.png" alt="">
-            <img src="website/web_images/portal.png" alt="">
-            <img src="website/web_images/stars.png" alt="">
+            <img src="website/web_images/portal.webp" alt="">
+            <img src="website/web_images/stars.webp" alt="">
         </div>
     </div>
 
@@ -264,13 +264,13 @@
                 </button></a>
         </div>
         <div class="develop_right">
-            <img src="website/web_images/develop_up.png" class="preview up">
-            <img src="website/web_images/develop_down.png" class="preview down">
+            <img src="website/web_images/develop_up.webp" class="preview up">
+            <img src="website/web_images/develop_down.webp" class="preview down">
         </div>
     </div>
     <div class="design_line"></div>
     <footer>
-        <img src="website/web_images/cubes.png" class="cubes">
+        <img src="website/web_images/cubes.webp" class="cubes">
         <div class="contact">
             <div class="name">
                 <img src="website/web_images/2dlogo.svg" alt="" class="end-logo">
@@ -316,4 +316,4 @@ <h4>Copyright &copy; <span id="copyright">32949832</span> Tejas Gupta</h4>
 
 </body>
 
-</html>
+</html>

software/mainGUI.py

@@ -17,6 +17,7 @@
 import numpy as np                                                  #for x-axis time arange
 #===================================================================================================================plot colors
 colors=["#440154", "#3b528b","#21918c", "#5ec962", "#fde725","#f89540", "#e16462","#b12a90", "#6a00a8", "#0d0887", "#3474eb", "#5ec962", "yellow", "#f89540", "tomato","tan"]
+maxLimit = 16 # maximum limit for colors
 #===================================================================================================================connecting mySQL
 mycon=financeTracker.mycon
 cursor=financeTracker.cursor
@@ -560,7 +561,7 @@ def enter_values(c,y,start,end,width,x_label):
     x_label=x_var.get()
     y_var=y_var.get()
 
-    if y_var>16:
+    if y_var>maxLimit:
         messagebox.showwarning(message="Too many dependent variables!\nThe maximum limit is 16.")
     elif y_var<=0:
         messagebox.showwarning(message="No. of dependent variables should be greater than 0.")
@@ -724,7 +725,7 @@ def enter_pie_values(c,y):
 
     y_var=y_var.get()
     heading=title_var.get()
-    if y_var>16:
+    if y_var>maxLimit:
         messagebox.showwarning(message="Too many variables!\nThe maximum limit is 16.")
     elif y_var<=0:
         messagebox.showwarning(message="No. of variables should be greater than 0.")
@@ -781,7 +782,7 @@ def radar_values(c,title_var,x_var,y_var):
     def x_no_values(c,y,x_no_value,names_form,x_label):
         if x_no_value.get()<3:
             messagebox.showwarning(message="No. of values for independent variable should be greater than 2.")
-        elif x_no_value.get()>16:
+        elif x_no_value.get()>maxLimit:
             messagebox.showwarning(message="Too many values for independent variable!\nThe maximum limit is 16.")
         else:
             x_no_value = x_no_value.get()
@@ -861,7 +862,7 @@ def enter_values(c,x,y,x_no_value,x_label,d_attr):
     x_label=x_var.get()
     y_var=y_var.get()
 
-    if y_var>16:
+    if y_var>maxLimit:
         messagebox.showwarning(message="Too many dependent variables!\nThe maximum limit is 16.")
     elif y_var<=0:
         messagebox.showwarning(message="No. of dependent variables should be greater than 0.")
@@ -973,7 +974,7 @@ def scatter_enter_values(c,title_var,x_var,y_var,z_var,no_values_var):
     z_label=z_var.get()
     no_values=no_values_var.get()
 
-    if no_values>16:
+    if no_values>maxLimit:
         messagebox.showwarning(message="Too many values to plot!\nThe maximum limit is 16.")
     elif no_values<=0:
         messagebox.showwarning(message="No. of values to plot should be greater than 0.")
@@ -1079,7 +1080,7 @@ def heatmap_values(c,title_var,x_var,y_var,d_var):
     def x_value(c,names_form,x_values,x_label):
         x_values=x_values.get()
 
-        if x_values>16:
+        if x_values>maxLimit:
             messagebox.showwarning(message="Too many values for independent variable!\nThe maximum limit is 16.")
         elif x_values<=0:
             messagebox.showwarning(message="No. of values for independent variable should be greater than 0.")
@@ -1124,7 +1125,7 @@ def y_values(c,y_var):
     def y_values1(c,values_form,y_values,y_label):
         y_values=y_values.get()
 
-        if y_values>16:
+        if y_values>maxLimit:
             messagebox.showwarning(message="Too many values for independent variable!\nThe maximum limit is 16.")
         elif y_values<=0:
             messagebox.showwarning(message="No. of values for independent variable should be greater than 0.")

website/codeOfconduct.html

@@ -24,14 +24,14 @@
                 <!-- </div> -->
             </button>
             <button id="defaultButton" onclick="systemDefault()">
-                <img src="web_images/settings.png" class="copy" id="default">
+                <img src="web_images/settings.webp" class="copy" id="default">
             </button>
         </div>
     </div>
-    <button class="top" id="top" onclick="topFunction()"><img src="web_images/top.png" alt=""></button>
+    <button class="top" id="top" onclick="topFunction()"><img src="web_images/top.webp" alt=""></button>
     <nav id="navbar">
         <img src="web_images/3dlogo.svg" alt="Dataverse Logo" class="logo" id="normal">
-        <img src="web_images/3d_glow.png" alt="Dataverse Logo" class="logo" id="glow">
+        <img src="web_images/3d_glow.webp" alt="Dataverse Logo" class="logo" id="glow">
         <div class="scrollBar" id="progress_bar"></div> <!--PROGRESS BAR-->
     </nav>
 

website/license.html

@@ -20,14 +20,14 @@
                 <img src="https://cdn-icons-png.freepik.com/256/467/467619.png?semt=ais_hybrid" alt="" class="copy" id="sun">
             </button>
             <button id="defaultButton" onclick="systemDefault()">
-                <img src="web_images/settings.png" class="copy" id="default">
+                <img src="web_images/settings.webp" class="copy" id="default">
             </button>
 
         </div>
     </div>
     <nav id="navbar">
         <img src="web_images/3dlogo.svg" alt="Dataverse Logo" class="logo" id="normal">
-        <img src="web_images/3d_glow.png" alt="Dataverse Logo" class="logo" id="glow">
+        <img src="web_images/3d_glow.webp" alt="Dataverse Logo" class="logo" id="glow">
     </nav>
 
     <button class="burger" id="burger" onclick="show()"></button>