From 6cace0c7adea008c37544e3e89a70cedacca63fc Mon Sep 17 00:00:00 2001
From: Jdrezen <jeremie.drezen@gmail.com>
Date: Wed, 19 May 2021 15:54:17 +0200
Subject: [PATCH] Nettoyage du constructeur
---
pyAmakIHM/classes/fenetre.py | 67 +++++-----------------------------
pyAmakIHM/classes/panelLogs.py | 6 +--
2 files changed, 11 insertions(+), 62 deletions(-)
diff --git a/pyAmakIHM/classes/fenetre.py b/pyAmakIHM/classes/fenetre.py
index e0a721f..06c45c2 100644
--- a/pyAmakIHM/classes/fenetre.py
+++ b/pyAmakIHM/classes/fenetre.py
@@ -22,11 +22,10 @@ class Fenetre :
Class Fenetre
"""
- """
def __init__(
self,
- name : str
- ) -> None :
+ name: str
+ ) -> None:
self.__observer = None
@@ -38,57 +37,15 @@ class Fenetre :
self.__root.title(name)
- self.__root.geometry("850x450")
+ self.__root.geometry("1000x700")
self.__panelCommandes = PanelCommandes(self.__root)
- self.__onglet = ttk.Notebook (self.__root)
- self.__onglet.pack(fill='both',side='right',expand='yes')
- self.__onglet.bind('<ButtonPress>',self.drag_tab)
-
- self.__panelGraphiques = []
-
- self.__panelVue = PanelVue(self.__onglet)
- self.__onglet.add(self.__panelVue, text = "Vue")
-"""
- def __init__(
- self,
- name: str
- ) -> None:
+ self.__division = PanedWindow(self.__root, orient='vertical')
+ self.__division.pack(side='right', expand='yes', fill='both')
- self.__images = []
- """1200/850=1,41 700/450==1,56"""
- self.__root = Tk()
+ self.__onglet = ttk.Notebook(self.__division)
- self.__root.title(name)
-
- self.__root.geometry("850x650")
-
- self.__panelCommandes = PanelCommandes(self.__root)
-
- """
- support of the division of the right part
- """
- self.__support = LabelFrame(self.__root)
- self.__support.pack(side=BOTTOM, expand='y', fill='both', pady=2, padx=2)
-
- """
- self.__support.place(height=435,width=600,relx=0.2575,rely=0.01)
-
- division of the right part
- """
- self.__division = PanedWindow(self.__support, orient='vertical')
- self.__division.pack(side='top', expand='y', fill='both', pady=2, padx=2)
-
- self.__onglet = ttk.Notebook(self.__division, width=600, height=370)
-
- self.__onglet.place(relx=0.28, height=320, width=600)
-
- """
- place %panedWindow
- self.__onglet.pack(fill='both',side='right',expand='yes')
- place root
- """
self.__onglet.bind('<ButtonPress>', self.drag_tab)
self.__panelGraphiques = []
@@ -98,13 +55,10 @@ class Fenetre :
self.__onglet.add(self.__panelVue, text="Vue")
self.__panel_log = PanelLogs(self.__division)
-
- """
- fulling divisions
- """
+
self.__division.add(self.__onglet)
- self.__division.add(self.__panel_log, height=300)
+ self.__division.add(self.__panel_log)
def get_root(self) -> Tk:
return self.__root
@@ -360,7 +314,7 @@ class Fenetre :
elif typeError == "":
self.__panel_log.logsDisplay(typeError)
- else :
+ else :
print("Empty string for typeError and message : at least one of them must not be empty \n")
def logsDisplay(self, message : str) -> None:
@@ -368,6 +322,3 @@ class Fenetre :
print("The message you want to print is empty.\n")
else :
self.__panel_log.logsDisplay(message)
-
-
-
diff --git a/pyAmakIHM/classes/panelLogs.py b/pyAmakIHM/classes/panelLogs.py
index a2f11d7..d49e12c 100644
--- a/pyAmakIHM/classes/panelLogs.py
+++ b/pyAmakIHM/classes/panelLogs.py
@@ -5,7 +5,7 @@ Class PanelLogs
from tkinter import ttk, Scrollbar, PanedWindow, Text
import sys, subprocess , os, io
import contextlib
-from tkinter.constants import INSERT
+from tkinter.constants import INSERT
from pyAmakIHM.classes.panelCommandes import PanelCommandes
@@ -27,7 +27,7 @@ class PanelLogs(Text):
"""
place where you can write and read logs
"""
- self.__affichage=Text(self,height=300 , width=600)
+ self.__affichage=Text(self)
self.__affichage.pack(fill='both',expand='yes')
@@ -55,5 +55,3 @@ class PanelLogs(Text):
def logsDisplay(self, message : str) -> None:
place=self.getText()
place.insert("end", message+"\n")
-
-
--
GitLab