update

README.md

@@ -1,21 +1,17 @@
 
-# twoWaySlab
+# twoWaySlab/２方向スラブの設計
+
+## GUI by wxpython
+![Image](./images/twoWaySlab.png)
 
 ## Features
+- Follow Japanese Code
 - Calculate deflection and stress of the two way RC slab
-- Solve plate eq. directly by the method of Dr.Higashi
+- Solve plate eq. directly by Fourier Method.
+- Import/Export by csv format.
+- Export pdf file report.
 
-![Image](./images/twoWaySlab.png)
-
-## Souce
-### rcSlab.py
- Main Program
-### aijRc.py
- Propeties of the reinforcement in japanese code.
-### makereport.py
- Making pdf report by repotlab module
-### Higashi.py
- Calculation of the two way plate
+![Image](./images/pdf_image.png)
 
 ## Develop Memo
 
@@ -33,7 +29,38 @@
 - この時、級数の打ち切りは5としました。
 - 計算プログラムはクラスとして定義し、クラスの名前はHigashiとなっています。
 
+## Souce
+```
+├── README.md
+├── aijRc.py
+├── report.py
+├── twoWaySlab.py
+├── gui.py
+├── higashi.py
+├── gui.wxg
+├── db
+│   ├── rcslab.txt
+├── fonts
+│   ├── GenShinGothic-Monospace-Medium.ttf
+├── images
+│   ├── 4sideFix.jpg
+│   ├── 4sideFix.png
+│   ├── m2.jpg
+│   ├── m2_2pin.jpg
+│   ├── m2_2pin2.jpg
+│   ├── m2_2pin3.jpg
+│   ├── m3-1pin.jpg
+│   ├── m3-1pin2.jpg
+│   ├── m3_1.jpg
+│   ├── m3_1pin.jpg
+│   ├── m3_2.jpg
+│   ├── m4pin.jpg
+```
+## twoWaySlab.py
+ Main Program
+
 ## Higashi.py
+ Calculation of the two way plate
 
 ### how to
 ``` python
@@ -56,7 +83,6 @@ obj.solve(Id_bound,lx,ly,t,w,creep,ec,nu,nmax,mmax)
 - My1: Negative Momend at Ext. End for the longer span
 - My2: Positive Moment at Cent. for the longer span
 
-
 ## aijRc.py
 ### how to
 ``` python
@@ -80,3 +106,21 @@ obj.Ec(fc,gamma)
 - sympy
 - pandas
 - reportlab
+
+## report.py
+use "./fonts/GenshinGothic-Monospace-Medium.ttf" for japanese
+https://gammasoft.jp/blog/pdf-japanese-font-by-python/
+``` python
+self.FONT_NAME = "GenShinGothic"
+GEN_SHIN_GOTHIC_MEDIUM_TTF = "./fonts/GenShinGothic-Monospace-Medium.ttf"
+# フォント登録
+pdfmetrics.registerFont(TTFont('GenShinGothic', GEN_SHIN_GOTHIC_MEDIUM_T
+```
+
+# Log
+## 2020/02/01
+Csv入出力の実装
+- OnImport
+- OnEport
+## 2020/02/03
+pdfレポートの作成実装

db/rcslab.txt

@@ -0,0 +1,6 @@
+No.1, S20, 3.0, 4.0, 200, 40, 10.0, 16, 21, 24, 200, 200, 200, 200, 2, 0, 0, 0, 0, D10, D10, D10, D10, 2.2, 1.4, 3.3, 5.9, 82, 51, 122, 216, -, 1/15, 0.23, 0.14, 0.34, 0.61, 7, 1/438, 195, 
+No.2, S20, 4, 3, 200, 40, 10.0, 16, 21, 24, 200, 200, 200, 200, 3, 0, 0, 0, 0, D10, D10, D10, D10, 3.3, 5.9, 2.2, 1.4, 122, 216, 82, 51, -, 1/20, 0.34, 0.61, 0.23, 0.14, 7, 1/584, 195, 
+No.3, S20, 3, 4, 200, 40, 10.0, 16, 21, 24, 200, 200, 200, 200, 6, 0, 0, 0, 0, D10, D10, D10, D10, 7.5, 3.2, 7.8, 1.9, 274, 117, 285, 69, -, 1/15, 0.77, 0.33, 0.80, 0.19, 3, 1/1168, 195, 
+No.4, S20, 4, 3, 200, 40, 10.0, 16, 21, 24, 200, 200, 200, 200, 7, 0, 0, 0, 0, D10, D10, D10, D10, 7.8, 1.9, 7.5, 3.2, 285, 69, 274, 117, -, 1/20, 0.80, 0.19, 0.77, 0.33, 3, 1/1557, 195, 
+No.5, S20, 3, 4, 200, 40, 10.0, 16, 21, 24, 200, 200, 200, 200, 9, 0, 0, 0, 0, D10, D10, D10, D10, 7.2, 3.3, 0.0, 1.2, 264, 121, 0, 44, -, 1/15, 0.74, 0.34, 0.00, 0.12, 2, 1/1396, 195, 
+No.6, S20, 4, 3, 200, 40, 10.0, 16, 21, 24, 200, 200, 200, 200, 10, 0, 0, 0, 0, D10, D10, D10, D10, 0.0, 1.9, 4.9, 1.6, 0, 69, 178, 60, -, 1/20, 0.00, 0.20, 0.50, 0.17, 1, 1/3188, 195,