OSDN > Finden Software > Multimedia > Graphics > fermisurfer > SCM > git > fermisurfer > Commit

fermisurfer
Fork
fermisurfer
android

R/O
HTTP
SSH
HTTPS

fermisurfer: Commit

fermisurfer Git

Commit MetaInfo

Revision	edae1d5c72a81cd6221f91c38752caad92b694b3 (tree)
Zeit	2019-06-03 16:52:30
Autor	mitsuaki1987 <kawamitsuaki@gmai...>
Commiter	mitsuaki1987

Log Message

Backup

Ändern Zusammenfassung

modified: src/menu.cpp (diff)
modified: src/operation.cpp (diff)

Diff

--- a/src/menu.cpp

+++ b/src/menu.cpp

		@@ -661,10 +661,12 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
661	661	wxMenu* imenu_band = new wxMenu;
662	662	for (ib = 0; ib < nb; ib++) {
663	663	imenu_band->AppendCheckItem(menu_band_check1 + ib, wxString::Format(wxT("Band %d"), ib));
	664	+ imenu_band->Check(menu_band_check1 + ib, true);
664	665	}
665	666
666	667	wxMenu* imenu_colorscale = new wxMenu;
667	668	imenu_colorscale->Append(colorscale_maxmin, wxT("Max/Min of Scale"));
	669	+ imenu_colorscale->AppendSeparator();
668	670	imenu_colorscale->AppendRadioItem(colorscale_radio1, wxT("Input (Real)"));
669	671	imenu_colorscale->AppendRadioItem(colorscale_radio2, wxT("Input (Complex)"));
670	672	imenu_colorscale->AppendRadioItem(colorscale_radio3, wxT("Input (Tri-number)"));

		@@ -689,6 +691,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
689	691
690	692	wxMenu* imenu_section = new wxMenu;
691	693	imenu_section->AppendCheckItem(menu_section_check, wxT("Section"));
	694	+ imenu_section->AppendSeparator();
692	695	imenu_section->Append(menu_section_modify, wxT("Modify section"));
693	696	imenu_section->Append(menu_section_gamma, wxT("Modify section (across Gamma)"));
694	697

		@@ -715,6 +718,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
715	718	fileMenu->AppendSubMenu(imenu_band, wxT("Band"));
716	719	fileMenu->AppendSubMenu(imenu_bzmode, wxT("Brillouin zone"));
717	720	fileMenu->AppendCheckItem(menu_colorbar_check, wxT("Color bar"));
	721	+ fileMenu->Check(menu_colorbar_check, true);
718	722	fileMenu->AppendSubMenu(imenu_colorscale, wxT("Color scale mode"));
719	723	fileMenu->AppendSubMenu(imenu_equator, wxT("Equator"));
720	724	fileMenu->Append(imenu_interpol, wxT("Interpol ratio"));

		@@ -728,6 +732,8 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos,
728	732	fileMenu->AppendSubMenu(imenu_tetra, wxT("Tetrahedron"));
729	733	fileMenu->AppendSubMenu(imenu_view, wxT("View point"));
730	734
	735	+ //Bind(wxEVT_COMMAND_MENU_SELECTED, &MyFrame::OnExit, this, wxID_EXIT);
	736	+
731	737	wxMenuBar* menuBar = new wxMenuBar;
732	738	menuBar->Append(fileMenu, wxT("File"));
733	739	SetMenuBar(menuBar);

--- a/src/operation.cpp

+++ b/src/operation.cpp

		@@ -77,6 +77,7 @@ void TestGLCanvas::OnSize(wxSizeEvent& event)
77	77	gluPerspective(30.0, (GLfloat)event.GetSize().x / (GLfloat)event.GetSize().y, 1.0, 100.0);
78	78	/**/
79	79	glMatrixMode(GL_MODELVIEW);
	80	+ Refresh(false);
80	81	}
81	82	/**
82	83	@brief Glut mouse function

		@@ -224,6 +225,7 @@ void TestGLCanvas::InitGL()
224	225	glEnableClientState(GL_NORMAL_ARRAY);
225	226	glEnableClientState(GL_COLOR_ARRAY);
226	227	glEnable(GL_COLOR_MATERIAL);
	228	+ PostSizeEventToParent();
227	229	}
228	230
229	231	TestGLCanvas::TestGLCanvas(wxWindow* parent,

Show on old repository browser