Selaa lähdekoodia

wxGUI: create parallel wx.frame for Single Window layout development (#1604)

The copy of frame.py prepared for developing single layout solution plus testing rows in wxgui.py
Linda Kladivova 3 vuotta sitten
vanhempi
commit
151e0a6d57
3 muutettua tiedostoa jossa 2257 lisäystä ja 2 poistoa
  1. 2 2
      gui/wxpython/Makefile
  2. 2251 0
      gui/wxpython/main_window/frame.py
  3. 4 0
      gui/wxpython/wxgui.py

+ 2 - 2
gui/wxpython/Makefile

@@ -10,7 +10,7 @@ DSTDIR = $(GUIDIR)/wxpython
 
 
 SRCFILES := $(wildcard icons/*.py scripts/*.py xml/*) \
 SRCFILES := $(wildcard icons/*.py scripts/*.py xml/*) \
 	$(wildcard animation/*.py core/*.py datacatalog/*.py dbmgr/*.py gcp/*.py gmodeler/*.py \
 	$(wildcard animation/*.py core/*.py datacatalog/*.py dbmgr/*.py gcp/*.py gmodeler/*.py \
-	gui_core/*.py iclass/*.py lmgr/*.py location_wizard/*.py mapwin/*.py mapdisp/*.py \
+	gui_core/*.py iclass/*.py lmgr/*.py location_wizard/*.py main_window/*.py mapwin/*.py mapdisp/*.py \
 	mapswipe/*.py modules/*.py nviz/*.py psmap/*.py rdigit/*.py \
 	mapswipe/*.py modules/*.py nviz/*.py psmap/*.py rdigit/*.py \
 	rlisetup/*.py startup/*.py timeline/*.py vdigit/*.py \
 	rlisetup/*.py startup/*.py timeline/*.py vdigit/*.py \
 	vnet/*.py web_services/*.py wxplot/*.py iscatt/*.py tplot/*.py photo2image/*.py image2target/*.py) \
 	vnet/*.py web_services/*.py wxplot/*.py iscatt/*.py tplot/*.py photo2image/*.py image2target/*.py) \
@@ -20,7 +20,7 @@ DSTFILES := $(patsubst %,$(DSTDIR)/%,$(SRCFILES)) \
 	$(patsubst %.py,$(DSTDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
 	$(patsubst %.py,$(DSTDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
 
 
 PYDSTDIRS := $(patsubst %,$(DSTDIR)/%,animation core datacatalog dbmgr gcp gmodeler \
 PYDSTDIRS := $(patsubst %,$(DSTDIR)/%,animation core datacatalog dbmgr gcp gmodeler \
-	gui_core iclass lmgr location_wizard mapwin mapdisp modules nviz psmap \
+	gui_core iclass lmgr location_wizard main_window mapwin mapdisp modules nviz psmap \
 	mapswipe vdigit wxplot web_services rdigit rlisetup startup \
 	mapswipe vdigit wxplot web_services rdigit rlisetup startup \
 	vnet timeline iscatt tplot photo2image image2target)
 	vnet timeline iscatt tplot photo2image image2target)
 
 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2251 - 0
gui/wxpython/main_window/frame.py


+ 4 - 0
gui/wxpython/wxgui.py

@@ -113,6 +113,10 @@ class GMApp(wx.App):
 
 
         mainframe = GMFrame(parent=None, id=wx.ID_ANY, workspace=self.workspaceFile)
         mainframe = GMFrame(parent=None, id=wx.ID_ANY, workspace=self.workspaceFile)
 
 
+        # testing purposes
+        # from main_window.frame import GMFrame
+        # mainframe = GMFrame(parent=None, id=wx.ID_ANY, workspace=self.workspaceFile)
+
         mainframe.Show()
         mainframe.Show()
         self.SetTopWindow(mainframe)
         self.SetTopWindow(mainframe)