Commit 2e0d4312 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

gui tweaks

parent 68da3443

pysen/ui/EchoSimWidget.ui

+7 −7
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
   <rect>

    <x>0</x>

    <y>0</y>

    <width>960</width>

    <height>640</height>

    <width>1020</width>

    <height>720</height>

   </rect>

  </property>

  <property name="sizePolicy">
@@ -24,8 +24,8 @@ 
    <rect>

     <x>10</x>

     <y>10</y>

     <width>941</width>

     <height>471</height>

     <width>1001</width>

     <height>541</height>

    </rect>

   </property>

   <layout class="QVBoxLayout" name="verticalLayout"/>
@@ -34,9 +34,9 @@ 
   <property name="geometry">

    <rect>

     <x>10</x>

     <y>486</y>

     <width>941</width>

     <height>121</height>

     <y>556</y>

     <width>1001</width>

     <height>151</height>

    </rect>

   </property>

   <layout class="QGridLayout" name="gridLayout">

pysen/ui/NSEMainWindow.py

+5 −3
Original line number Diff line number Diff line
@@ -45,13 +45,15 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): 
        self.actionExit.triggered.connect(self.file_exit)

        self.actionAbout.triggered.connect(self.help_about)



        #

        # TAB 1. MAIN

        canvas = FigureCanvas(Figure(figsize=(5, 3)))

        self.fig = canvas.figure

        self.verticalLayoutMain.addWidget(canvas)#

        #



        # TAB 2. SIM

        self.echosim = EchoSimWidget(self.frameSim)

        #



        # TAB 3. CONSOLE

        self.console = EmbeddedJupyterConsole(figure=self.fig, plot=default_plot)

        self.kernel_manager = self.console.kernel_manager

        self.verticalLayoutShell.addWidget(self.console)

pysen/ui/NSEMainWindow.ui

+32 −21
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
   <rect>

    <x>0</x>

    <y>0</y>

    <width>1043</width>

    <width>1024</width>

    <height>960</height>

   </rect>

  </property>
@@ -35,9 +35,15 @@ 
      <verstretch>0</verstretch>

     </sizepolicy>

    </property>

    <property name="tabShape">

     <enum>QTabWidget::Rounded</enum>

    </property>

    <property name="currentIndex">

     <number>0</number>

    </property>

    <property name="documentMode">

     <bool>false</bool>

    </property>

    <widget class="QWidget" name="tab_Main">

     <attribute name="title">

      <string>Main</string>
@@ -45,9 +51,9 @@ 
     <widget class="QWidget" name="verticalLayoutWidget">

      <property name="geometry">

       <rect>

        <x>10</x>

        <x>0</x>

        <y>0</y>

        <width>1001</width>

        <width>1021</width>

        <height>731</height>

       </rect>

      </property>
@@ -58,18 +64,15 @@ 
     <attribute name="title">

      <string>EchoSim</string>

     </attribute>

     <widget class="QWidget" name="verticalLayoutWidget_2">

     <widget class="QFrame" name="frameSim">

      <property name="geometry">

       <rect>

        <x>10</x>

        <y>0</y>

        <width>1001</width>

        <x>-1</x>

        <y>-1</y>

        <width>1021</width>

        <height>731</height>

       </rect>

      </property>

      <layout class="QVBoxLayout" name="verticalLayoutMain_3">

       <item>

        <widget class="QFrame" name="frameSim">

      <property name="frameShape">

       <enum>QFrame::StyledPanel</enum>

      </property>
@@ -77,9 +80,6 @@ 
       <enum>QFrame::Raised</enum>

      </property>

     </widget>

       </item>

      </layout>

     </widget>

    </widget>

    <widget class="QWidget" name="tab_Shell">

     <attribute name="title">
@@ -90,7 +90,7 @@ 
       <rect>

        <x>10</x>

        <y>0</y>

        <width>1001</width>

        <width>1011</width>

        <height>731</height>

       </rect>

      </property>
@@ -98,13 +98,24 @@ 
     </widget>

    </widget>

   </widget>

   <widget class="QWidget" name="gridLayoutWidget">

    <property name="geometry">

     <rect>

      <x>0</x>

      <y>770</y>

      <width>1021</width>

      <height>121</height>

     </rect>

    </property>

    <layout class="QGridLayout" name="gridLayout"/>

   </widget>

  </widget>

  <widget class="QMenuBar" name="menuBar">

   <property name="geometry">

    <rect>

     <x>0</x>

     <y>0</y>

     <width>1043</width>

     <width>1024</width>

     <height>24</height>

    </rect>

   </property>

pysen/ui/ui_EchoSimWidget.py

+3 −3
Original line number Diff line number Diff line
@@ -14,20 +14,20 @@ from PyQt5 import QtCore, QtGui, QtWidgets 
class Ui_EchoSimWidget(object):

    def setupUi(self, EchoSimWidget):

        EchoSimWidget.setObjectName("EchoSimWidget")

        EchoSimWidget.resize(960, 640)

        EchoSimWidget.resize(1020, 720)

        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)

        sizePolicy.setHorizontalStretch(0)

        sizePolicy.setVerticalStretch(0)

        sizePolicy.setHeightForWidth(EchoSimWidget.sizePolicy().hasHeightForWidth())

        EchoSimWidget.setSizePolicy(sizePolicy)

        self.verticalLayoutWidget = QtWidgets.QWidget(EchoSimWidget)

        self.verticalLayoutWidget.setGeometry(QtCore.QRect(10, 10, 941, 471))

        self.verticalLayoutWidget.setGeometry(QtCore.QRect(10, 10, 1001, 541))

        self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")

        self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)

        self.verticalLayout.setContentsMargins(0, 0, 0, 0)

        self.verticalLayout.setObjectName("verticalLayout")

        self.gridLayoutWidget = QtWidgets.QWidget(EchoSimWidget)

        self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 486, 941, 121))

        self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 556, 1001, 151))

        self.gridLayoutWidget.setObjectName("gridLayoutWidget")

        self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget)

        self.gridLayout.setContentsMargins(0, 0, 0, 0)

pysen/ui/ui_NSEMainWindow.py

+15 −13
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets 
class Ui_NSEMainWindow(object):

    def setupUi(self, NSEMainWindow):

        NSEMainWindow.setObjectName("NSEMainWindow")

        NSEMainWindow.resize(1043, 960)

        NSEMainWindow.resize(1024, 960)

        self.centralWidget = QtWidgets.QWidget(NSEMainWindow)

        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)

        sizePolicy.setHorizontalStretch(0)
@@ -29,11 +29,13 @@ class Ui_NSEMainWindow(object): 
        sizePolicy.setVerticalStretch(0)

        sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth())

        self.tabWidget.setSizePolicy(sizePolicy)

        self.tabWidget.setTabShape(QtWidgets.QTabWidget.Rounded)

        self.tabWidget.setDocumentMode(False)

        self.tabWidget.setObjectName("tabWidget")

        self.tab_Main = QtWidgets.QWidget()

        self.tab_Main.setObjectName("tab_Main")

        self.verticalLayoutWidget = QtWidgets.QWidget(self.tab_Main)

        self.verticalLayoutWidget.setGeometry(QtCore.QRect(10, 0, 1001, 731))

        self.verticalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 1021, 731))

        self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")

        self.verticalLayoutMain = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)

        self.verticalLayoutMain.setContentsMargins(11, 11, 11, 11)
@@ -42,32 +44,32 @@ class Ui_NSEMainWindow(object): 
        self.tabWidget.addTab(self.tab_Main, "")

        self.tab_EchoSim = QtWidgets.QWidget()

        self.tab_EchoSim.setObjectName("tab_EchoSim")

        self.verticalLayoutWidget_2 = QtWidgets.QWidget(self.tab_EchoSim)

        self.verticalLayoutWidget_2.setGeometry(QtCore.QRect(10, 0, 1001, 731))

        self.verticalLayoutWidget_2.setObjectName("verticalLayoutWidget_2")

        self.verticalLayoutMain_3 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_2)

        self.verticalLayoutMain_3.setContentsMargins(11, 11, 11, 11)

        self.verticalLayoutMain_3.setSpacing(6)

        self.verticalLayoutMain_3.setObjectName("verticalLayoutMain_3")

        self.frameSim = QtWidgets.QFrame(self.verticalLayoutWidget_2)

        self.frameSim = QtWidgets.QFrame(self.tab_EchoSim)

        self.frameSim.setGeometry(QtCore.QRect(-1, -1, 1021, 731))

        self.frameSim.setFrameShape(QtWidgets.QFrame.StyledPanel)

        self.frameSim.setFrameShadow(QtWidgets.QFrame.Raised)

        self.frameSim.setObjectName("frameSim")

        self.verticalLayoutMain_3.addWidget(self.frameSim)

        self.tabWidget.addTab(self.tab_EchoSim, "")

        self.tab_Shell = QtWidgets.QWidget()

        self.tab_Shell.setObjectName("tab_Shell")

        self.verticalLayoutWidget_3 = QtWidgets.QWidget(self.tab_Shell)

        self.verticalLayoutWidget_3.setGeometry(QtCore.QRect(10, 0, 1001, 731))

        self.verticalLayoutWidget_3.setGeometry(QtCore.QRect(10, 0, 1011, 731))

        self.verticalLayoutWidget_3.setObjectName("verticalLayoutWidget_3")

        self.verticalLayoutShell = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_3)

        self.verticalLayoutShell.setContentsMargins(11, 11, 11, 11)

        self.verticalLayoutShell.setSpacing(6)

        self.verticalLayoutShell.setObjectName("verticalLayoutShell")

        self.tabWidget.addTab(self.tab_Shell, "")

        self.gridLayoutWidget = QtWidgets.QWidget(self.centralWidget)

        self.gridLayoutWidget.setGeometry(QtCore.QRect(0, 770, 1021, 121))

        self.gridLayoutWidget.setObjectName("gridLayoutWidget")

        self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget)

        self.gridLayout.setContentsMargins(11, 11, 11, 11)

        self.gridLayout.setSpacing(6)

        self.gridLayout.setObjectName("gridLayout")

        NSEMainWindow.setCentralWidget(self.centralWidget)

        self.menuBar = QtWidgets.QMenuBar(NSEMainWindow)

        self.menuBar.setGeometry(QtCore.QRect(0, 0, 1043, 24))

        self.menuBar.setGeometry(QtCore.QRect(0, 0, 1024, 24))

        self.menuBar.setObjectName("menuBar")

        self.menuFile = QtWidgets.QMenu(self.menuBar)

        self.menuFile.setObjectName("menuFile")