Change placement elements management (close,save,delete button)

Add available change graphic's zorder  (Now point better view)
Change color point => Black
Change size textReach for better view

Author: StrongerProgrammer7

Lab2/frontshow/animation.py

@@ -1,12 +1,12 @@
 import random
 import outer_imports.matplotlib  as omatpl
 import global_variable as gv
-import frontshow.Color as colors
+import Lab2.frontshow.Color as colors
 
 def animate(frame, arr,best_result=None, textReach=None, marker=None):
     if len(arr) > frame:
         size_point = gv.SIZE_POINT
-        color = colors.Color.GREEN.value
+        color = colors.Color.BLACK.value
         if (len(arr) - 1 == frame):
             color = colors.Color.RED.value
             size_point = 50
@@ -22,9 +22,9 @@ def animate(frame, arr,best_result=None, textReach=None, marker=None):
             str_temp = "# " + str(frame) + " X=" + str(round(arr[frame][0], 4)) + " Y=" + str(round(arr[frame][1],4 )) + " Z=" + str(round(point_z, 4)) + "\n"
             textReach.insert(1.0, str_temp)
             if(len(arr) - 1 == frame):
-                gv.extraScatter.append(omatpl.ax_3d.scatter(arr[frame][0], arr[frame][1], point_z, c=color, marker=marker, s=size_point, zorder=4))
+                gv.extraScatter.append(omatpl.ax_3d.scatter(arr[frame][0], arr[frame][1], point_z, c=color, marker=marker, s=size_point, zorder=1))
             else:
-                gv.scatter_points.append(omatpl.ax_3d.scatter(arr[frame][0], arr[frame][1], point_z, c=color, marker=marker, s=size_point,zorder=2))
+                gv.scatter_points.append(omatpl.ax_3d.scatter(arr[frame][0], arr[frame][1], point_z, c=color, marker=marker, s=size_point,zorder=1))
 
             if(len(gv.scatter_points)>15 and  len(arr)-2 > frame):
                 random_countForDel = random.randint(2, 5)

Lab2/frontshow/calc_algorithm/aritificialImmuneSystemShow.py

@@ -26,7 +26,7 @@ def call_AIimmuneSystem(arr_textField) -> None:
                 sizePopulize = int(arr_textField[4].get())
                 countGenerations = int(arr_textField[5].get())
                 best_point, points = algorithm_artificial_immune_system(min_x, max_x, min_y, max_y, sizePopulize, gv.current_function, countGenerations)
-                bestResult = [best_point[0], best_point[1], best_point[2], colors.Color.CYAN.value, "o", 70]
+                bestResult = [best_point[0], best_point[1], best_point[2], colors.Color.CYAN.value, "o", 50]
                 points = getMatrixFromList(points)
                 _ = omatpl.FuncAnimation(omatpl.fig_3d, anim.animate, frames=len(points), fargs=(points, bestResult, gv.textReachImmuneSystem, 'o',),interval=gv.SPEED, repeat=False)
 

Lab2/frontshow/calc_algorithm/bacterialShow.py

@@ -24,7 +24,7 @@ def call_Bacterial(arr_textField) -> None:
                 count_bacterials = int(arr_textField[4].get())
                 time = int(arr_textField[5].get())
                 points,bestPoint  = algorithm_is_bacterial(min_x, max_x, min_y, max_y, count_bacterials, gv.current_function, time,gv.STEP)
-                bestResult = [bestPoint[0], bestPoint[1], bestPoint[2], colors.Color.CYAN.value, "o", 70]
+                bestResult = [bestPoint[0], bestPoint[1], bestPoint[2], colors.Color.CYAN.value, "o", gv.SIZE_POINT]
                 points = getMatrixFromMatrixList(points)
 
                 _ = omatpl.FuncAnimation(omatpl.fig_3d, anim.animate, frames=len(points), fargs=(points, bestResult, gv.textReachBacterial, 'o',),interval=gv.SPEED, repeat=False)

Lab2/frontshow/calc_algorithm/beesShow.py

@@ -27,7 +27,7 @@ def call_Bees(arr_textField) -> None:
                 numBees = int(arr_textField[4].get())
                 time = int(arr_textField[5].get())
                 rezusl, points = algorithm_of_bees(min_x, max_x, min_y, max_y, numBees, gv.current_function, time)
-                bestResult = [rezusl[0][0], rezusl[0][1], rezusl[1], colors.Color.CYAN.value, "o", 70]
+                bestResult = [rezusl[0][0], rezusl[0][1], rezusl[1], colors.Color.CYAN.value, "o", 50]
 
                 _ = omatpl.FuncAnimation(omatpl.fig_3d, anim.animate, frames=len(points), fargs=(points, bestResult, gv.textReachBees, 'o',),interval=gv.SPEED, repeat=False)
 

Lab2/frontshow/calc_algorithm/geneticAlgorithmShow.py

@@ -21,7 +21,7 @@ def call_geneticsAlgorithm(tf_populationSize,tf_numGeneratics,lab_optimalFunc,la
             lab_optimalValuePoints.configure(text="Оптимальное значение функции: " + str(round(best_fitness,3)))
             lab_optimalFunc.configure(text="Оптимальное значение переменных: " + str(round(best_solution[0])) + " : " + str(round(best_solution[1])))
 
-            bestResult = [best_solution[0], best_solution[1], best_fitness,colors.Color.YELLOW.value,"o",70]
+            bestResult = [best_solution[0], best_solution[1], best_fitness,colors.Color.YELLOW.value,"o",50]
 
             _ = omatpl.FuncAnimation(omatpl.fig_3d, anim.animate, frames=len(points), fargs=(points, bestResult, gv.textReachGenetic, 'v',), interval=gv.SPEED, repeat=False)
             gv.canvas_3d.draw()

Lab2/frontshow/calc_algorithm/hybridShow.py

@@ -25,7 +25,7 @@ def call_hybridAlgorithm(tf_populationSize,tf_numGeneratics,lab_optimalFunc,lab_
             lab_optimalValuePoints.configure(text="Оптимальное значение функции: " + str(round(best_solution[2],3)))
             lab_optimalFunc.configure(text="Оптимальное значение переменных: " + str(round(best_solution[0])) + " : " + str(round(best_solution[1])))
 
-            bestResult = [best_solution[0], best_solution[1], best_solution[2],colors.Color.WHITE.value,"o",70]
+            bestResult = [best_solution[0], best_solution[1], best_solution[2],colors.Color.WHITE.value,"o",50]
             points = getMatrixFromMatrixList(points)
             _ = omatpl.FuncAnimation(omatpl.fig_3d, anim.animate, frames=len(points), fargs=(points, bestResult, gv.textReachHybrid, 'o',), interval=gv.SPEED, repeat=False)
             gv.canvas_3d.draw()

Lab2/frontshow/calc_algorithm/swarmShow.py

@@ -24,7 +24,7 @@ def call_Swarm(arr_textField) -> None:
             #print("РЕЗУЛЬТАТ:", a.globalBestScore, "В ТОЧКЕ:", a.globalBestPos)
 
            # bestPointSet.append(ax_3d.scatter(a.globalBestPos[0], a.globalBestPos[1], a.globalBestScore, c=Color.BLUE.value, marker="o", s=250))
-            bestResult = [a.globalBestPos[0],a.globalBestPos[1],a.globalBestScore,colors.Color.BLUE.value, "o",70]
+            bestResult = [a.globalBestPos[0],a.globalBestPos[1],a.globalBestScore,colors.Color.BLUE.value, "o",50]
             points = deleteDuplicateValue(points)
             _ = omatpl.FuncAnimation(omatpl.fig_3d, anim.animate, frames=len(points), fargs=(points,bestResult, gv.textReachSwarm,'x',), interval=gv.SPEED, repeat=False)
             gv.canvas_3d.draw()

Lab2/frontshow/methods.py

@@ -1,7 +1,7 @@
 import outer_imports.imports_tkinter as otk
 import numpy as np
 from outer_imports.matplotlib import fig_3d
-from frontshow.Color import ColorFigure
+from Lab2.frontshow.Color import ColorFigure
 import global_variable as gv
 from Lab2.setFunction import chooseFunc
 
@@ -20,12 +20,10 @@ def buildBaseFunction(ax_3d):
         gv.x_data = np.arange(gv.START, gv.END, gv.STEP)
         gv.y_data = np.arange(gv.START, gv.END, gv.STEP)
 
-
-
     X, Y = np.meshgrid(gv.x_data, gv.y_data)
     Z = gv.current_function(X, Y)
-
-    ax_3d.plot_surface(X, Y, Z, cmap=ColorFigure.INFERNO.value,alpha=0.8, antialiased=True,rstride=1, cstride=1,zorder=-1)
+    #plot_wireframe
+    ax_3d.plot_surface(X, Y, Z, cmap=ColorFigure.WINTER.value,alpha=0.8,rstride=1, cstride=1,zorder=0)
     gv.canvas_3d.draw()
 
 def selectFunc(event,ax_3d,combo,lab,textField):
@@ -51,7 +49,6 @@ def selectFunc(event,ax_3d,combo,lab,textField):
 
 def save_plot():
     try:
-        # Save the 3D plot to a file
         file_path = otk.filedialog.asksaveasfilename(defaultextension=".png", filetypes=[("PNG files", "*.png")])
         if file_path:
             fig_3d.savefig(file_path)

Lab2/frontshow/placement_elements.py

@@ -4,31 +4,34 @@
 
 class createLabel:
     @staticmethod
-    def placement_label(root, text, row, column, padx, rowspan, columnspan, pady):
+    def placement_label(root, text, row, column, padx, rowspan, columnspan, pady,sticky=None):
         label = otk.ttk.Label(root, text=text)
-        label.grid(row=row, column=column, padx=padx, rowspan=rowspan, columnspan=columnspan, pady=pady)
+        if(sticky != None):
+            label.grid(row=row, column=column, padx=padx, rowspan=rowspan, columnspan=columnspan, pady=pady,sticky=sticky)
+        else:
+            label.grid(row=row, column=column, padx=padx, rowspan=rowspan, columnspan=columnspan, pady=pady)
         return label
 
 
 def createTab_gradient(tab, call_function):
-    createLabel.placement_label(tab, "Количество итераций", 0, 1, 5, 1, 3, 5)
+    createLabel.placement_label(tab, "Количество итераций", 0, 1, 5, 1, 1, 5)
     textFieldCountIter = otk.ttk.Entry(tab)
-    textFieldCountIter.insert(0, "500")
+    textFieldCountIter.insert(0, "100")
 
     findMinGradientDescent_button = otk.ttk.Button(tab, text="Выполнить градиентный спуск",
                                                    command=lambda: call_function(textFieldCountIter))
-    textFieldCountIter.grid(row=1, column=1, padx=5, pady=5, rowspan=1, columnspan=3, sticky="nsew")
-    findMinGradientDescent_button.grid(row=2, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
+    textFieldCountIter.grid(row=1, column=1, padx=5, pady=5, rowspan=1, columnspan=10, sticky="ew")
+    findMinGradientDescent_button.grid(row=2, column=1, columnspan=1, padx=5, pady=5, sticky="nsew")
 
-    gv.textReachGradientPoint = otk.ScrolledText(tab, height=10, width=30)
-    gv.textReachGradientPoint.grid(row=3, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
+    gv.textReachGradientPoint = otk.ScrolledText(tab,  width=70)
+    gv.textReachGradientPoint.grid(row=3,rowspan=1, column=1,  padx=5, pady=5, sticky="nsew")
 
 
 def createTab_simpleMethod(tab, call_function):
     findQud_btn = otk.ttk.Button(tab, text='Вызов симплекс метода', command=lambda: call_function())
     findQud_btn.grid(row=0, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
 
-    gv.textReachQuadPoint = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachQuadPoint = otk.ScrolledText(tab,  width=70)
     gv.textReachQuadPoint.grid(row=1, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
@@ -56,49 +59,49 @@ def createTab_genetic_hybrid(tab, call_function, text_btn):
 def createTab_Genetic(tab, call_function):
     createTab_genetic_hybrid(tab, call_function, "Вызвать генетический")
 
-    gv.textReachGenetic = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachGenetic = otk.ScrolledText(tab, height=18,width=70)
     gv.textReachGenetic.grid(row=7, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
 def createTab_Hybrid(tab, call_function):
     createTab_genetic_hybrid(tab, call_function, "Вызвать гибрид")
 
-    gv.textReachHybrid = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachHybrid = otk.ScrolledText(tab, height=18, width=70)
     gv.textReachHybrid.grid(row=7, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
 def createTab_Swarm(tab, call_function):
     tf_swarm = []
 
-    createLabel.placement_label(tab, "Размер Роя", 0, 0, 5, 1, 1, 5)
+    createLabel.placement_label(tab, "Размер Роя", 0, 0, 5, 1, 1, 5,sticky="e")
     tF = otk.ttk.Entry(tab)
     tF.insert(0, "50")
     tF.grid(row=0, column=1, padx=5, pady=5, rowspan=1, columnspan=2, sticky="nsew")
     tf_swarm.append(tF)
 
-    createLabel.placement_label(tab, "Общий масштабирующий\n коэффициент для скорости", 1, 0, 5, 1, 1, 5)
+    createLabel.placement_label(tab, "Общий масштабирующий коэффициент для скорости", 1, 0, 5, 1, 1, 5,sticky="e")
     tF = otk.ttk.Entry(tab)
     tF.insert(0, "0.1")
     tF.grid(row=1, column=1, padx=5, pady=5, rowspan=1, columnspan=2, sticky="nsew")
     tf_swarm.append(tF)
 
     createLabel.placement_label(tab,
-                                "Коэффициент, задающий влияние лучшей точки,\n найденной каждой частицей,\n на будущую скорость",
-                                2, 0, 5, 1, 1, 5)
+                                "Коэффициент, задающий влияние лучшей точки, найденной каждой частицей,\n на будущую скорость",
+                                2, 0, 5, 1, 1, 5,sticky="e")
     tF = otk.ttk.Entry(tab)
     tF.insert(0, "1")
     tF.grid(row=2, column=1, padx=5, pady=5, rowspan=1, columnspan=2, sticky="nsew")
     tf_swarm.append(tF)
 
     createLabel.placement_label(tab,
-                                "Коэффициент, задающий влияние лучшей точки,\n найденной всеми частицами,\n на будущую скорость",
-                                3, 0, 5, 1, 1, 5)
+                                "Коэффициент, задающий влияние лучшей точки, найденной всеми частицами,\n на будущую скорость",
+                                3, 0, 5, 1, 1, 5,sticky="e")
     tF = otk.ttk.Entry(tab)
     tF.insert(0, "5")
     tF.grid(row=3, column=1, padx=5, pady=5, rowspan=1, columnspan=2, sticky="nsew")
     tf_swarm.append(tF)
 
-    createLabel.placement_label(tab, "Количество жизней", 4, 0, 5, 1, 1, 5)
+    createLabel.placement_label(tab, "Количество жизней", 4, 0, 5, 1, 1, 5,sticky="e")
     tF = otk.ttk.Entry(tab)
     tF.insert(0, "100")
     tF.grid(row=4, column=1, padx=5, pady=5, rowspan=1, columnspan=2, sticky="nsew")
@@ -119,7 +122,7 @@ def createTab_Swarm(tab, call_function):
     btn = otk.ttk.Button(tab, text='Вызвать рой', command=lambda: call_function(tf_swarm))
     btn.grid(row=5, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
 
-    gv.textReachSwarm = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachSwarm = otk.ScrolledText(tab, height=15, width=70)
     gv.textReachSwarm.grid(row=6, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
@@ -169,19 +172,19 @@ def createTab_insects(tab, text_count, count, text_generation, count_generations
 def createTab_Bees(tab, call_function):
     createTab_insects(tab, "Количество пчелок", 200, "Время(мс)", 100, "Вызвать пчелок", call_function)
 
-    gv.textReachBees = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachBees = otk.ScrolledText(tab, height=18, width=70)
     gv.textReachBees.grid(row=7, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
 def createTab_Bacterial(tab, call_function):
     createTab_insects(tab, "Количество бактерий", 200, "Время(мс)", 100, "Вызвать бактерии", call_function)
 
-    gv.textReachBacterial = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachBacterial = otk.ScrolledText(tab, height=18, width=70)
     gv.textReachBacterial.grid(row=7, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
 def createTab_ImmuneSystem(tab, call_function):
     createTab_insects(tab, "Размер популяции", 200, "Генераций", 500, "Вызвать имунную систему", call_function)
 
-    gv.textReachImmuneSystem = otk.ScrolledText(tab, height=10, width=30)
+    gv.textReachImmuneSystem = otk.ScrolledText(tab, height=18, width=70)
     gv.textReachImmuneSystem.grid(row=7, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")

Lab2/main.py

@@ -41,7 +41,7 @@
     notebook.add(frame4, text="Рой")
     notebook.add(frame5, text="Пчелки")
     notebook.add(frame6, text="Бактерии")
-    notebook.add(frame7, text="Имунная система")
+    notebook.add(frame7, text="Иммунная система")
     notebook.add(frame8, text="Гибрид")
 
     createTab_gradient(frame1,callGradient_DrawPoint)
@@ -72,25 +72,23 @@
         "Химмельблау"],state="readonly")
     comboBoxFunc.bind("<<ComboboxSelected>>", lambda event, cb=comboBoxFunc,lab = lab_func,field=textFieldStep: selectFunc(event, ax_3d,cb,lab,field))
 
-    canvas_3d_widget.grid(row=0, column=0, rowspan=20, padx=5, pady=5) #matplotlib
-    notebook.grid(row=0,column=1,padx=5,pady=5,rowspan=1,columnspan=3,sticky="nsew")
+    canvas_3d_widget.grid(row=0, column=0, padx=5, pady=0) #matplotlib
+    notebook.grid(row=0,column=1,padx=5,pady=0,columnspan=5,sticky="nsew")
 
     comboBoxFunc.grid(row=4,column=1,padx=5,pady=5,rowspan=1,columnspan=3,sticky="nsew")
     textFieldStep.grid(row=2, column=1,padx=5, pady=5,rowspan=1,columnspan=3,sticky="nsew")
 
 
     clear_btn = ttk.Button(root, text="Очистить точки с графика", command=clearPoints)
-    clear_btn.grid(row=8, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
-    save_button = ttk.Button(root, text="Сохранить график", command=save_plot)
+    clear_btn.grid(row=2, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
 
-    save_button.grid(row=9, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
+    save_button = ttk.Button(root, text="Сохранить график", command=save_plot)
+    save_button.grid(row=3, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
     close_button = ttk.Button(root, text="Закрыть приложение",  command=lambda: close_application(root))
-    close_button.grid(row=10, column=1, columnspan=3, padx=5, pady=5, sticky="nsew")
+    close_button.grid(row=4, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")
 
 
-    root.grid_rowconfigure(0, weight=1)
     root.grid_rowconfigure(12, weight=1)
-    root.grid_columnconfigure(0, weight=1)
     root.grid_columnconfigure(3, weight=1)
 
     root.mainloop()