Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 681857e8

Přidáno uživatelem Martin Forejt před téměř 4 roky(ů)

Revert "Merge branch 'feature/8892_gui_scrollbar' into 'develop'"

This reverts commit a79efbfdd461df5544acee26155b3bd5358e926d, reversing
changes made to bf5cef2fc200c10d6fb596287b111c6b352be1e7.

Zobrazit rozdíly:

aswi2021vochomurka/view/main_view.py
1 1
import math
2 2
import random
3 3

  
4
from PyQt5.QtCore import QSize, QThread, QObject, pyqtSignal, Qt
5
from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit, QDialog, QHBoxLayout, QWidget, QScrollArea
4
from PyQt5.QtCore import QSize, QThread, QObject, pyqtSignal
5
from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit, QDialog, QHBoxLayout
6 6
from numpy import pi, sin, cos, tan, exp
7 7
from matplotlib.pyplot import subplot
8 8

  
......
74 74

  
75 75
        self.figure = plt.figure(figsize=([500,500]))
76 76

  
77
        self.widget = QWidget()
78
        # self.setCentralWidget(self.widget)
79
        self.widget.setLayout(QVBoxLayout())
80
        # self.widget.layout().setContentsMargins(0,0,0,0)
81
        # self.widget.layout().setSpacing(0)
82

  
83 77
        self.canvas = FigureCanvas(self.figure)
84
        self.canvas.setFixedSize(1180,5000)
85
        self.canvas.draw()
86
        self.scroll = QScrollArea(self.widget)
87
        self.scroll.setWidget(self.canvas)
88
        self.scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
89
        self.scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
90

  
91
        self.nav = NavigationToolbar(self.canvas, self.widget)
92
        self.widget.layout().addWidget(self.nav)
93
        self.widget.layout().addWidget(self.scroll)
78
        self.toolbar = NavigationToolbar(self.canvas, self)
94 79

  
95
        self.setFixedSize(QSize(1200, 800))
80
        self.setMinimumSize(QSize(440, 240))
96 81
        self.setWindowTitle("MQTT demo")
97 82

  
98
        # Add text field
99 83
        self.b = QPlainTextEdit(self)
100 84
        self.b.insertPlainText("App started...\n")
101
        # self.b.move(10, 50)
102
        # self.b.resize(200, 100)
103
        self.b.setFixedSize(1180,100)
104 85

  
105 86
        layout = QVBoxLayout()
106 87
        layout.addWidget(self.b)
107
        layout.addWidget(self.nav)
108
        layout.addWidget(self.scroll)
109

  
110
        # self.canvas = FigureCanvas(self.figure)
111
        # self.toolbar = NavigationToolbar(self.canvas, self)
112
        #
113
        # self.setMinimumSize(QSize(440, 240))
114
        # self.setWindowTitle("MQTT demo")
115
        #
116
        # self.b = QPlainTextEdit(self)
117
        # self.b.insertPlainText("App started...\n")
118
        #
119
        # layout = QVBoxLayout()
120
        # layout.addWidget(self.b)
121
        # layout.addWidget(self.toolbar)
122
        # layout.addWidget(self.canvas)
88
        layout.addWidget(self.toolbar)
89
        layout.addWidget(self.canvas)
123 90

  
124 91
        self.setLayout(layout)
125 92

  

Také k dispozici: Unified diff