The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit 9e17e9d0 authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'bugfix-main_panel_layout' into 'develop'

Bugfix main panel layout

See merge request !60
parents df46eed2 43f81d7d
Pipeline #7150 passed with stages
in 25 minutes and 59 seconds
version 1.4.0
--------------
* FIXED issue #56 Layout on Windows differed from macOS and Linux (we keep Windows Layout: "Data" on top, "Plugins" below)
* FIXED issue #54 Some Gromacs trajectories cannot be opened (due to the presence of "M" dummy atoms)
* FIXED issue #53 VASP NPT trajectories could not be opened
* FIXED issue #52 QVector circular lattice generator created an error
......
......@@ -22,7 +22,8 @@ import wx
import wx.aui as aui
from MDANSE import LOGGER, PLATFORM, REGISTRY
from MDANSE.__pkginfo__ import __author__, __commit__, __version__, __beta__
from MDANSE.__pkginfo__ import __author__, __commit__, __version__, __beta__
from MDANSE.Core.Platform import PLATFORM
from MDANSE.Framework.Jobs.Converter import Converter
from MDANSE.GUI.ControllerPanel import ControllerPanel
from MDANSE.GUI.DataController import DATA_CONTROLLER
......@@ -104,11 +105,16 @@ class MainFrame(wx.Frame):
self._panels["working"] = WorkingPanel(self)
self._panels["controller"] = ControllerPanel(self)
# Add the panes corresponding to the tree control and the notebook.
# Add the panes corresponding to the tree control and the notebook.
paneInfo1=aui.AuiPaneInfo()
self._mgr.AddPane(self._panels["data"], paneInfo1.Caption("Data").Name("data").Left().CloseButton(True).DestroyOnClose(False).MinSize((250,-1)))
paneInfo2=aui.AuiPaneInfo()
self._mgr.AddPane(self._panels["plugins"], paneInfo2.Caption("Plugins").Name("plugins").Left().CloseButton(True).DestroyOnClose(False).MinSize((250,-1)))
paneInfo2=aui.AuiPaneInfo()
# Order is first "Data", and then "Plugins". It is switched on Linux and macOS
if PLATFORM.name == "windows":
self._mgr.AddPane(self._panels["data"], paneInfo1.Caption("Data").Name("data").Left().CloseButton(True).DestroyOnClose(False).MinSize((250,-1)))
self._mgr.AddPane(self._panels["plugins"], paneInfo2.Caption("Plugins").Name("plugins").Left().CloseButton(True).DestroyOnClose(False).MinSize((250,-1)))
else:
self._mgr.AddPane(self._panels["plugins"], paneInfo2.Caption("Plugins").Name("plugins").Left().CloseButton(True).DestroyOnClose(False).MinSize((250,-1)))
self._mgr.AddPane(self._panels["data"], paneInfo1.Caption("Data").Name("data").Left().CloseButton(True).DestroyOnClose(False).MinSize((250,-1)))
paneInfo3=aui.AuiPaneInfo()
self._mgr.AddPane(self._panels["working"], paneInfo3.Caption("Working panel").Name("working").Center().CloseButton(False))
paneInfo4=aui.AuiPaneInfo()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment