• R/O
  • HTTP
  • SSH
  • HTTPS

fermisurfer: Commit

fermisurfer Git


Commit MetaInfo

Revisiondc6b7d8a54d8b7bdd6b667e9427237985fd4ec54 (tree)
Zeit2017-07-10 00:09:01
Autormitsuaki1987 <kawamitsuaki@gmai...>
Commitermitsuaki1987

Log Message

Bagfix in the translation of premitive BZ

Ändern Zusammenfassung

Diff

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,17 @@
11 ACLOCAL_AMFLAGS = -I config/m4
2-
32 SUBDIRS = src
4-
53 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure
4+
5+EXTRA_DIST = doc bin
6+
7+docs:
8+ cd doc/ja/;make latexpdfja; make html
9+ cd doc/en/;make latexpdfja; make html
10+
11+pngdocs:
12+ cd doc/ja/;sed -i -e "s/mathjax/pngmath/g" conf.py; make latexpdfja; make html
13+ cd doc/en/;sed -i -e "s/mathjax/pngmath/g" conf.py; make latexpdfja; make html
14+
15+docs-clean:
16+ cd doc/ja/; make clean; sed -i -e "s/pngmath/mathjax/g" conf.py
17+ cd doc/en/; make clean; sed -i -e "s/pngmath/mathjax/g" conf.py
--- a/Makefile.in
+++ b/Makefile.in
@@ -314,6 +314,7 @@ top_srcdir = @top_srcdir@
314314 ACLOCAL_AMFLAGS = -I config/m4
315315 SUBDIRS = src
316316 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure
317+EXTRA_DIST = doc bin
317318 all: config.h
318319 $(MAKE) $(AM_MAKEFLAGS) all-recursive
319320
@@ -786,6 +787,18 @@ uninstall-am:
786787 uninstall-am
787788
788789
790+docs:
791+ cd doc/ja/;make latexpdfja; make html
792+ cd doc/en/;make latexpdfja; make html
793+
794+pngdocs:
795+ cd doc/ja/;sed -i -e "s/mathjax/pngmath/g" conf.py; make latexpdfja; make html
796+ cd doc/en/;sed -i -e "s/mathjax/pngmath/g" conf.py; make latexpdfja; make html
797+
798+docs-clean:
799+ cd doc/ja/; make clean; sed -i -e "s/pngmath/mathjax/g" conf.py
800+ cd doc/en/; make clean; sed -i -e "s/pngmath/mathjax/g" conf.py
801+
789802 # Tell versions [3.59,3.63) of GNU make to not export all variables.
790803 # Otherwise a system limit (for SysV at least) may be exceeded.
791804 .NOEXPORT:
--- a/src/draw.c
+++ b/src/draw.c
@@ -123,7 +123,7 @@ static void draw_fermi() {
123123 /*
124124 Second, draw each lines
125125 */
126- glLineWidth(2.0);
126+ glLineWidth(3.0f*scl);
127127 glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, black);
128128 glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black);
129129 glBegin(GL_LINES);
@@ -151,7 +151,7 @@ static void draw_bz_lines() {
151151 else
152152 for (i = 0; i<4; i++) linecolor[i] = black[i];
153153 /**/
154- glLineWidth(2.0);
154+ glLineWidth(3.0f*scl);
155155 glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, linecolor);
156156 glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, linecolor);
157157 /*
@@ -179,8 +179,7 @@ static void draw_bz_lines() {
179179 for (j = 0; j < 3; ++j) {
180180 bvec2[i][j] = rot[j][0] * bvec[i][0]
181181 + rot[j][1] * bvec[i][1]
182- + rot[j][2] * bvec[i][2]
183- + trans[j];
182+ + rot[j][2] * bvec[i][2];
184183 }
185184 }
186185 glBegin(GL_LINE_STRIP);
@@ -370,7 +369,7 @@ static void draw_fermi_line() {
370369 else
371370 for (i = 0; i<4; i++) linecolor[i] = black[i];
372371 /**/
373- glLineWidth(2.0);
372+ glLineWidth(3.0f*scl);
374373 glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, linecolor);
375374 glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, linecolor);
376375 glBegin(GL_LINE_LOOP);
@@ -379,7 +378,7 @@ static void draw_fermi_line() {
379378 /*
380379 Draw Fermi lines
381380 */
382- glLineWidth(2.0);
381+ glLineWidth(3.0f*scl);
383382 glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, black);
384383 glBegin(GL_LINES);
385384 for (ib = 0; ib < nb; ib++) {
Show on old repository browser