Added available change color surface

Added available change color point(dynamic)

Author: StrongerProgrammer7

Lab2/frontshow/Color.py

@@ -17,9 +17,34 @@ class ColorFigure(Enum):
     MAGMA = "magma"
     CIVIDIS = "cividis"
     BINARY = "binary"
-    SPRINT = "sprint"
+    SPRING = "spring"
     SUMMER = "summer"
     WINTER = "winter"
     AUTUMN = "autumn"
     BONE = "bone"
 
+colors_3DGraphic = {
+    "plasma": ColorFigure.PLASMA.value,
+    "viridis":ColorFigure.VIRIDIS.value,
+    "inferno":ColorFigure.INFERNO.value,
+    "magma":ColorFigure.MAGMA.value,
+    "cividis":ColorFigure.CIVIDIS.value,
+    "binary":ColorFigure.BINARY.value,
+    "spring":ColorFigure.SPRING.value,
+    "summer":ColorFigure.SUMMER.value,
+    "winter":ColorFigure.WINTER.value,
+    "autumn":ColorFigure.AUTUMN.value,
+    "bone":ColorFigure.BONE.value
+}
+
+colors_points = {
+    "red": Color.RED.value,
+    "green":Color.GREEN.value,
+    "blue":Color.BLUE.value,
+    "cyan":Color.CYAN.value,
+    "yellow":Color.YELLOW.value,
+    "pink":Color.PINK.value,
+    "black":Color.BLACK.value,
+    "white":Color.WHITE.value,
+    "gray":Color.GRAY.value,
+}

Lab2/frontshow/animation.py

@@ -6,10 +6,10 @@
 def animate(frame, arr,best_result=None, textReach=None, marker=None):
     if len(arr) > frame:
         size_point = gv.SIZE_POINT
-        color = colors.Color.BLACK.value
+        color = gv.COLOR_POINT
         if (len(arr) - 1 == frame):
             color = colors.Color.RED.value
-            size_point = 50
+            size_point = 40
             if(best_result!=None):
                 gv.bestPointSet.append(omatpl.ax_3d.scatter(best_result[0], best_result[1], best_result[2], c=best_result[3], marker=best_result[4], s=best_result[5]))
         if (textReach != None):
@@ -25,8 +25,8 @@ def animate(frame, arr,best_result=None, textReach=None, marker=None):
                 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=1))
-
-            if(len(gv.scatter_points)>15 and  len(arr)-2 > frame):
+            # If you, don't want to delete point , comment this code
+            if len(gv.scatter_points)>15 and  len(arr)-2 > frame:
                 random_countForDel = random.randint(2, 5)
                 for i in range(0,random_countForDel):
                     randomPos = random.randint(0,len(gv.scatter_points)-2)

Lab2/frontshow/methods.py

@@ -1,11 +1,14 @@
 import outer_imports.imports_tkinter as otk
 import numpy as np
 from outer_imports.matplotlib import fig_3d
-from Lab2.frontshow.Color import ColorFigure
+from Lab2.frontshow.Color import ColorFigure, colors_3DGraphic, colors_points
 import global_variable as gv
 from Lab2.setFunction import chooseFunc
 
-def buildBaseFunction(ax_3d):
+def buildBaseFunction(ax_3d,colorGraphic=ColorFigure.WINTER.value):
+    if(len(gv.scatter_points) >0 or len(gv.bestPointSet)> 0 or len(gv.extraScatter) > 0):
+        otk.messagebox.showinfo("Warning", "Clear points!")
+        return
     ax_3d.clear()
 
     ax_3d.set_title("3D Matplotlib Plot")
@@ -23,12 +26,15 @@ def buildBaseFunction(ax_3d):
     X, Y = np.meshgrid(gv.x_data, gv.y_data)
     Z = gv.current_function(X, Y)
     #plot_wireframe
-    ax_3d.plot_surface(X, Y, Z, cmap=ColorFigure.WINTER.value,alpha=0.8,rstride=1, cstride=1,zorder=0)
+    ax_3d.plot_surface(X, Y, Z, cmap=colorGraphic,alpha=0.8,rstride=1, cstride=1,zorder=0)
     gv.canvas_3d.draw()
 
 def selectFunc(event,ax_3d,combo,lab,textField):
     try:
         if len(textField.get()) > 0 and textField.get()!='' and float(textField.get())!=0:
+            #if(gv.COLOR_3DGRAPHIC == None):
+                #otk.messagebox.showerror("Error", "Choose color")
+                #return
             selection = combo.get()
             gv.STEP = float(textField.get())
             if selection in chooseFunc:
@@ -40,13 +46,37 @@ def selectFunc(event,ax_3d,combo,lab,textField):
                 gv.START = chooseFunc[selection]['from']
                 gv.END = chooseFunc[selection]['to']
 
-            buildBaseFunction(ax_3d)
+            buildBaseFunction(ax_3d,gv.COLOR_3DGRAPHIC)
             lab.config(text="Функция:" + selection)
         else:
             otk.messagebox.showerror("Error", "Invalid input. Please enter numeric values step.")
     except ValueError:
         otk.messagebox.showerror("Error", "Invalid input. Please enter numeric values.")
 
+def selectColor(event,combo,ax_3d):
+    try:
+        selection = combo.get()
+        if gv.COLOR_3DGRAPHIC == None:
+            gv.COLOR_3DGRAPHIC = colors_3DGraphic[selection]
+        else:
+            gv.COLOR_3DGRAPHIC = colors_3DGraphic[selection]
+            buildBaseFunction(ax_3d,gv.COLOR_3DGRAPHIC)
+    except ValueError:
+        otk.messagebox.showerror("Error", "Problem with color graphic. Send message admin")
+
+def selectColorPoints(event,combo):
+    try:
+        selection = combo.get()
+        gv.COLOR_POINT = colors_points[selection]
+        # If you, don't want to delete point and different color for every run, comment this code
+        if(len(gv.scatter_points) >0):
+            for point in gv.scatter_points:
+                point.set_facecolors(gv.COLOR_POINT)
+            gv.canvas_3d.draw()
+
+    except ValueError:
+        otk.messagebox.showerror("Error", "Problem with color point. Send message admin")
+
 def save_plot():
     try:
         file_path = otk.filedialog.asksaveasfilename(defaultextension=".png", filetypes=[("PNG files", "*.png")])

Lab2/global_variable.py

@@ -4,7 +4,8 @@
 
 SPEED = 30
 SIZE_POINT = 20
-
+COLOR_3DGRAPHIC = None
+COLOR_POINT = "black"
 current_function = None
 x_data = []
 y_data = []

Lab2/main.py

@@ -7,7 +7,7 @@
                                           createTab_Genetic, createTab_Swarm,
                                           createTab_Bees, createTab_Bacterial, createTab_ImmuneSystem, createTab_Hybrid)
 
-from frontshow.methods import save_plot,close_application,selectFunc,clearPoints
+from frontshow.methods import save_plot, close_application, selectFunc, clearPoints, selectColor, selectColorPoints
 from frontshow.calc_algorithm.gradientDescentShow import callGradient_DrawPoint
 from frontshow.calc_algorithm.simpleMethodShow import call_simplex_method
 from frontshow.calc_algorithm.geneticAlgorithmShow import call_geneticsAlgorithm
@@ -78,6 +78,36 @@
     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")
 
+    comboBoxColorGraphic = ttk.Combobox(root, values=[
+        "plasma",
+        "viridis",
+        "inferno",
+        "magma",
+        "cividis",
+        "binary",
+        "spring",
+        "summer",
+        "winter",
+        "autumn",
+        "bone"], state="readonly")
+    comboBoxColorGraphic.bind("<<ComboboxSelected>>",lambda event, cb=comboBoxColorGraphic: selectColor(event, cb,ax_3d))
+    comboBoxColorGraphic.grid(row=1, column=0, padx=90, pady=5, sticky="w")
+    createLabel.placement_label(root, "Цвет графика", 1, 0, 0, 1, 1, 5,sticky="w")
+
+    comboBoxColorPoints = ttk.Combobox(root, values=[
+        "red",
+        "green",
+        "blue",
+        "cyan",
+        "yellow",
+        "pink",
+        "black",
+        "white",
+        "gray"], state="readonly")
+    comboBoxColorPoints.bind("<<ComboboxSelected>>",
+                              lambda event, cb=comboBoxColorPoints: selectColorPoints(event, cb))
+    comboBoxColorPoints.grid(row=1, column=0, padx=5, pady=5, sticky="e")
+    createLabel.placement_label(root, "Цвет точек", 1, 0, 150, 1, 1, 5, sticky="e")
 
     clear_btn = ttk.Button(root, text="Очистить точки с графика", command=clearPoints)
     clear_btn.grid(row=2, column=0, columnspan=3, padx=5, pady=5, sticky="nsew")