• R/O
  • HTTP
  • SSH
  • HTTPS

fermisurfer: Commit

fermisurfer Git


Commit MetaInfo

Revisionedae1d5c72a81cd6221f91c38752caad92b694b3 (tree)
Zeit2019-06-03 16:52:30
Autormitsuaki1987 <kawamitsuaki@gmai...>
Commitermitsuaki1987

Log Message

Backup

Ändern Zusammenfassung

Diff

--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -661,10 +661,12 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
661661 wxMenu* imenu_band = new wxMenu;
662662 for (ib = 0; ib < nb; ib++) {
663663 imenu_band->AppendCheckItem(menu_band_check1 + ib, wxString::Format(wxT("Band %d"), ib));
664+ imenu_band->Check(menu_band_check1 + ib, true);
664665 }
665666
666667 wxMenu* imenu_colorscale = new wxMenu;
667668 imenu_colorscale->Append(colorscale_maxmin, wxT("Max/Min of Scale"));
669+ imenu_colorscale->AppendSeparator();
668670 imenu_colorscale->AppendRadioItem(colorscale_radio1, wxT("Input (Real)"));
669671 imenu_colorscale->AppendRadioItem(colorscale_radio2, wxT("Input (Complex)"));
670672 imenu_colorscale->AppendRadioItem(colorscale_radio3, wxT("Input (Tri-number)"));
@@ -689,6 +691,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
689691
690692 wxMenu* imenu_section = new wxMenu;
691693 imenu_section->AppendCheckItem(menu_section_check, wxT("Section"));
694+ imenu_section->AppendSeparator();
692695 imenu_section->Append(menu_section_modify, wxT("Modify section"));
693696 imenu_section->Append(menu_section_gamma, wxT("Modify section (across Gamma)"));
694697
@@ -715,6 +718,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
715718 fileMenu->AppendSubMenu(imenu_band, wxT("Band"));
716719 fileMenu->AppendSubMenu(imenu_bzmode, wxT("Brillouin zone"));
717720 fileMenu->AppendCheckItem(menu_colorbar_check, wxT("Color bar"));
721+ fileMenu->Check(menu_colorbar_check, true);
718722 fileMenu->AppendSubMenu(imenu_colorscale, wxT("Color scale mode"));
719723 fileMenu->AppendSubMenu(imenu_equator, wxT("Equator"));
720724 fileMenu->Append(imenu_interpol, wxT("Interpol ratio"));
@@ -728,6 +732,8 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
728732 fileMenu->AppendSubMenu(imenu_tetra, wxT("Tetrahedron"));
729733 fileMenu->AppendSubMenu(imenu_view, wxT("View point"));
730734
735+ //Bind(wxEVT_COMMAND_MENU_SELECTED, &MyFrame::OnExit, this, wxID_EXIT);
736+
731737 wxMenuBar* menuBar = new wxMenuBar;
732738 menuBar->Append(fileMenu, wxT("File"));
733739 SetMenuBar(menuBar);
--- a/src/operation.cpp
+++ b/src/operation.cpp
@@ -77,6 +77,7 @@ void TestGLCanvas::OnSize(wxSizeEvent& event)
7777 gluPerspective(30.0, (GLfloat)event.GetSize().x / (GLfloat)event.GetSize().y, 1.0, 100.0);
7878 /**/
7979 glMatrixMode(GL_MODELVIEW);
80+ Refresh(false);
8081 }
8182 /**
8283 @brief Glut mouse function
@@ -224,6 +225,7 @@ void TestGLCanvas::InitGL()
224225 glEnableClientState(GL_NORMAL_ARRAY);
225226 glEnableClientState(GL_COLOR_ARRAY);
226227 glEnable(GL_COLOR_MATERIAL);
228+ PostSizeEventToParent();
227229 }
228230
229231 TestGLCanvas::TestGLCanvas(wxWindow* parent,
Show on old repository browser