Explorar o código

1)把git封装为模块
2)修改Hello,增加了git
3)修改了Data_Science的import

Huan %!s(int64=5) %!d(string=hai) anos
pai
achega
cf7e332481
Modificáronse 5 ficheiros con 17 adicións e 6 borrados
  1. 1 1
      Data_Science/__init__.py
  2. 2 2
      Git_controller/GIT.py
  3. 1 1
      Git_controller/Git_Ctrl.py
  4. 2 0
      Git_controller/__init__.py
  5. 11 2
      Hello.py

+ 1 - 1
Data_Science/__init__.py

@@ -1,2 +1,2 @@
-from .Me_learn import Machine_learning
+from Data_Science.Me_learn import Machine_learning
 print('数据科学模块加载完成...')
 print('数据科学模块加载完成...')

+ 2 - 2
GIT.py → Git_controller/GIT.py

@@ -1,9 +1,9 @@
 import tkinter
 import tkinter
 import tkinter.messagebox
 import tkinter.messagebox
 from tkinter import ttk
 from tkinter import ttk
-from tkinter.filedialog import askopenfilename, asksaveasfilename,askdirectory,askopenfilenames
+from tkinter.filedialog import asksaveasfilename,askdirectory,askopenfilenames
 import os
 import os
-import Git_Ctrl
+from Git_controller import Git_Ctrl
 from tkinter.scrolledtext import ScrolledText
 from tkinter.scrolledtext import ScrolledText
 import time
 import time
 import threading
 import threading

+ 1 - 1
Git_Ctrl.py → Git_controller/Git_Ctrl.py

@@ -37,7 +37,7 @@ class git_Repo:#git的基类
 
 
     def Flie_List(self,file_list,is_file=True,pat=' '):
     def Flie_List(self,file_list,is_file=True,pat=' '):
         if file_list == '.':
         if file_list == '.':
-            file = '.'
+            file = '..'
         else:
         else:
             file_ = []
             file_ = []
             for i in file_list:
             for i in file_list:

+ 2 - 0
Git_controller/__init__.py

@@ -0,0 +1,2 @@
+from Git_controller.GIT import Main
+print('Git控制器加载完毕')

+ 11 - 2
Hello.py

@@ -51,9 +51,18 @@ def Machine_Learning():
 
 
 def MLA():
 def MLA():
     global top, DsGC
     global top, DsGC
-    Mla = Process(target=Machine_Learning())
+    Mla = Process(target=Machine_Learning)
     Mla.start()
     Mla.start()
 
 
+def Git_Ctrl():
+    from Git_controller import Main
+    Main()
+
+def GIT_Ctrl():
+    global top, Git_Ctrl
+    Git = Process(target=Git_Ctrl)
+    Git.start()
+
 def Main():
 def Main():
     global top
     global top
     import tkinter
     import tkinter
@@ -85,7 +94,7 @@ def Main():
     #标题
     #标题
     tkinter.Label(F1, text='CoTan~NOTE', width=20,bg='#FFFFFF', font=ft).grid(column=0, row=0,sticky=tkinter.N)  # 设置说明
     tkinter.Label(F1, text='CoTan~NOTE', width=20,bg='#FFFFFF', font=ft).grid(column=0, row=0,sticky=tkinter.N)  # 设置说明
     tkinter.Label(F1, text='私人笔记',bg=abg,font=ft1).grid(column=0, row=1,sticky=tkinter.W + tkinter.E)
     tkinter.Label(F1, text='私人笔记',bg=abg,font=ft1).grid(column=0, row=1,sticky=tkinter.W + tkinter.E)
-    tkinter.Button(F1,text='Markdown笔记',cursor=bc,height=2,font=ft2,bg=bg,activebackground=abg,bd=0,justify=tkinter.LEFT).grid(column =0,row = 2,sticky=tkinter.N + tkinter.E + tkinter.W)
+    tkinter.Button(F1,text='Git仓库控制器',cursor=bc,command=GIT_Ctrl,height=2,font=ft2,bg=bg,activebackground=abg,bd=0,justify=tkinter.LEFT).grid(column =0,row = 2,sticky=tkinter.N + tkinter.E + tkinter.W)
     tkinter.Button(F1, text='画图板',cursor=bc,command=Draw, height=2, font=ft2, bg=bg,activebackground=abg, bd=0, justify=tkinter.LEFT).grid(column=0, row=3,sticky=tkinter.N + tkinter.E + tkinter.W)
     tkinter.Button(F1, text='画图板',cursor=bc,command=Draw, height=2, font=ft2, bg=bg,activebackground=abg, bd=0, justify=tkinter.LEFT).grid(column=0, row=3,sticky=tkinter.N + tkinter.E + tkinter.W)
     tkinter.Button(F1, text='爬虫系统',cursor=bc, height=1, font=ft2, bg=bg,activebackground=abg, bd=0, justify=tkinter.LEFT).grid(column=0, row=4,sticky=tkinter.N + tkinter.E + tkinter.W)
     tkinter.Button(F1, text='爬虫系统',cursor=bc, height=1, font=ft2, bg=bg,activebackground=abg, bd=0, justify=tkinter.LEFT).grid(column=0, row=4,sticky=tkinter.N + tkinter.E + tkinter.W)
     tkinter.Button(F1, text='我的寄忆',cursor=bc, height=1, font=ft2, bg=bg,activebackground=abg, bd=0, justify=tkinter.LEFT).grid(column=0, row=5,sticky=tkinter.N + tkinter.E + tkinter.W)
     tkinter.Button(F1, text='我的寄忆',cursor=bc, height=1, font=ft2, bg=bg,activebackground=abg, bd=0, justify=tkinter.LEFT).grid(column=0, row=5,sticky=tkinter.N + tkinter.E + tkinter.W)