Commit c2ce0e40 authored by Nils Hoffmann's avatar Nils Hoffmann

Updated to wxPython 4. Updated environments. Added requirements.txt

parent cdf71086
......@@ -13,7 +13,7 @@ pipeline {
}
}
steps {
sh 'pyinstaller --distpath="/src/LipidXplorer-1.2.8.${BUILD_NUMBER}" /src/LipidXplorer.spec'
sh 'pyinstaller --distpath="LipidXplorer-1.2.8.${BUILD_NUMBER}" LipidXplorer.spec'
}
post {
success {
......
......@@ -73,7 +73,7 @@ class PythonSTC(stc.StyledTextCtrl):
#self.SetBufferedDraw(False)
self.SetViewEOL(False)
self.SetEOLMode(stc.STC_EOL_CRLF)
self.SetUseAntiAliasing(True)
#self.SetUseAntiAliasing(True)
#self.SetEdgeMode(stc.STC_EDGE_BACKGROUND)
#self.SetEdgeColumn(78)
......
......@@ -510,7 +510,7 @@ class TextOutFrame(wx.Frame):
self.sizer = wx.BoxSizer(wx.VERTICAL)
self.text_ctrl = stc.StyledTextCtrl(self,
style = wx.SIMPLE_BORDER|wx.HSCROLL|wx.VSCROLL|wx.TE_AUTO_SCROLL|wx.ALWAYS_SHOW_SB|wx.TE_MULTILINE)#, size = wx.Point(835, 700))
style = wx.SIMPLE_BORDER|wx.HSCROLL|wx.VSCROLL|wx.ALWAYS_SHOW_SB|wx.TE_MULTILINE)#, size = wx.Point(835, 700))
# IDEA: use styled text to make a syntax highlighting
#self.text_ctrl = PythonSTC(self, -1,
# style = wx.SIMPLE_BORDER|wx.HSCROLL|wx.VSCROLL|wx.TE_AUTO_SCROLL|wx.ALWAYS_SHOW_SB|wx.TE_MULTILINE)#, size = wx.Point(835, 700))
......@@ -1142,26 +1142,26 @@ class LpdxFrame(wx.Frame):
self.menubar = wx.MenuBar()
self.menu_project = wx.Menu()
self.menu_project.AppendItem(wx.MenuItem(self.menu_project, 1, "Load project"))
self.menu_project.AppendItem(wx.MenuItem(self.menu_project, 2, "Save project"))
self.menu_project.AppendItem(wx.MenuItem(self.menu_project, 3, "Save project as ..."))
self.menu_project.Append(wx.MenuItem(self.menu_project, 1, "Load project"))
self.menu_project.Append(wx.MenuItem(self.menu_project, 2, "Save project"))
self.menu_project.Append(wx.MenuItem(self.menu_project, 3, "Save project as ..."))
self.menu_debug = wx.Menu()
self.menu_debug.AppendItem(wx.MenuItem(self.menu_debug, 4, "Debug window"))
self.menu_debug.AppendItem(wx.MenuItem(self.menu_debug, 5, "Set debug levels"))
self.menu_debug.Append(wx.MenuItem(self.menu_debug, 4, "Debug window"))
self.menu_debug.Append(wx.MenuItem(self.menu_debug, 5, "Set debug levels"))
self.menu_options = wx.Menu()
# disabling alignment method dialog
# self.menu_options.AppendItem(wx.MenuItem(self.menu_options, 6, "Set alignment method"))
self.menu_options.AppendItem(wx.MenuItem(self.menu_options, 7, "Output options"))
# self.menu_options.Append(wx.MenuItem(self.menu_options, 6, "Set alignment method"))
self.menu_options.Append(wx.MenuItem(self.menu_options, 7, "Output options"))
self.menu_help = wx.Menu()
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 8, "LipidXplorer Documentation"))
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 9, "MFQL tutorial"))
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 10, "MFQL reference"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 8, "LipidXplorer Documentation"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 9, "MFQL tutorial"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 10, "MFQL reference"))
self.menu_help.AppendSeparator()
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 11, "Help with 'Import Settings'"))
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 12, "Help with 'Run'"))
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 13, "Help with 'MS Tools'"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 11, "Help with 'Import Settings'"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 12, "Help with 'Run'"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 13, "Help with 'MS Tools'"))
self.menu_help.AppendSeparator()
self.menu_help.AppendItem(wx.MenuItem(self.menu_help, 14, "About LipidXplorer"))
self.menu_help.Append(wx.MenuItem(self.menu_help, 14, "About LipidXplorer"))
self.menu_about = wx.Menu()
self.menubar.Append(self.menu_project, "&Project")
self.menubar.Append(self.menu_debug, "&Debug")
......@@ -2648,7 +2648,7 @@ intensity."""))
self.currentConfiguration = ''
self.choice_SelectSettingSection.Clear()
self.choice_SelectSettingSection.AppendItems(self.listConfigurations)
self.choice_SelectSettingSection.Append(self.listConfigurations)
self.clearConfiguration()
def OnSave_LoadIni(self, evt):
......@@ -2706,7 +2706,7 @@ intensity."""))
self.currentConfiguration = ''
self.choice_SelectSettingSection.Clear()
self.choice_SelectSettingSection.AppendItems(self.listConfigurations)
self.choice_SelectSettingSection.Appends(self.listConfigurations)
self.clearConfiguration()
with open(self.filePath_LoadIni, 'w+') as fIni:
......@@ -2782,7 +2782,7 @@ intensity."""))
#self.choice_SelectSettingSection.Set(sorted(self.confParse.sections()))
self.choice_SelectSettingSection.Clear()
self.choice_SelectSettingSection.AppendItems(self.listConfigurations)
self.choice_SelectSettingSection.Appends(self.listConfigurations)
with open(self.filePath_LoadIni, 'w+') as fIni:
self.confParse.write(fIni)
......@@ -2866,7 +2866,10 @@ intensity."""))
self.filePath_Output += 'csv'
dlg.Destroy()
self.text_ctrl_OutputSection.SetValue(self.filePath_Output)
try:
self.text_ctrl_OutputSection.SetValue(self.filePath_Output)
except AttributeError:
print "No output file specified!"
def OnBrowse_MasterScan(self, evt):
......
configparser==3.5.0
lxml==4.3.4
numpy==1.15.2
pathlib2==2.3.3
pandas==0.24.2
ply==3.11
six==1.12.0
wxPython==4.0.6
......@@ -10,32 +10,32 @@ dependencies:
- future=0.17.1=py27_0
- icc_rt=2019.0.0=h0cc432a_1
- intel-openmp=2019.4=245
- libiconv=1.15=hda2e4ec_7
- libiconv=1.15=vc9h6e1f958_5
- libxml2=2.9.9=h325896a_0
- libxslt=1.1.33=h803002f_0
- lxml=4.3.4=py27h31b8cb8_0
- macholib=1.11=py_0
- mkl=2019.4=245
- mkl_fft=1.0.12=py27h44c1dab_0
- mkl-service=2.3.0=py27h0b88c2a_0
- mkl_fft=1.0.14=py27h44c1dab_0
- numpy=1.16.3=py27h5fc8d92_0
- numpy-base=1.16.3=py27hb1d0314_0
- pandas=0.24.2=py27hc56fc5f_0
- pefile=2019.4.18=py_0
- pip=19.1.1=py27_0
- pip=19.2.2=py27_0
- pycrypto=2.6.1=py27h0c8e037_9
- pyinstaller=3.4=py27h7a46e7a_1
- python=2.7.16=hcb6e200_0
- python-dateutil=2.8.0=py27_0
- pytz=2019.1=py_0
- pytz=2019.2=py_0
- pywin32=223=py27h0c8e037_1
- pywin32-ctypes=0.2.0=py27_0
- setuptools=41.0.1=py27_0
- six=1.12.0=py27_0
- sqlite=3.29.0=h0c8e037_0
- vc=9=h7299396_1
- vs2008_runtime=9.00.30729.1=hfaea7d5_1
- vs2008_runtime=9.00.30729.5054=0
- wheel=0.33.4=py27_0
- wincertstore=0.2=py27hf04cefb_0
- wxpython=3.0=py27_0
- zlib=1.2.11=h3cc03e0_3
- wxpython=4.0.4=py27hc56fc5f_0
- zlib=1.2.11=vc9ha80f4e8_1
\ No newline at end of file
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