dda-cvs Mailing List for Discontinuous Deformation Analysis (Page 2)
Status: Beta
Brought to you by:
doolin
Menu
▾
▴
dda-cvs — cvs mailing list for dda project
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
(6) |
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(10) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2006 |
Jan
|
Feb
|
Mar
(88) |
Apr
(32) |
May
(9) |
Jun
(63) |
Jul
(55) |
Aug
(7) |
Sep
(1) |
Oct
(3) |
Nov
(10) |
Dec
(3) |
| 2007 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(8) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Roozbeh <rgr...@us...> - 2007-01-16 15:00:35
|
Update of /cvsroot/dda/pub/mohrcoloumb/figs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24316 Modified Files: abs_error.eps displacement.eps plastic_zone_tunnel.eps Log Message: Some eps files such as abs_error, displacement and plastic_.. have been changed Index: displacement.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/displacement.eps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** displacement.eps 23 Mar 2006 16:27:39 -0000 1.2 --- displacement.eps 16 Jan 2007 15:00:15 -0000 1.3 *************** *** 1,3701 **** ! %!PS-Adobe-3.0 EPSF-3.0 ! %%Creator: jpeg2ps V1.8 by Thomas Merz ! %%Title: displacement.jpg ! %%CreationDate: Sun Mar 19 12:31:31 2006 ! %%BoundingBox: 20 20 575 440 ! %%DocumentData: Clean7Bit ! %%LanguageLevel: 2 ! %%EndComments ! %%BeginProlog ! %%EndProlog [...13718 lines suppressed...] ! 543.975037 397.525024 l ! 565.575012 414.800018 m ! 543.975037 414.800018 l ! 565.575012 432.075012 m ! 543.975037 432.075012 l ! 565.575012 449.375031 m ! 543.975037 449.375031 l ! 565.575012 466.649994 m ! 543.975037 466.649994 l ! 565.575012 250.649994 m ! 543.975037 250.649994 21.599976 224.625031 re ! 565.575012 250.649994 m ! 0.0 0.0 0.0 setrgbcolor ! S ! n ! [/EMC PDFMark5 ! PDFVars/TermAll get exec end end ! %%PageTrailer ! %%Trailer ! %%EOF Index: plastic_zone_tunnel.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/plastic_zone_tunnel.eps,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** plastic_zone_tunnel.eps 13 May 2006 00:19:03 -0000 1.8 --- plastic_zone_tunnel.eps 16 Jan 2007 15:00:18 -0000 1.9 *************** *** 36,44 **** /bbox_max { % This is a kludged value ! 10.5 } def /val { ! 10 } def --- 36,44 ---- [...3459 lines suppressed...] stroke + black 230.500000 50.000000 moveto + 31.500000 0.000000 rlineto -16.499992 8.333325 rlineto closepath + stroke + black 149.500000 50.000000 moveto + 9.000000 0.000000 rlineto -8.500005 7.499992 rlineto closepath + stroke + black 131.500000 50.000000 moveto + -0.699997 4.450005 rlineto -4.250003 -1.750005 rlineto closepath + stroke + black 140.500000 50.000000 moveto + 9.000000 0.000000 rlineto -8.250007 5.249992 rlineto closepath + stroke + black 131.500000 50.000000 moveto + 9.000000 0.000000 rlineto -5.249992 5.249992 rlineto closepath + stroke + black 122.500000 50.000000 moveto + 9.000000 0.000000 rlineto -4.950000 2.700000 rlineto closepath + stroke + Index: abs_error.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/abs_error.eps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** abs_error.eps 23 Mar 2006 16:27:39 -0000 1.2 --- abs_error.eps 16 Jan 2007 15:00:12 -0000 1.3 *************** *** 1,5776 **** ! %!PS-Adobe-3.0 EPSF-3.0 ! %%Creator: jpeg2ps V1.8 by Thomas Merz ! %%Title: abs_error.jpg ! %%CreationDate: Sun Mar 19 12:31:32 2006 ! %%BoundingBox: 20 20 575 445 ! %%DocumentData: Clean7Bit ! %%LanguageLevel: 2 ! %%EndComments ! %%BeginProlog ! %%EndProlog [...15914 lines suppressed...] ! 542.975037 398.575012 l ! 564.575012 415.849976 m ! 542.975037 415.849976 l ! 564.575012 433.125031 m ! 542.975037 433.125031 l ! 564.575012 450.425018 m ! 542.975037 450.425018 l ! 564.575012 467.700012 m ! 542.975037 467.700012 l ! 564.575012 303.525024 m ! 542.975037 303.525024 21.599976 172.799988 re ! 564.575012 303.525024 m ! 0.0 0.0 0.0 setrgbcolor ! S ! n ! [/EMC PDFMark5 ! PDFVars/TermAll get exec end end ! %%PageTrailer ! %%Trailer ! %%EOF |
|
From: Roozbeh <rgr...@us...> - 2006-12-10 16:32:38
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24396 Modified Files: Dda.rc drawdialog.h Log Message: ARC, Block, Joint and Tunnel callbacks are added Index: drawdialog.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/drawdialog.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** drawdialog.h 25 Nov 2006 17:11:27 -0000 1.4 --- drawdialog.h 10 Dec 2006 16:32:34 -0000 1.5 *************** *** 36,39 **** BOOL CALLBACK JointDlgProc (HWND , UINT , WPARAM , LPARAM); ! --- 36,41 ---- BOOL CALLBACK JointDlgProc (HWND , UINT , WPARAM , LPARAM); ! BOOL CALLBACK TunnelDlgProc (HWND , UINT , WPARAM , LPARAM); ! BOOL CALLBACK ArcDlgProc (HWND , UINT , WPARAM , LPARAM); ! BOOL CALLBACK BlockDlgProc (HWND , UINT , WPARAM , LPARAM); Index: Dda.rc =================================================================== RCS file: /cvsroot/dda/ntdda/include/Dda.rc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Dda.rc 1 Aug 2006 05:26:10 -0000 1.9 --- Dda.rc 10 Dec 2006 16:32:34 -0000 1.10 *************** *** 1,1086 **** ! //Microsoft Developer Studio generated resource script. ! // ! #include "resource.h" ! ! #define APSTUDIO_READONLY_SYMBOLS ! ///////////////////////////////////////////////////////////////////////////// ! // ! // Generated from the TEXTINCLUDE 2 resource. ! // ! #define APSTUDIO_HIDDEN_SYMBOLS [...2143 lines suppressed...] ! BOTTOMMARGIN, 204 ! END ! END ! #endif // APSTUDIO_INVOKED ! ! #endif // English (U.K.) resources ! ///////////////////////////////////////////////////////////////////////////// ! ! ! ! #ifndef APSTUDIO_INVOKED ! ///////////////////////////////////////////////////////////////////////////// ! // ! // Generated from the TEXTINCLUDE 3 resource. ! // ! ! ! ///////////////////////////////////////////////////////////////////////////// ! #endif // not APSTUDIO_INVOKED ! |
|
From: Roozbeh <rgr...@us...> - 2006-12-10 16:29:57
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23216 Modified Files: arcdialog.c drawdialog.c jointdialog.c tunneldialog.c Added Files: blockdialog.c Log Message: Arc subroutine is added into separated file Index: jointdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/jointdialog.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jointdialog.c 25 Nov 2006 17:11:28 -0000 1.2 --- jointdialog.c 10 Dec 2006 16:29:50 -0000 1.3 *************** *** 1,10 **** #define STRICT #include<windows.h> #include"resource.h" #include "drawdialog.h" - //#include "joint.h" #include"math.h" - //#include "winmain.h" #ifdef __cplusplus --- 1,9 ---- + // Added by Roozbeh #define STRICT #include<windows.h> #include"resource.h" #include "drawdialog.h" #include"math.h" #ifdef __cplusplus *************** *** 18,22 **** extern addJoint (hDlg); - // Added by Roozbeh to Draw a Joint using dialog box BOOL CALLBACK JointDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) --- 17,20 ---- Index: tunneldialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/tunneldialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tunneldialog.c 1 Aug 2006 06:16:28 -0000 1.1 --- tunneldialog.c 10 Dec 2006 16:29:50 -0000 1.2 *************** *** 1,5 **** ! /** ! * Refactor tunnel dialog code here. ! */ \ No newline at end of file --- 1,91 ---- + // Added by Roozbeh + #define STRICT + #include<windows.h> + #include"resource.h" + #include "drawdialog.h" + #include"math.h" ! #ifdef __cplusplus ! extern "C" { ! #endif ! #if 0 ! } ! #endif ! ! extern addJoint (hDlg); ! ! BOOL CALLBACK ! TunnelDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) ! { ! double r0, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg; ! double xc, yc, rad; ! int i, se = 20; ! ! extern POINT ptBegin, ptNew, ptOld; ! extern int type; ! extern double ScaleX, ScaleY; ! extern int maxSize; ! extern JOINTLIST *jointlist; ! ! switch (message) { ! case WM_INITDIALOG: ! ! SetDlgItemInt (hDlg, IDC_XC, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_YC, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_SEG, 20, FALSE); ! SetDlgItemInt (hDlg, IDC_RAD, 10, FALSE); ! SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); ! ! return TRUE; ! ! case WM_COMMAND: ! switch (LOWORD (wParam)) { ! case IDOK: ! ! deg = 360; ! r0 = ((3.1415926535) * deg) / (se * 180); ! xc = GetDlgItemInt (hDlg, IDC_XC, NULL, TRUE); ! yc = GetDlgItemInt (hDlg, IDC_YC, NULL, TRUE); ! se = GetDlgItemInt (hDlg, IDC_SEG, NULL, TRUE); ! rad = GetDlgItemInt (hDlg, IDC_RAD, NULL, TRUE); ! type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); ! x1 = xc + rad; ! y1 = yc; ! x2 = xc; ! y2 = yc; ! x0 = x2; ! y0 = y2; ! x3 = x1; ! y3 = y1; ! for (i = 1; i < se; i++) { ! u = ((x1 - x0) * (cos (r0) - 1)) - ((y1 - y0) * sin (r0)); ! v = ((x1 - x0) * sin (r0)) + ((y1 - y0) * (cos (r0) - 1)); ! ! x2 = x1 + u; ! y2 = y1 + v; ! ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); ! ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); ! ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); ! ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); ! addJoint (hDlg); ! x1 = x2; ! y1 = y2; ! } ! x2 = x3; ! y2 = y3; ! ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); ! ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); ! ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); ! ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); ! addJoint (hDlg); ! ! return FALSE; ! case IDCANCEL: ! EndDialog (hDlg, 0); ! return TRUE; ! } ! break; ! } ! return FALSE; ! } \ No newline at end of file Index: arcdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/arcdialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** arcdialog.c 1 Aug 2006 06:16:28 -0000 1.1 --- arcdialog.c 10 Dec 2006 16:29:50 -0000 1.2 *************** *** 1,5 **** ! /** ! * ! * Add arc dialog code, like message handling, here. ! */ \ No newline at end of file --- 1,104 ---- + // Added by Roozbeh + #define STRICT + #include<windows.h> + #include"resource.h" + #include "drawdialog.h" + #include"math.h" ! ! #ifdef __cplusplus ! extern "C" { ! #endif ! #if 0 ! } ! #endif ! ! ! extern addJoint (hDlg); ! ! // Added by Roozbeh to Draw a Arc using dialog box ! ! // Refactor all these messages to call functions. ! // Feel free to put them into new files. It will ! // make it easier to maintain in the future. ! BOOL CALLBACK ! ArcDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) ! { ! double r0, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg; ! double xc, yc, xs, ys, xe, ye; ! int i, se = 20; ! ! extern POINT ptBegin, ptNew, ptOld; ! extern int type; ! extern double ScaleX, ScaleY; ! extern int maxSize; ! extern JOINTLIST *jointlist; ! ! switch (message) { ! case WM_INITDIALOG: ! ! SetDlgItemInt (hDlg, IDC_XC, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_YC, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_XS, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_YS, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_XE, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_YE, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_SEG, 20, FALSE); ! SetDlgItemInt (hDlg, IDC_DEG, 180, FALSE); ! SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); ! ! return TRUE; ! ! case WM_COMMAND: ! switch (LOWORD (wParam)) { ! case IDOK: ! ! xc = GetDlgItemInt (hDlg, IDC_XC, NULL, TRUE); ! yc = GetDlgItemInt (hDlg, IDC_YC, NULL, TRUE); ! xs = GetDlgItemInt (hDlg, IDC_XS, NULL, TRUE); ! ys = GetDlgItemInt (hDlg, IDC_YS, NULL, TRUE); ! xe = GetDlgItemInt (hDlg, IDC_XE, NULL, TRUE); ! ye = GetDlgItemInt (hDlg, IDC_YE, NULL, TRUE); ! se = GetDlgItemInt (hDlg, IDC_SEG, NULL, TRUE); ! deg = GetDlgItemInt (hDlg, IDC_DEG, NULL, TRUE); ! type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); ! r0 = ((3.1415926535) * deg) / (se * 180); ! x1 = xs; ! y1 = ys; ! x2 = xc; ! y2 = yc; ! x0 = x2; ! y0 = y2; ! x3 = xe; ! y3 = ye; ! for (i = 1; i < se; i++) { ! u = ((x1 - x0) * (cos (r0) - 1)) - ((y1 - y0) * sin (r0)); ! v = ((x1 - x0) * sin (r0)) + ((y1 - y0) * (cos (r0) - 1)); ! ! x2 = x1 + u; ! y2 = y1 + v; ! ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); ! ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); ! ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); ! ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); ! addJoint (hDlg); ! x1 = x2; ! y1 = y2; ! } ! x2 = x3; ! y2 = y3; ! ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); ! ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); ! ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); ! ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); ! addJoint (hDlg); ! ! return FALSE; ! case IDCANCEL: ! EndDialog (hDlg, 0); ! return TRUE; ! } ! break; ! } ! return FALSE; ! } \ No newline at end of file Index: drawdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** drawdialog.c 25 Nov 2006 17:11:28 -0000 1.10 --- drawdialog.c 10 Dec 2006 16:29:50 -0000 1.11 *************** *** 1479,1696 **** } /* close handleMouseUp() */ - // Added by Roozbeh to Draw a Tuunel using dialog box - BOOL CALLBACK - TunnelDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) - { - double r0, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg; - double xc, yc, rad; - int i, se = 20; - - switch (message) { - case WM_INITDIALOG: - - SetDlgItemInt (hDlg, IDC_XC, 0, FALSE); - SetDlgItemInt (hDlg, IDC_YC, 0, FALSE); - SetDlgItemInt (hDlg, IDC_SEG, 20, FALSE); - SetDlgItemInt (hDlg, IDC_RAD, 10, FALSE); - SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); - - return TRUE; - - case WM_COMMAND: - switch (LOWORD (wParam)) { - case IDOK: - - deg = 360; - r0 = ((3.1415926535) * deg) / (se * 180); - xc = GetDlgItemInt (hDlg, IDC_XC, NULL, TRUE); - yc = GetDlgItemInt (hDlg, IDC_YC, NULL, TRUE); - se = GetDlgItemInt (hDlg, IDC_SEG, NULL, TRUE); - rad = GetDlgItemInt (hDlg, IDC_RAD, NULL, TRUE); - type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); - x1 = xc + rad; - y1 = yc; - x2 = xc; - y2 = yc; - x0 = x2; - y0 = y2; - x3 = x1; - y3 = y1; - for (i = 1; i < se; i++) { - u = ((x1 - x0) * (cos (r0) - 1)) - ((y1 - y0) * sin (r0)); - v = ((x1 - x0) * sin (r0)) + ((y1 - y0) * (cos (r0) - 1)); - - x2 = x1 + u; - y2 = y1 + v; - ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); - ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); - ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); - ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); - addJoint (hDlg); - x1 = x2; - y1 = y2; - } - x2 = x3; - y2 = y3; - ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); - ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); - ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); - ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); - addJoint (hDlg); - - return FALSE; - case IDCANCEL: - EndDialog (hDlg, 0); - return TRUE; - } - break; - } - return FALSE; - } - - - - // Added by Roozbeh to Draw a Arc using dialog box - - // Refactor all these messages to call functions. - // Feel free to put them into new files. It will - // make it easier to maintain in the future. - BOOL CALLBACK - ArcDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) - { - double r0, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg; - double xc, yc, xs, ys, xe, ye; - int i, se = 20; - - switch (message) { - case WM_INITDIALOG: - - SetDlgItemInt (hDlg, IDC_XC, 0, FALSE); - SetDlgItemInt (hDlg, IDC_YC, 0, FALSE); - SetDlgItemInt (hDlg, IDC_XS, 0, FALSE); - SetDlgItemInt (hDlg, IDC_YS, 0, FALSE); - SetDlgItemInt (hDlg, IDC_XE, 0, FALSE); - SetDlgItemInt (hDlg, IDC_YE, 0, FALSE); - SetDlgItemInt (hDlg, IDC_SEG, 20, FALSE); - SetDlgItemInt (hDlg, IDC_DEG, 180, FALSE); - SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); - - return TRUE; - - case WM_COMMAND: - switch (LOWORD (wParam)) { - case IDOK: - - xc = GetDlgItemInt (hDlg, IDC_XC, NULL, TRUE); - yc = GetDlgItemInt (hDlg, IDC_YC, NULL, TRUE); - xs = GetDlgItemInt (hDlg, IDC_XS, NULL, TRUE); - ys = GetDlgItemInt (hDlg, IDC_YS, NULL, TRUE); - xe = GetDlgItemInt (hDlg, IDC_XE, NULL, TRUE); - ye = GetDlgItemInt (hDlg, IDC_YE, NULL, TRUE); - se = GetDlgItemInt (hDlg, IDC_SEG, NULL, TRUE); - deg = GetDlgItemInt (hDlg, IDC_DEG, NULL, TRUE); - type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); - r0 = ((3.1415926535) * deg) / (se * 180); - x1 = xs; - y1 = ys; - x2 = xc; - y2 = yc; - x0 = x2; - y0 = y2; - x3 = xe; - y3 = ye; - for (i = 1; i < se; i++) { - u = ((x1 - x0) * (cos (r0) - 1)) - ((y1 - y0) * sin (r0)); - v = ((x1 - x0) * sin (r0)) + ((y1 - y0) * (cos (r0) - 1)); - - x2 = x1 + u; - y2 = y1 + v; - ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); - ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); - ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); - ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); - addJoint (hDlg); - x1 = x2; - y1 = y2; - } - x2 = x3; - y2 = y3; - ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); - ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); - ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); - ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); - addJoint (hDlg); - - return FALSE; - case IDCANCEL: - EndDialog (hDlg, 0); - return TRUE; - } - break; - } - return FALSE; - } - - // Added by Roozbeh to Draw a Block using dialog box - BOOL CALLBACK - BlockDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) - { - double xl, yl, xu, yu; - - switch (message) { - case WM_INITDIALOG: - - SetDlgItemInt (hDlg, IDC_XL, 0, FALSE); - SetDlgItemInt (hDlg, IDC_YL, 0, FALSE); - SetDlgItemInt (hDlg, IDC_XU, 0, FALSE); - SetDlgItemInt (hDlg, IDC_YU, 0, FALSE); - SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); - - return TRUE; - - case WM_COMMAND: - switch (LOWORD (wParam)) { - case IDOK: - - xl = GetDlgItemInt (hDlg, IDC_XL, NULL, TRUE); - yl = GetDlgItemInt (hDlg, IDC_YL, NULL, TRUE); - xu = GetDlgItemInt (hDlg, IDC_XU, NULL, TRUE); - yu = GetDlgItemInt (hDlg, IDC_YU, NULL, TRUE); - type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); - - ptBegin.x = (long) floor (xl / (ScaleX / maxSize)); - ptBegin.y = (long) floor (yl / (ScaleY / maxSize)); - ptNew.x = (long) floor (xu / (ScaleX / maxSize)); - ptNew.y = (long) floor (yl / (ScaleY / maxSize)); - addJoint (hDlg); - - ptBegin.x = (long) floor (xu / (ScaleX / maxSize)); - ptBegin.y = (long) floor (yl / (ScaleY / maxSize)); - ptNew.x = (long) floor (xu / (ScaleX / maxSize)); - ptNew.y = (long) floor (yu / (ScaleY / maxSize)); - addJoint (hDlg); - - ptBegin.x = (long) floor (xu / (ScaleX / maxSize)); - ptBegin.y = (long) floor (yu / (ScaleY / maxSize)); - ptNew.x = (long) floor (xl / (ScaleX / maxSize)); - ptNew.y = (long) floor (yu / (ScaleY / maxSize)); - addJoint (hDlg); - - ptBegin.x = (long) floor (xl / (ScaleX / maxSize)); - ptBegin.y = (long) floor (yu / (ScaleY / maxSize)); - ptNew.x = (long) floor (xl / (ScaleX / maxSize)); - ptNew.y = (long) floor (yl / (ScaleY / maxSize)); - addJoint (hDlg); - - return FALSE; - case IDCANCEL: - EndDialog (hDlg, 0); - return TRUE; - } - break; - } - return FALSE; - } - static int handleWMCommand (HWND hDlg, UINT iMessage, LPARAM lParam, WPARAM wParam) --- 1479,1482 ---- *************** *** 1761,1777 **** //Added by Roozbeh case IDC_JOINT: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_JOINT), NULL, JointDlgProc); break; case IDC_TUNNEL: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_TUNNEL), NULL, TunnelDlgProc); break; case IDC_ARC: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_ARC), NULL, ArcDlgProc); break; case IDC_BLOCK: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_BLOCK), NULL, BlockDlgProc); break; //Added by Roozbeh --- 1547,1563 ---- //Added by Roozbeh case IDC_JOINT: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_JOINT), hDlg, JointDlgProc); break; case IDC_TUNNEL: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_TUNNEL), hDlg, TunnelDlgProc); break; case IDC_ARC: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_ARC), hDlg, ArcDlgProc); break; case IDC_BLOCK: ! DialogBox (hInstance, MAKEINTRESOURCE (IDD_BLOCK), hDlg, BlockDlgProc); break; //Added by Roozbeh --- NEW FILE: blockdialog.c --- // Added by Roozbeh #define STRICT #include<windows.h> #include"resource.h" #include "drawdialog.h" #include"math.h" #ifdef __cplusplus extern "C" { #endif #if 0 } #endif extern addJoint (hDlg); BOOL CALLBACK BlockDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { double xl, yl, xu, yu; extern POINT ptBegin, ptNew, ptOld; extern int type; extern double ScaleX, ScaleY; extern int maxSize; extern JOINTLIST *jointlist; switch (message) { case WM_INITDIALOG: SetDlgItemInt (hDlg, IDC_XL, 0, FALSE); SetDlgItemInt (hDlg, IDC_YL, 0, FALSE); SetDlgItemInt (hDlg, IDC_XU, 0, FALSE); SetDlgItemInt (hDlg, IDC_YU, 0, FALSE); SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); return TRUE; case WM_COMMAND: switch (LOWORD (wParam)) { case IDOK: xl = GetDlgItemInt (hDlg, IDC_XL, NULL, TRUE); yl = GetDlgItemInt (hDlg, IDC_YL, NULL, TRUE); xu = GetDlgItemInt (hDlg, IDC_XU, NULL, TRUE); yu = GetDlgItemInt (hDlg, IDC_YU, NULL, TRUE); type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); ptBegin.x = (long) floor (xl / (ScaleX / maxSize)); ptBegin.y = (long) floor (yl / (ScaleY / maxSize)); ptNew.x = (long) floor (xu / (ScaleX / maxSize)); ptNew.y = (long) floor (yl / (ScaleY / maxSize)); addJoint (hDlg); ptBegin.x = (long) floor (xu / (ScaleX / maxSize)); ptBegin.y = (long) floor (yl / (ScaleY / maxSize)); ptNew.x = (long) floor (xu / (ScaleX / maxSize)); ptNew.y = (long) floor (yu / (ScaleY / maxSize)); addJoint (hDlg); ptBegin.x = (long) floor (xu / (ScaleX / maxSize)); ptBegin.y = (long) floor (yu / (ScaleY / maxSize)); ptNew.x = (long) floor (xl / (ScaleX / maxSize)); ptNew.y = (long) floor (yu / (ScaleY / maxSize)); addJoint (hDlg); ptBegin.x = (long) floor (xl / (ScaleX / maxSize)); ptBegin.y = (long) floor (yu / (ScaleY / maxSize)); ptNew.x = (long) floor (xl / (ScaleX / maxSize)); ptNew.y = (long) floor (yl / (ScaleY / maxSize)); addJoint (hDlg); return FALSE; case IDCANCEL: EndDialog (hDlg, 0); return TRUE; } break; } return FALSE; } |
|
From: David M. D. <do...@us...> - 2006-12-09 20:13:39
|
Update of /cvsroot/dda/CVSROOT In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26776 Modified Files: avail Log Message: Added rooz to ntdda commits. Index: avail =================================================================== RCS file: /cvsroot/dda/CVSROOT/avail,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** avail 25 Nov 2006 17:13:39 -0000 1.11 --- avail 9 Dec 2006 20:13:35 -0000 1.12 *************** *** 8,11 **** avail|rgrayeli|htdocs avail|rgrayeli|ddadb ! avail|ntdda avail|doolin --- 8,11 ---- avail|rgrayeli|htdocs avail|rgrayeli|ddadb ! avail|rgrayeli|ntdda avail|doolin |
|
From: David M. D. <do...@us...> - 2006-11-29 15:23:19
|
Update of /cvsroot/dda/pub/mohrcoloumb/figs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv4408 Added Files: abserror.eps disp.eps extensometer.eps relerror.eps tunnel_section.eps Log Message: Added eps figures. --- NEW FILE: tunnel_section.eps --- %!PS-Adobe-2.0 EPSF-2.0 %%Title: tunnel_section.fig %%Creator: fig2dev Version 3.2 Patchlevel 4 %%CreationDate: Wed Nov 15 23:56:19 2006 %%For: doolin@SENSORNET1 (U-SENSORNET1\doolin,S-1-5-21-3636447637-3481046215-610954586-1006) %%BoundingBox: 0 0 339 474 %%Magnification: 1.0000 %%EndComments /$F2psDict 200 dict def $F2psDict begin $F2psDict /mtrx matrix put /col-1 {0 setgray} bind def /col0 {0.000 0.000 0.000 srgb} bind def /col1 {0.000 0.000 1.000 srgb} bind def /col2 {0.000 1.000 0.000 srgb} bind def /col3 {0.000 1.000 1.000 srgb} bind def /col4 {1.000 0.000 0.000 srgb} bind def /col5 {1.000 0.000 1.000 srgb} bind def /col6 {1.000 1.000 0.000 srgb} bind def /col7 {1.000 1.000 1.000 srgb} bind def /col8 {0.000 0.000 0.560 srgb} bind def /col9 {0.000 0.000 0.690 srgb} bind def /col10 {0.000 0.000 0.820 srgb} bind def /col11 {0.530 0.810 1.000 srgb} bind def /col12 {0.000 0.560 0.000 srgb} bind def /col13 {0.000 0.690 0.000 srgb} bind def /col14 {0.000 0.820 0.000 srgb} bind def /col15 {0.000 0.560 0.560 srgb} bind def /col16 {0.000 0.690 0.690 srgb} bind def /col17 {0.000 0.820 0.820 srgb} bind def /col18 {0.560 0.000 0.000 srgb} bind def /col19 {0.690 0.000 0.000 srgb} bind def /col20 {0.820 0.000 0.000 srgb} bind def /col21 {0.560 0.000 0.560 srgb} bind def /col22 {0.690 0.000 0.690 srgb} bind def /col23 {0.820 0.000 0.820 srgb} bind def /col24 {0.500 0.190 0.000 srgb} bind def /col25 {0.630 0.250 0.000 srgb} bind def /col26 {0.750 0.380 0.000 srgb} bind def /col27 {1.000 0.500 0.500 srgb} bind def /col28 {1.000 0.630 0.630 srgb} bind def /col29 {1.000 0.750 0.750 srgb} bind def /col30 {1.000 0.880 0.880 srgb} bind def /col31 {1.000 0.840 0.000 srgb} bind def end save newpath 0 474 moveto 0 0 lineto 339 0 lineto 339 474 lineto closepath clip newpath -300.8 590.2 translate 1 -1 scale /cp {closepath} bind def /ef {eofill} bind def /gr {grestore} bind def /gs {gsave} bind def /sa {save} bind def /rs {restore} bind def /l {lineto} bind def /m {moveto} bind def /rm {rmoveto} bind def /n {newpath} bind def /s {stroke} bind def /sh {show} bind def /slc {setlinecap} bind def /slj {setlinejoin} bind def /slw {setlinewidth} bind def /srgb {setrgbcolor} bind def /rot {rotate} bind def /sc {scale} bind def /sd {setdash} bind def /ff {findfont} bind def /sf {setfont} bind def /scf {scalefont} bind def /sw {stringwidth} bind def /tr {translate} bind def /tnt {dup dup currentrgbcolor 4 -2 roll dup 1 exch sub 3 -1 roll mul add 4 -2 roll dup 1 exch sub 3 -1 roll mul add 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb} bind def /shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul 4 -2 roll mul srgb} bind def /$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def /$F2psEnd {$F2psEnteredState restore end} def $F2psBegin 10 setmiterlimit 0 slj 0 slc 0.06000 0.06000 sc % % Fig objects follow % % % here starts figure with depth 50 /Times-Roman ff 360.00 scf sf 6900 2850 m gs 1 -1 sc (Ground surface) col-1 sh gr % Polyline 7.500 slw n 9939 8215 m 5089 8215 l gs col-1 s gr % Polyline gs clippath 5730 2460 m 5670 2460 l 5670 2577 l 5700 2487 l 5730 2577 l cp 5670 8115 m 5730 8115 l 5730 7998 l 5700 8088 l 5670 7998 l cp eoclip n 5700 8100 m 5700 2475 l gs col-1 s gr gr % arrowhead n 5670 7998 m 5700 8088 l 5730 7998 l 5700 7968 l 5670 7998 l cp gs 0.00 setgray ef gr col-1 s % arrowhead n 5730 2577 m 5700 2487 l 5670 2577 l 5700 2607 l 5730 2577 l cp gs 0.00 setgray ef gr col-1 s % Polyline n 10425 6675 m 6075 6675 l gs col-1 s gr % Polyline n 7725 9825 m 5100 9825 l gs col-1 s gr % Polyline n 8475 7800 m 10425 7800 l gs col-1 s gr % Polyline gs clippath 6270 9615 m 6330 9615 l 6330 9498 l 6300 9588 l 6270 9498 l cp 6330 6885 m 6270 6885 l 6270 7002 l 6300 6912 l 6330 7002 l cp eoclip n 6300 6900 m 6300 9600 l gs col-1 s gr gr % arrowhead n 6330 7002 m 6300 6912 l 6270 7002 l 6300 7032 l 6330 7002 l cp gs 0.00 setgray ef gr col-1 s % arrowhead n 6270 9498 m 6300 9588 l 6330 9498 l 6300 9468 l 6270 9498 l cp gs 0.00 setgray ef gr col-1 s % Polyline n 8100 2400 m 7800 1950 l 8400 1950 l cp gs col-1 s gr % Polyline 2 slj n 8592 7665 m 8581 7668 l 8570 7672 l 8558 7675 l 8546 7679 l 8533 7682 l 8520 7686 l 8508 7690 l 8497 7693 l 8488 7696 l 8478 7699 l 8468 7702 l 8457 7705 l 8446 7708 l 8434 7711 l 8423 7714 l 8413 7716 l 8403 7719 l 8393 7721 l 8383 7722 l 8373 7724 l 8362 7725 l 8351 7727 l 8339 7728 l 8327 7729 l 8316 7729 l 8304 7730 l 8293 7730 l 8283 7731 l 8272 7731 l 8260 7731 l 8248 7731 l 8235 7731 l 8222 7731 l 8209 7731 l 8196 7731 l 8183 7730 l 8172 7730 l 8160 7729 l 8149 7728 l 8137 7726 l 8125 7725 l 8112 7723 l 8099 7721 l 8087 7719 l 8074 7717 l 8063 7715 l 8052 7713 l 8041 7711 l 8031 7709 l 8020 7706 l 8009 7704 l 7998 7701 l 7986 7698 l 7974 7695 l 7963 7692 l 7952 7688 l 7941 7685 l 7931 7682 l 7920 7678 l 7909 7675 l 7896 7670 l 7882 7665 l 7865 7659 l 7847 7652 l 7831 7646 l 7819 7641 l 7814 7639 l 7813 7639 l 7812 7638 l 7807 7635 l 7798 7630 l 7793 7627 l 7792 7626 l 7792 7625 l 7791 7621 l 7788 7610 l 7783 7594 l 7778 7574 l 7772 7554 l 7767 7534 l 7762 7516 l 7758 7500 l 7755 7486 l 7751 7474 l 7748 7461 l 7745 7449 l 7742 7436 l 7739 7423 l 7736 7410 l 7733 7396 l 7730 7382 l 7728 7369 l 7725 7355 l 7723 7342 l 7721 7330 l 7719 7318 l 7717 7306 l 7716 7295 l 7715 7283 l 7713 7271 l 7713 7258 l 7712 7245 l 7712 7232 l 7712 7219 l 7712 7205 l 7713 7193 l 7714 7180 l 7715 7168 l 7717 7157 l 7719 7145 l 7722 7133 l 7725 7120 l 7729 7107 l 7734 7093 l 7738 7079 l 7743 7065 l 7749 7051 l 7754 7038 l 7760 7025 l 7766 7013 l 7772 7001 l 7777 6989 l 7784 6977 l 7791 6965 l 7798 6953 l 7806 6940 l 7814 6927 l 7822 6915 l 7831 6902 l 7839 6891 l 7847 6880 l 7855 6870 l 7864 6861 l 7873 6850 l 7884 6839 l 7895 6829 l 7907 6818 l 7919 6808 l 7930 6799 l 7942 6790 l 7952 6783 l 7962 6776 l 7971 6770 l 7982 6764 l 7993 6758 l 8005 6752 l 8016 6747 l 8028 6743 l 8040 6740 l 8051 6737 l 8063 6734 l 8073 6733 l 8083 6731 l 8095 6729 l 8108 6728 l 8121 6726 l 8136 6725 l 8150 6724 l 8164 6723 l 8177 6722 l 8191 6721 l 8202 6721 l 8214 6720 l 8226 6720 l 8239 6720 l 8253 6720 l 8266 6720 l 8280 6721 l 8294 6721 l 8308 6722 l 8320 6723 l 8333 6724 l 8345 6726 l 8357 6727 l 8369 6729 l 8382 6732 l 8395 6734 l 8408 6737 l 8421 6741 l 8434 6744 l 8447 6748 l 8459 6752 l 8471 6756 l 8481 6760 l 8491 6765 l 8503 6770 l 8515 6776 l 8527 6782 l 8539 6790 l 8551 6797 l 8563 6806 l 8574 6814 l 8585 6823 l 8594 6831 l 8604 6840 l 8611 6847 l 8619 6855 l 8627 6864 l 8635 6874 l 8643 6884 l 8651 6894 l 8659 6905 l 8667 6916 l 8674 6927 l 8681 6937 l 8688 6948 l 8694 6959 l 8699 6970 l 8705 6981 l 8711 6993 l 8716 7006 l 8722 7019 l 8727 7033 l 8732 7047 l 8737 7061 l 8741 7075 l 8744 7088 l 8747 7101 l 8750 7113 l 8753 7126 l 8755 7139 l 8757 7152 l 8758 7166 l 8759 7180 l 8760 7194 l 8761 7208 l 8762 7222 l 8762 7235 l 8761 7247 l 8761 7258 l 8760 7269 l 8759 7281 l 8758 7293 l 8756 7306 l 8754 7318 l 8752 7331 l 8750 7343 l 8748 7355 l 8746 7366 l 8744 7376 l 8743 7386 l 8741 7397 l 8740 7407 l 8738 7418 l 8737 7430 l 8736 7442 l 8734 7455 l 8733 7467 l 8731 7478 l 8729 7489 l 8727 7500 l 8725 7511 l 8722 7522 l 8719 7533 l 8716 7545 l 8713 7557 l 8709 7568 l 8706 7578 l 8703 7587 l 8700 7595 l 8697 7602 l 8694 7610 l 8691 7616 l 8688 7622 l 8685 7627 l 8681 7631 l 8677 7634 l 8672 7637 l 8667 7640 l 8661 7643 l 8653 7646 l 8644 7649 l 8634 7652 l 8623 7656 l 8613 7659 l 8602 7662 l cp gs col-1 s gr % Polyline n 9591 9371 m 9594 9361 l 9598 9350 l 9602 9338 l 9606 9326 l 9610 9312 l 9614 9298 l 9619 9282 l 9624 9265 l 9629 9248 l 9634 9229 l 9640 9210 l 9645 9191 l 9650 9171 l 9656 9151 l 9661 9130 l 9666 9109 l 9671 9091 l 9675 9072 l 9680 9052 l 9685 9032 l 9689 9010 l 9695 8987 l 9700 8964 l 9705 8940 l 9710 8915 l 9715 8890 l 9721 8865 l 9726 8840 l 9730 8815 l 9735 8791 l 9739 8767 l 9743 8744 l 9747 8722 l 9751 8701 l 9754 8681 l 9757 8661 l 9760 8639 l 9762 8618 l 9765 8597 l 9767 8576 l 9769 8554 l 9771 8533 l 9772 8511 l 9773 8489 l 9774 8467 l 9775 8446 l 9776 8425 l 9776 8404 l 9776 8383 l 9776 8363 l 9775 8344 l 9775 8325 l 9774 8306 l 9774 8287 l 9773 8269 l 9772 8252 l 9771 8233 l 9769 8214 l 9768 8195 l 9766 8174 l 9764 8153 l 9762 8132 l 9760 8110 l 9757 8088 l 9754 8066 l 9751 8044 l 9748 8022 l 9744 8000 l 9740 7979 l 9736 7958 l 9732 7938 l 9728 7918 l 9723 7899 l 9718 7880 l 9712 7859 l 9706 7838 l 9699 7816 l 9692 7794 l 9684 7772 l 9676 7749 l 9667 7726 l 9658 7703 l 9649 7680 l 9639 7658 l 9630 7636 l 9621 7615 l 9611 7595 l 9603 7576 l 9594 7558 l 9586 7541 l 9578 7524 l 9570 7509 l 9561 7492 l 9553 7476 l 9544 7460 l 9536 7443 l 9527 7428 l 9518 7412 l 9509 7396 l 9500 7381 l 9492 7366 l 9483 7352 l 9474 7338 l 9466 7325 l 9457 7312 l 9449 7300 l 9441 7288 l 9433 7277 l 9424 7264 l 9414 7250 l 9403 7237 l 9392 7222 l 9381 7208 l 9368 7193 l 9356 7178 l 9343 7163 l 9330 7149 l 9317 7135 l 9304 7122 l 9292 7110 l 9279 7098 l 9267 7087 l 9254 7076 l 9241 7066 l 9228 7055 l 9213 7044 l 9198 7033 l 9183 7023 l 9167 7012 l 9150 7001 l 9134 6991 l 9119 6982 l 9103 6972 l 9088 6963 l 9073 6955 l 9059 6947 l 9046 6940 l 9033 6932 l 9020 6925 l 9006 6917 l 8992 6910 l 8977 6902 l 8962 6894 l 8947 6886 l 8931 6878 l 8916 6871 l 8900 6863 l 8885 6856 l 8870 6850 l 8856 6843 l 8842 6837 l 8827 6831 l 8813 6825 l 8798 6820 l 8783 6814 l 8767 6808 l 8750 6802 l 8733 6797 l 8715 6791 l 8697 6785 l 8678 6780 l 8660 6774 l 8642 6769 l 8624 6765 l 8606 6760 l 8589 6756 l 8572 6752 l 8555 6748 l 8538 6745 l 8521 6741 l 8503 6737 l 8484 6734 l 8465 6731 l 8445 6728 l 8424 6724 l 8404 6722 l 8383 6719 l 8363 6717 l 8344 6714 l 8324 6713 l 8306 6711 l 8288 6710 l 8271 6709 l 8255 6709 l 8238 6708 l 8222 6708 l 8205 6708 l 8188 6709 l 8171 6709 l 8153 6710 l 8135 6712 l 8117 6713 l 8099 6715 l 8082 6717 l 8065 6720 l 8048 6722 l 8032 6725 l 8016 6728 l 8001 6731 l 7986 6734 l 7970 6737 l 7955 6741 l 7939 6744 l 7923 6749 l 7906 6753 l 7888 6758 l 7870 6762 l 7853 6768 l 7835 6773 l 7817 6778 l 7799 6784 l 7782 6789 l 7766 6794 l 7750 6799 l 7735 6805 l 7720 6810 l 7704 6815 l 7689 6820 l 7673 6826 l 7657 6832 l 7641 6838 l 7624 6844 l 7607 6851 l 7590 6858 l 7573 6865 l 7556 6872 l 7540 6880 l 7524 6887 l 7509 6894 l 7494 6902 l 7480 6909 l 7466 6917 l 7452 6924 l 7438 6932 l 7424 6941 l 7410 6950 l 7395 6960 l 7380 6970 l 7364 6980 l 7349 6991 l 7334 7002 l 7319 7014 l 7304 7025 l 7290 7036 l 7277 7047 l 7263 7058 l 7251 7069 l 7238 7080 l 7226 7091 l 7213 7102 l 7200 7114 l 7187 7126 l 7174 7139 l 7161 7153 l 7147 7167 l 7133 7181 l 7120 7195 l 7107 7210 l 7094 7225 l 7082 7239 l 7070 7253 l 7059 7267 l 7048 7281 l 7038 7295 l 7028 7309 l 7018 7324 l 7008 7339 l 6998 7355 l 6987 7371 l 6977 7388 l 6967 7406 l 6956 7424 l 6946 7443 l 6936 7461 l 6926 7480 l 6917 7498 l 6908 7516 l 6900 7533 l 6891 7551 l 6883 7568 l 6876 7584 l 6869 7600 l 6862 7616 l 6854 7633 l 6847 7651 l 6839 7670 l 6832 7689 l 6824 7708 l 6817 7728 l 6810 7748 l 6802 7769 l 6796 7789 l 6789 7809 l 6783 7829 l 6777 7848 l 6772 7867 l 6767 7886 l 6762 7905 l 6758 7922 l 6754 7940 l 6751 7958 l 6747 7977 l 6744 7996 l 6740 8016 l 6737 8037 l 6734 8058 l 6731 8079 l 6728 8101 l 6726 8123 l 6724 8145 l 6722 8167 l 6720 8188 l 6719 8209 l 6717 8230 l 6716 8250 l 6715 8270 l 6715 8290 l 6715 8310 l 6714 8329 l 6714 8349 l 6714 8369 l 6715 8390 l 6715 8411 l 6716 8433 l 6717 8455 l 6718 8478 l 6720 8501 l 6721 8524 l 6723 8547 l 6725 8570 l 6727 8592 l 6729 8614 l 6731 8635 l 6733 8656 l 6736 8676 l 6738 8695 l 6741 8714 l 6744 8733 l 6747 8753 l 6750 8774 l 6754 8795 l 6757 8816 l 6762 8838 l 6766 8860 l 6771 8882 l 6775 8905 l 6780 8928 l 6786 8951 l 6791 8973 l 6797 8996 l 6802 9017 l 6808 9039 l 6813 9059 l 6819 9080 l 6825 9100 l 6830 9120 l 6836 9137 l 6841 9156 l 6847 9175 l 6853 9194 l 6860 9215 l 6867 9238 l 6875 9262 l 6884 9288 l 6893 9316 l 6903 9346 l 6913 9376 l 6923 9407 l 6933 9436 l 6942 9463 l 6950 9485 l 6956 9502 l 6960 9514 l 6962 9521 l 6963 9524 l 6964 9525 l 6970 9528 l 6984 9535 l 7003 9544 l 7022 9553 l 7036 9560 l 7042 9563 l 7043 9564 l 7044 9564 l 7047 9565 l 7056 9568 l 7070 9573 l 7090 9580 l 7114 9589 l 7140 9598 l 7166 9607 l 7192 9616 l 7215 9624 l 7237 9632 l 7257 9638 l 7275 9644 l 7291 9650 l 7307 9655 l 7323 9660 l 7338 9665 l 7354 9670 l 7369 9675 l 7386 9680 l 7402 9685 l 7419 9690 l 7436 9695 l 7453 9700 l 7470 9705 l 7487 9710 l 7504 9714 l 7519 9719 l 7535 9723 l 7549 9727 l 7564 9730 l 7578 9734 l 7592 9737 l 7606 9740 l 7620 9744 l 7635 9747 l 7651 9751 l 7667 9754 l 7684 9757 l 7700 9760 l 7718 9764 l 7735 9767 l 7752 9770 l 7769 9772 l 7786 9775 l 7802 9777 l 7819 9780 l 7836 9782 l 7851 9784 l 7867 9785 l 7884 9787 l 7901 9789 l 7919 9791 l 7938 9792 l 7958 9794 l 7978 9795 l 7999 9797 l 8020 9798 l 8041 9800 l 8062 9801 l 8083 9802 l 8103 9802 l 8123 9803 l 8143 9804 l 8162 9804 l 8182 9804 l 8201 9804 l 8221 9804 l 8241 9804 l 8262 9804 l 8284 9803 l 8306 9803 l 8328 9802 l 8351 9801 l 8374 9800 l 8397 9799 l 8419 9798 l 8441 9797 l 8463 9795 l 8483 9794 l 8503 9792 l 8523 9791 l 8541 9789 l 8559 9788 l 8579 9786 l 8600 9783 l 8620 9781 l 8640 9779 l 8661 9776 l 8682 9773 l 8704 9771 l 8725 9768 l 8746 9765 l 8766 9761 l 8786 9758 l 8805 9755 l 8823 9752 l 8840 9749 l 8857 9746 l 8873 9743 l 8890 9740 l 8906 9737 l 8922 9733 l 8939 9730 l 8957 9726 l 8975 9722 l 8993 9718 l 9011 9713 l 9030 9709 l 9048 9704 l 9066 9699 l 9084 9694 l 9101 9689 l 9118 9684 l 9135 9679 l 9152 9674 l 9169 9669 l 9186 9663 l 9204 9657 l 9222 9651 l 9241 9644 l 9261 9637 l 9280 9630 l 9299 9623 l 9318 9615 l 9336 9608 l 9354 9601 l 9370 9595 l 9385 9588 l 9399 9582 l 9412 9577 l 9424 9571 l 9442 9563 l 9457 9555 l 9472 9547 l 9485 9539 l 9497 9531 l 9507 9523 l 9516 9516 l 9524 9508 l 9530 9501 l 9536 9493 l 9541 9485 l 9547 9476 l 9552 9466 l 9558 9455 l 9563 9442 l 9569 9429 l 9575 9415 l 9580 9401 l 9585 9386 l cp gs col-1 s gr /Times-Roman ff 360.00 scf sf 7725 9000 m gs 1 -1 sc (Cavern) col-1 sh gr /Times-Roman ff 360.00 scf sf 7875 7425 m gs 1 -1 sc (Pilot) col-1 sh gr /Times-Roman ff 360.00 scf sf 6000 4875 m gs 1 -1 sc (200 m) col-1 sh gr /Times-Roman ff 360.00 scf sf 9825 7350 m gs 1 -1 sc (5 m) col-1 sh gr /Times-Roman ff 360.00 scf sf 5400 9075 m gs 1 -1 sc (15 m) col-1 sh gr % Polyline 0 slj n 5025 2400 m 10650 2400 l gs col-1 s gr % here ends figure; $F2psEnd rs showpage --- NEW FILE: relerror.eps --- %!PS-Adobe-2.0 EPSF-2.0 %%Title: relerror.eps %%Creator: gnuplot 4.0 patchlevel 0 %%CreationDate: Wed Nov 15 23:56:19 2006 %%DocumentFonts: (atend) %%BoundingBox: 50 50 230 176 %%Orientation: Portrait %%EndComments /gnudict 256 dict def gnudict begin /Color true def /Solid false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /vshift -46 def /dl {10.0 mul} def /hpt_ 31.5 def /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def /Rounded false def /M {moveto} bind def /L {lineto} bind def /R {rmoveto} bind def /V {rlineto} bind def /N {newpath moveto} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def /Lshow { currentpoint stroke M 0 vshift R show } def /Rshow { currentpoint stroke M dup stringwidth pop neg vshift R show } def /Cshow { currentpoint stroke M dup stringwidth pop -2 div vshift R show } def /UP { dup vpt_ mul /vpt exch def hpt_ mul /hpt exch def /hpt2 hpt 2 mul def /vpt2 vpt 2 mul def } def /DL { Color {setrgbcolor Solid {pop []} if 0 setdash } {pop pop pop 0 setgray Solid {pop []} if 0 setdash} ifelse } def /BL { stroke userlinewidth 2 mul setlinewidth Rounded { 1 setlinejoin 1 setlinecap } if } def /AL { stroke userlinewidth 2 div setlinewidth Rounded { 1 setlinejoin 1 setlinecap } if } def /UL { dup gnulinewidth mul /userlinewidth exch def dup 1 lt {pop 1} if 10 mul /udl exch def } def /PL { stroke userlinewidth setlinewidth Rounded { 1 setlinejoin 1 setlinecap } if } def /LTw { PL [] 1 setgray } def /LTb { BL [] 0 0 0 DL } def /LTa { AL [1 udl mul 2 udl mul] 0 setdash 0 0 0 setrgbcolor } def /LT0 { PL [] 1 0 0 DL } def /LT1 { PL [4 dl 2 dl] 0 1 0 DL } def /LT2 { PL [2 dl 3 dl] 0 0 1 DL } def /LT3 { PL [1 dl 1.5 dl] 1 0 1 DL } def /LT4 { PL [5 dl 2 dl 1 dl 2 dl] 0 1 1 DL } def /LT5 { PL [4 dl 3 dl 1 dl 3 dl] 1 1 0 DL } def /LT6 { PL [2 dl 2 dl 2 dl 4 dl] 0 0 0 DL } def /LT7 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 1 0.3 0 DL } def /LT8 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 0.5 0.5 0.5 DL } def /Pnt { stroke [] 0 setdash gsave 1 setlinecap M 0 0 V stroke grestore } def /Dia { stroke [] 0 setdash 2 copy vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V closepath stroke Pnt } def /Pls { stroke [] 0 setdash vpt sub M 0 vpt2 V currentpoint stroke M hpt neg vpt neg R hpt2 0 V stroke } def /Box { stroke [] 0 setdash 2 copy exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V closepath stroke Pnt } def /Crs { stroke [] 0 setdash exch hpt sub exch vpt add M hpt2 vpt2 neg V currentpoint stroke M hpt2 neg 0 R hpt2 vpt2 V stroke } def /TriU { stroke [] 0 setdash 2 copy vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V closepath stroke Pnt } def /Star { 2 copy Pls Crs } def /BoxF { stroke [] 0 setdash exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V closepath fill } def /TriUF { stroke [] 0 setdash vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V closepath fill } def /TriD { stroke [] 0 setdash 2 copy vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V closepath stroke Pnt } def /TriDF { stroke [] 0 setdash vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V closepath fill} def /DiaF { stroke [] 0 setdash vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V closepath fill } def /Pent { stroke [] 0 setdash 2 copy gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat closepath stroke grestore Pnt } def /PentF { stroke [] 0 setdash gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat closepath fill grestore } def /Circle { stroke [] 0 setdash 2 copy hpt 0 360 arc stroke Pnt } def /CircleF { stroke [] 0 setdash hpt 0 360 arc fill } def /C0 { BL [] 0 setdash 2 copy moveto vpt 90 450 arc } bind def /C1 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 90 arc closepath fill vpt 0 360 arc closepath } bind def /C2 { BL [] 0 setdash 2 copy moveto 2 copy vpt 90 180 arc closepath fill vpt 0 360 arc closepath } bind def /C3 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 180 arc closepath fill vpt 0 360 arc closepath } bind def /C4 { BL [] 0 setdash 2 copy moveto 2 copy vpt 180 270 arc closepath fill vpt 0 360 arc closepath } bind def /C5 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 90 arc 2 copy moveto 2 copy vpt 180 270 arc closepath fill vpt 0 360 arc } bind def /C6 { BL [] 0 setdash 2 copy moveto 2 copy vpt 90 270 arc closepath fill vpt 0 360 arc closepath } bind def /C7 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 270 arc closepath fill vpt 0 360 arc closepath } bind def /C8 { BL [] 0 setdash 2 copy moveto 2 copy vpt 270 360 arc closepath fill vpt 0 360 arc closepath } bind def /C9 { BL [] 0 setdash 2 copy moveto 2 copy vpt 270 450 arc closepath fill vpt 0 360 arc closepath } bind def /C10 { BL [] 0 setdash 2 copy 2 copy moveto vpt 270 360 arc closepath fill 2 copy moveto 2 copy vpt 90 180 arc closepath fill vpt 0 360 arc closepath } bind def /C11 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 180 arc closepath fill 2 copy moveto 2 copy vpt 270 360 arc closepath fill vpt 0 360 arc closepath } bind def /C12 { BL [] 0 setdash 2 copy moveto 2 copy vpt 180 360 arc closepath fill vpt 0 360 arc closepath } bind def /C13 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 90 arc closepath fill 2 copy moveto 2 copy vpt 180 360 arc closepath fill vpt 0 360 arc closepath } bind def /C14 { BL [] 0 setdash 2 copy moveto 2 copy vpt 90 360 arc closepath fill vpt 0 360 arc } bind def /C15 { BL [] 0 setdash 2 copy vpt 0 360 arc closepath fill vpt 0 360 arc closepath } bind def /Rec { newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath } bind def /Square { dup Rec } bind def /Bsquare { vpt sub exch vpt sub exch vpt2 Square } bind def /S0 { BL [] 0 setdash 2 copy moveto 0 vpt rlineto BL Bsquare } bind def /S1 { BL [] 0 setdash 2 copy vpt Square fill Bsquare } bind def /S2 { BL [] 0 setdash 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def /S3 { BL [] 0 setdash 2 copy exch vpt sub exch vpt2 vpt Rec fill Bsquare } bind def /S4 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def /S5 { BL [] 0 setdash 2 copy 2 copy vpt Square fill exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def /S6 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill Bsquare } bind def /S7 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill 2 copy vpt Square fill Bsquare } bind def /S8 { BL [] 0 setdash 2 copy vpt sub vpt Square fill Bsquare } bind def /S9 { BL [] 0 setdash 2 copy vpt sub vpt vpt2 Rec fill Bsquare } bind def /S10 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def /S11 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt2 vpt Rec fill Bsquare } bind def /S12 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill Bsquare } bind def /S13 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill 2 copy vpt Square fill Bsquare } bind def /S14 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def /S15 { BL [] 0 setdash 2 copy Bsquare fill Bsquare } bind def /D0 { gsave translate 45 rotate 0 0 S0 stroke grestore } bind def /D1 { gsave translate 45 rotate 0 0 S1 stroke grestore } bind def /D2 { gsave translate 45 rotate 0 0 S2 stroke grestore } bind def /D3 { gsave translate 45 rotate 0 0 S3 stroke grestore } bind def /D4 { gsave translate 45 rotate 0 0 S4 stroke grestore } bind def /D5 { gsave translate 45 rotate 0 0 S5 stroke grestore } bind def /D6 { gsave translate 45 rotate 0 0 S6 stroke grestore } bind def /D7 { gsave translate 45 rotate 0 0 S7 stroke grestore } bind def /D8 { gsave translate 45 rotate 0 0 S8 stroke grestore } bind def /D9 { gsave translate 45 rotate 0 0 S9 stroke grestore } bind def /D10 { gsave translate 45 rotate 0 0 S10 stroke grestore } bind def /D11 { gsave translate 45 rotate 0 0 S11 stroke grestore } bind def /D12 { gsave translate 45 rotate 0 0 S12 stroke grestore } bind def /D13 { gsave translate 45 rotate 0 0 S13 stroke grestore } bind def /D14 { gsave translate 45 rotate 0 0 S14 stroke grestore } bind def /D15 { gsave translate 45 rotate 0 0 S15 stroke grestore } bind def /DiaE { stroke [] 0 setdash vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V closepath stroke } def /BoxE { stroke [] 0 setdash exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V closepath stroke } def /TriUE { stroke [] 0 setdash vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V closepath stroke } def /TriDE { stroke [] 0 setdash vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V closepath stroke } def /PentE { stroke [] 0 setdash gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat closepath stroke grestore } def /CircE { stroke [] 0 setdash hpt 0 360 arc stroke } def /Opaque { gsave closepath 1 setgray fill grestore 0 setgray closepath } def /DiaW { stroke [] 0 setdash vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V Opaque stroke } def /BoxW { stroke [] 0 setdash exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V Opaque stroke } def /TriUW { stroke [] 0 setdash vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V Opaque stroke } def /TriDW { stroke [] 0 setdash vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V Opaque stroke } def /PentW { stroke [] 0 setdash gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat Opaque stroke grestore } def /CircW { stroke [] 0 setdash hpt 0 360 arc Opaque stroke } def /BoxFill { gsave Rec 1 setgray fill grestore } def /BoxColFill { gsave Rec /Fillden exch def currentrgbcolor /ColB exch def /ColG exch def /ColR exch def /ColR ColR Fillden mul Fillden sub 1 add def /ColG ColG Fillden mul Fillden sub 1 add def /ColB ColB Fillden mul Fillden sub 1 add def ColR ColG ColB setrgbcolor fill grestore } def % % PostScript Level 1 Pattern Fill routine % Usage: x y w h s a XX PatternFill % x,y = lower left corner of box to be filled % w,h = width and height of box % a = angle in degrees between lines and x-axis % XX = 0/1 for no/yes cross-hatch % /PatternFill { gsave /PFa [ 9 2 roll ] def PFa 0 get PFa 2 get 2 div add PFa 1 get PFa 3 get 2 div add translate PFa 2 get -2 div PFa 3 get -2 div PFa 2 get PFa 3 get Rec gsave 1 setgray fill grestore clip currentlinewidth 0.5 mul setlinewidth /PFs PFa 2 get dup mul PFa 3 get dup mul add sqrt def 0 0 M PFa 5 get rotate PFs -2 div dup translate 0 1 PFs PFa 4 get div 1 add floor cvi { PFa 4 get mul 0 M 0 PFs V } for 0 PFa 6 get ne { 0 1 PFs PFa 4 get div 1 add floor cvi { PFa 4 get mul 0 2 1 roll M PFs 0 V } for } if stroke grestore } def % /Symbol-Oblique /Symbol findfont [1 0 .167 1 0 0] makefont dup length dict begin {1 index /FID eq {pop pop} {def} ifelse} forall currentdict end definefont pop /MFshow { { dup 5 get 3 ge { 5 get 3 eq {gsave} {grestore} ifelse } {dup dup 0 get findfont exch 1 get scalefont setfont [ currentpoint ] exch dup 2 get 0 exch R dup 5 get 2 ne {dup dup 6 get exch 4 get {show} {stringwidth pop 0 R} ifelse }if dup 5 get 0 eq {dup 3 get {2 get neg 0 exch R pop} {pop aload pop M} ifelse} {dup 5 get 1 eq {dup 2 get exch dup 3 get exch 6 get stringwidth pop -2 div dup 0 R} {dup 6 get stringwidth pop -2 div 0 R 6 get show 2 index {aload pop M neg 3 -1 roll neg R pop pop} {pop pop pop pop aload pop M} ifelse }ifelse }ifelse } ifelse } forall} bind def /MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont 6 get stringwidth pop add} {pop} ifelse} forall} bind def /MLshow { currentpoint stroke M 0 exch R MFshow } bind def /MRshow { currentpoint stroke M exch dup MFwidth neg 3 -1 roll R MFshow } def /MCshow { currentpoint stroke M exch dup MFwidth -2 div 3 -1 roll R MFshow } def end %%EndProlog gnudict begin gsave 50 50 translate 0.050 0.050 scale 0 setgray newpath (Helvetica) findfont 140 scalefont setfont 1.000 UL LTb 798 420 M 63 0 V 2501 0 R -63 0 V stroke 714 420 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0)] ] -46.7 MRshow 1.000 UL LTb 798 613 M 63 0 V 2501 0 R -63 0 V stroke 714 613 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.05)] ] -46.7 MRshow 1.000 UL LTb 798 806 M 63 0 V 2501 0 R -63 0 V stroke 714 806 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.1)] ] -46.7 MRshow 1.000 UL LTb 798 1000 M 63 0 V 2501 0 R -63 0 V stroke 714 1000 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.15)] ] -46.7 MRshow 1.000 UL LTb 798 1193 M 63 0 V 2501 0 R -63 0 V stroke 714 1193 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.2)] ] -46.7 MRshow 1.000 UL LTb 798 1386 M 63 0 V 2501 0 R -63 0 V stroke 714 1386 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.25)] ] -46.7 MRshow 1.000 UL LTb 798 1579 M 63 0 V 2501 0 R -63 0 V stroke 714 1579 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.3)] ] -46.7 MRshow 1.000 UL LTb 798 1772 M 63 0 V 2501 0 R -63 0 V stroke 714 1772 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.35)] ] -46.7 MRshow 1.000 UL LTb 798 1966 M 63 0 V 2501 0 R -63 0 V stroke 714 1966 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.4)] ] -46.7 MRshow 1.000 UL LTb 798 2159 M 63 0 V 2501 0 R -63 0 V stroke 714 2159 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.45)] ] -46.7 MRshow 1.000 UL LTb 798 2352 M 63 0 V 2501 0 R -63 0 V stroke 714 2352 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.5)] ] -46.7 MRshow 1.000 UL LTb 798 420 M 0 63 V 0 1869 R 0 -63 V stroke 798 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 1)] ] -46.7 MCshow 1.000 UL LTb 1119 420 M 0 63 V 0 1869 R 0 -63 V stroke 1119 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 2)] ] -46.7 MCshow 1.000 UL LTb 1439 420 M 0 63 V 0 1869 R 0 -63 V stroke 1439 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 3)] ] -46.7 MCshow 1.000 UL LTb 1760 420 M 0 63 V 0 1869 R 0 -63 V stroke 1760 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 4)] ] -46.7 MCshow 1.000 UL LTb 2080 420 M 0 63 V 0 1869 R 0 -63 V stroke 2080 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 5)] ] -46.7 MCshow 1.000 UL LTb 2401 420 M 0 63 V 0 1869 R 0 -63 V stroke 2401 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 6)] ] -46.7 MCshow 1.000 UL LTb 2721 420 M 0 63 V 0 1869 R 0 -63 V stroke 2721 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 7)] ] -46.7 MCshow 1.000 UL LTb 3042 420 M 0 63 V 0 1869 R 0 -63 V stroke 3042 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 8)] ] -46.7 MCshow 1.000 UL LTb 3362 420 M 0 63 V 0 1869 R 0 -63 V stroke 3362 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 9)] ] -46.7 MCshow 1.000 UL LTb 1.000 UL LTb 798 420 M 2564 0 V 0 1932 V -2564 0 V 798 420 L LTb 140 1386 M currentpoint gsave translate 90 rotate 0 0 moveto [ [(Helvetica) 140.0 0.0 true true 0 (Relative error)] ] -46.7 MCshow grestore LTb 2080 70 M [ [(Helvetica) 140.0 0.0 true true 0 (Distance \(m\))] ] -46.7 MCshow 1.000 UP 1.000 UP 1.000 UL LT0 LTb 2711 2219 M [ [(Helvetica) 140.0 0.0 true true 0 (dt = 0.001)] ] -46.7 MRshow LT0 2795 2219 M 399 0 V 798 483 M 80 429 V 958 646 L 80 -77 V 81 -74 V 320 675 V 1760 568 L 320 88 V 321 362 V 320 419 V 321 360 V 320 419 V 798 483 Pls 878 912 Pls 958 646 Pls 1038 569 Pls 1119 495 Pls 1439 1170 Pls 1760 568 Pls 2080 656 Pls 2401 1018 Pls 2721 1437 Pls 3042 1797 Pls 3362 2216 Pls 2994 2219 Pls 1.000 UP 1.000 UL LT1 LTb 2711 2079 M [ [(Helvetica) 140.0 0.0 true true 0 (dt = 0.01)] ] -46.7 MRshow LT1 2795 2079 M 399 0 V 798 445 M 80 548 V 958 715 L 80 -93 V 81 -75 V 320 688 V 1760 626 L 320 -21 V 321 360 V 320 432 V 321 355 V 320 438 V 798 445 Crs 878 993 Crs 958 715 Crs 1038 622 Crs 1119 547 Crs 1439 1235 Crs 1760 626 Crs 2080 605 Crs 2401 965 Crs 2721 1397 Crs 3042 1752 Crs 3362 2190 Crs 2994 2079 Crs 1.000 UP 1.000 UL LT2 LTb 2711 1939 M [ [(Helvetica) 140.0 0.0 true true 0 (dt = 0.1)] ] -46.7 MRshow LT2 2795 1939 M 399 0 V 798 445 M 80 548 V 958 717 L 80 -92 V 81 -75 V 320 685 V 1760 626 L 320 -21 V 321 360 V 320 432 V 321 355 V 320 438 V 798 445 Star 878 993 Star 958 717 Star 1038 625 Star 1119 550 Star 1439 1235 Star 1760 626 Star 2080 605 Star 2401 965 Star 2721 1397 Star 3042 1752 Star 3362 2190 Star 2994 1939 Star 1.000 UL LTb 798 420 M 2564 0 V 0 1932 V -2564 0 V 798 420 L 1.000 UP stroke grestore end showpage %%Trailer %%DocumentFonts: Helvetica --- NEW FILE: disp.eps --- %!PS-Adobe-2.0 EPSF-2.0 %%Title: disp.eps %%Creator: gnuplot 4.0 patchlevel 0 %%CreationDate: Wed Nov 15 23:56:18 2006 %%DocumentFonts: (atend) %%BoundingBox: 50 50 230 176 %%Orientation: Portrait %%EndComments /gnudict 256 dict def gnudict begin /Color true def /Solid false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /vshift -46 def /dl {10.0 mul} def /hpt_ 31.5 def /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def /Rounded false def /M {moveto} bind def /L {lineto} bind def /R {rmoveto} bind def /V {rlineto} bind def /N {newpath moveto} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def /Lshow { currentpoint stroke M 0 vshift R show } def /Rshow { currentpoint stroke M dup stringwidth pop neg vshift R show } def /Cshow { currentpoint stroke M dup stringwidth pop -2 div vshift R show } def /UP { dup vpt_ mul /vpt exch def hpt_ mul /hpt exch def /hpt2 hpt 2 mul def /vpt2 vpt 2 mul def } def /DL { Color {setrgbcolor Solid {pop []} if 0 setdash } {pop pop pop 0 setgray Solid {pop []} if 0 setdash} ifelse } def /BL { stroke userlinewidth 2 mul setlinewidth Rounded { 1 setlinejoin 1 setlinecap } if } def /AL { stroke userlinewidth 2 div setlinewidth Rounded { 1 setlinejoin 1 setlinecap } if } def /UL { dup gnulinewidth mul /userlinewidth exch def dup 1 lt {pop 1} if 10 mul /udl exch def } def /PL { stroke userlinewidth setlinewidth Rounded { 1 setlinejoin 1 setlinecap } if } def /LTw { PL [] 1 setgray } def /LTb { BL [] 0 0 0 DL } def /LTa { AL [1 udl mul 2 udl mul] 0 setdash 0 0 0 setrgbcolor } def /LT0 { PL [] 1 0 0 DL } def /LT1 { PL [4 dl 2 dl] 0 1 0 DL } def /LT2 { PL [2 dl 3 dl] 0 0 1 DL } def /LT3 { PL [1 dl 1.5 dl] 1 0 1 DL } def /LT4 { PL [5 dl 2 dl 1 dl 2 dl] 0 1 1 DL } def /LT5 { PL [4 dl 3 dl 1 dl 3 dl] 1 1 0 DL } def /LT6 { PL [2 dl 2 dl 2 dl 4 dl] 0 0 0 DL } def /LT7 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 1 0.3 0 DL } def /LT8 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 0.5 0.5 0.5 DL } def /Pnt { stroke [] 0 setdash gsave 1 setlinecap M 0 0 V stroke grestore } def /Dia { stroke [] 0 setdash 2 copy vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V closepath stroke Pnt } def /Pls { stroke [] 0 setdash vpt sub M 0 vpt2 V currentpoint stroke M hpt neg vpt neg R hpt2 0 V stroke } def /Box { stroke [] 0 setdash 2 copy exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V closepath stroke Pnt } def /Crs { stroke [] 0 setdash exch hpt sub exch vpt add M hpt2 vpt2 neg V currentpoint stroke M hpt2 neg 0 R hpt2 vpt2 V stroke } def /TriU { stroke [] 0 setdash 2 copy vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V closepath stroke Pnt } def /Star { 2 copy Pls Crs } def /BoxF { stroke [] 0 setdash exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V closepath fill } def /TriUF { stroke [] 0 setdash vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V closepath fill } def /TriD { stroke [] 0 setdash 2 copy vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V closepath stroke Pnt } def /TriDF { stroke [] 0 setdash vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V closepath fill} def /DiaF { stroke [] 0 setdash vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V closepath fill } def /Pent { stroke [] 0 setdash 2 copy gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat closepath stroke grestore Pnt } def /PentF { stroke [] 0 setdash gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat closepath fill grestore } def /Circle { stroke [] 0 setdash 2 copy hpt 0 360 arc stroke Pnt } def /CircleF { stroke [] 0 setdash hpt 0 360 arc fill } def /C0 { BL [] 0 setdash 2 copy moveto vpt 90 450 arc } bind def /C1 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 90 arc closepath fill vpt 0 360 arc closepath } bind def /C2 { BL [] 0 setdash 2 copy moveto 2 copy vpt 90 180 arc closepath fill vpt 0 360 arc closepath } bind def /C3 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 180 arc closepath fill vpt 0 360 arc closepath } bind def /C4 { BL [] 0 setdash 2 copy moveto 2 copy vpt 180 270 arc closepath fill vpt 0 360 arc closepath } bind def /C5 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 90 arc 2 copy moveto 2 copy vpt 180 270 arc closepath fill vpt 0 360 arc } bind def /C6 { BL [] 0 setdash 2 copy moveto 2 copy vpt 90 270 arc closepath fill vpt 0 360 arc closepath } bind def /C7 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 270 arc closepath fill vpt 0 360 arc closepath } bind def /C8 { BL [] 0 setdash 2 copy moveto 2 copy vpt 270 360 arc closepath fill vpt 0 360 arc closepath } bind def /C9 { BL [] 0 setdash 2 copy moveto 2 copy vpt 270 450 arc closepath fill vpt 0 360 arc closepath } bind def /C10 { BL [] 0 setdash 2 copy 2 copy moveto vpt 270 360 arc closepath fill 2 copy moveto 2 copy vpt 90 180 arc closepath fill vpt 0 360 arc closepath } bind def /C11 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 180 arc closepath fill 2 copy moveto 2 copy vpt 270 360 arc closepath fill vpt 0 360 arc closepath } bind def /C12 { BL [] 0 setdash 2 copy moveto 2 copy vpt 180 360 arc closepath fill vpt 0 360 arc closepath } bind def /C13 { BL [] 0 setdash 2 copy moveto 2 copy vpt 0 90 arc closepath fill 2 copy moveto 2 copy vpt 180 360 arc closepath fill vpt 0 360 arc closepath } bind def /C14 { BL [] 0 setdash 2 copy moveto 2 copy vpt 90 360 arc closepath fill vpt 0 360 arc } bind def /C15 { BL [] 0 setdash 2 copy vpt 0 360 arc closepath fill vpt 0 360 arc closepath } bind def /Rec { newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath } bind def /Square { dup Rec } bind def /Bsquare { vpt sub exch vpt sub exch vpt2 Square } bind def /S0 { BL [] 0 setdash 2 copy moveto 0 vpt rlineto BL Bsquare } bind def /S1 { BL [] 0 setdash 2 copy vpt Square fill Bsquare } bind def /S2 { BL [] 0 setdash 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def /S3 { BL [] 0 setdash 2 copy exch vpt sub exch vpt2 vpt Rec fill Bsquare } bind def /S4 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def /S5 { BL [] 0 setdash 2 copy 2 copy vpt Square fill exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def /S6 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill Bsquare } bind def /S7 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill 2 copy vpt Square fill Bsquare } bind def /S8 { BL [] 0 setdash 2 copy vpt sub vpt Square fill Bsquare } bind def /S9 { BL [] 0 setdash 2 copy vpt sub vpt vpt2 Rec fill Bsquare } bind def /S10 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def /S11 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt2 vpt Rec fill Bsquare } bind def /S12 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill Bsquare } bind def /S13 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill 2 copy vpt Square fill Bsquare } bind def /S14 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def /S15 { BL [] 0 setdash 2 copy Bsquare fill Bsquare } bind def /D0 { gsave translate 45 rotate 0 0 S0 stroke grestore } bind def /D1 { gsave translate 45 rotate 0 0 S1 stroke grestore } bind def /D2 { gsave translate 45 rotate 0 0 S2 stroke grestore } bind def /D3 { gsave translate 45 rotate 0 0 S3 stroke grestore } bind def /D4 { gsave translate 45 rotate 0 0 S4 stroke grestore } bind def /D5 { gsave translate 45 rotate 0 0 S5 stroke grestore } bind def /D6 { gsave translate 45 rotate 0 0 S6 stroke grestore } bind def /D7 { gsave translate 45 rotate 0 0 S7 stroke grestore } bind def /D8 { gsave translate 45 rotate 0 0 S8 stroke grestore } bind def /D9 { gsave translate 45 rotate 0 0 S9 stroke grestore } bind def /D10 { gsave translate 45 rotate 0 0 S10 stroke grestore } bind def /D11 { gsave translate 45 rotate 0 0 S11 stroke grestore } bind def /D12 { gsave translate 45 rotate 0 0 S12 stroke grestore } bind def /D13 { gsave translate 45 rotate 0 0 S13 stroke grestore } bind def /D14 { gsave translate 45 rotate 0 0 S14 stroke grestore } bind def /D15 { gsave translate 45 rotate 0 0 S15 stroke grestore } bind def /DiaE { stroke [] 0 setdash vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V closepath stroke } def /BoxE { stroke [] 0 setdash exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V closepath stroke } def /TriUE { stroke [] 0 setdash vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V closepath stroke } def /TriDE { stroke [] 0 setdash vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V closepath stroke } def /PentE { stroke [] 0 setdash gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat closepath stroke grestore } def /CircE { stroke [] 0 setdash hpt 0 360 arc stroke } def /Opaque { gsave closepath 1 setgray fill grestore 0 setgray closepath } def /DiaW { stroke [] 0 setdash vpt add M hpt neg vpt neg V hpt vpt neg V hpt vpt V hpt neg vpt V Opaque stroke } def /BoxW { stroke [] 0 setdash exch hpt sub exch vpt add M 0 vpt2 neg V hpt2 0 V 0 vpt2 V hpt2 neg 0 V Opaque stroke } def /TriUW { stroke [] 0 setdash vpt 1.12 mul add M hpt neg vpt -1.62 mul V hpt 2 mul 0 V hpt neg vpt 1.62 mul V Opaque stroke } def /TriDW { stroke [] 0 setdash vpt 1.12 mul sub M hpt neg vpt 1.62 mul V hpt 2 mul 0 V hpt neg vpt -1.62 mul V Opaque stroke } def /PentW { stroke [] 0 setdash gsave translate 0 hpt M 4 {72 rotate 0 hpt L} repeat Opaque stroke grestore } def /CircW { stroke [] 0 setdash hpt 0 360 arc Opaque stroke } def /BoxFill { gsave Rec 1 setgray fill grestore } def /BoxColFill { gsave Rec /Fillden exch def currentrgbcolor /ColB exch def /ColG exch def /ColR exch def /ColR ColR Fillden mul Fillden sub 1 add def /ColG ColG Fillden mul Fillden sub 1 add def /ColB ColB Fillden mul Fillden sub 1 add def ColR ColG ColB setrgbcolor fill grestore } def % % PostScript Level 1 Pattern Fill routine % Usage: x y w h s a XX PatternFill % x,y = lower left corner of box to be filled % w,h = width and height of box % a = angle in degrees between lines and x-axis % XX = 0/1 for no/yes cross-hatch % /PatternFill { gsave /PFa [ 9 2 roll ] def PFa 0 get PFa 2 get 2 div add PFa 1 get PFa 3 get 2 div add translate PFa 2 get -2 div PFa 3 get -2 div PFa 2 get PFa 3 get Rec gsave 1 setgray fill grestore clip currentlinewidth 0.5 mul setlinewidth /PFs PFa 2 get dup mul PFa 3 get dup mul add sqrt def 0 0 M PFa 5 get rotate PFs -2 div dup translate 0 1 PFs PFa 4 get div 1 add floor cvi { PFa 4 get mul 0 M 0 PFs V } for 0 PFa 6 get ne { 0 1 PFs PFa 4 get div 1 add floor cvi { PFa 4 get mul 0 2 1 roll M PFs 0 V } for } if stroke grestore } def % /Symbol-Oblique /Symbol findfont [1 0 .167 1 0 0] makefont dup length dict begin {1 index /FID eq {pop pop} {def} ifelse} forall currentdict end definefont pop /MFshow { { dup 5 get 3 ge { 5 get 3 eq {gsave} {grestore} ifelse } {dup dup 0 get findfont exch 1 get scalefont setfont [ currentpoint ] exch dup 2 get 0 exch R dup 5 get 2 ne {dup dup 6 get exch 4 get {show} {stringwidth pop 0 R} ifelse }if dup 5 get 0 eq {dup 3 get {2 get neg 0 exch R pop} {pop aload pop M} ifelse} {dup 5 get 1 eq {dup 2 get exch dup 3 get exch 6 get stringwidth pop -2 div dup 0 R} {dup 6 get stringwidth pop -2 div 0 R 6 get show 2 index {aload pop M neg 3 -1 roll neg R pop pop} {pop pop pop pop aload pop M} ifelse }ifelse }ifelse } ifelse } forall} bind def /MFwidth {0 exch {dup 3 get{dup dup 0 get findfont exch 1 get scalefont setfont 6 get stringwidth pop add} {pop} ifelse} forall} bind def /MLshow { currentpoint stroke M 0 exch R MFshow } bind def /MRshow { currentpoint stroke M exch dup MFwidth neg 3 -1 roll R MFshow } def /MCshow { currentpoint stroke M exch dup MFwidth -2 div 3 -1 roll R MFshow } def end %%EndProlog gnudict begin gsave 50 50 translate 0.050 0.050 scale 0 setgray newpath (Helvetica) findfont 140 scalefont setfont 1.000 UL LTb 966 420 M 63 0 V 2333 0 R -63 0 V stroke 882 420 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0)] ] -46.7 MRshow 1.000 UL LTb 966 613 M 63 0 V 2333 0 R -63 0 V stroke 882 613 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0002)] ] -46.7 MRshow 1.000 UL LTb 966 806 M 63 0 V 2333 0 R -63 0 V stroke 882 806 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0004)] ] -46.7 MRshow 1.000 UL LTb 966 1000 M 63 0 V 2333 0 R -63 0 V stroke 882 1000 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0006)] ] -46.7 MRshow 1.000 UL LTb 966 1193 M 63 0 V 2333 0 R -63 0 V stroke 882 1193 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0008)] ] -46.7 MRshow 1.000 UL LTb 966 1386 M 63 0 V 2333 0 R -63 0 V stroke 882 1386 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.001)] ] -46.7 MRshow 1.000 UL LTb 966 1579 M 63 0 V 2333 0 R -63 0 V stroke 882 1579 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0012)] ] -46.7 MRshow 1.000 UL LTb 966 1772 M 63 0 V 2333 0 R -63 0 V stroke 882 1772 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0014)] ] -46.7 MRshow 1.000 UL LTb 966 1966 M 63 0 V 2333 0 R -63 0 V stroke 882 1966 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0016)] ] -46.7 MRshow 1.000 UL LTb 966 2159 M 63 0 V 2333 0 R -63 0 V stroke 882 2159 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.0018)] ] -46.7 MRshow 1.000 UL LTb 966 2352 M 63 0 V 2333 0 R -63 0 V stroke 882 2352 M [ [(Helvetica) 140.0 0.0 true true 0 ( 0.002)] ] -46.7 MRshow 1.000 UL LTb 966 420 M 0 63 V 0 1869 R 0 -63 V stroke 966 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 1)] ] -46.7 MCshow 1.000 UL LTb 1266 420 M 0 63 V 0 1869 R 0 -63 V stroke 1266 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 2)] ] -46.7 MCshow 1.000 UL LTb 1565 420 M 0 63 V 0 1869 R 0 -63 V stroke 1565 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 3)] ] -46.7 MCshow 1.000 UL LTb 1865 420 M 0 63 V 0 1869 R 0 -63 V stroke 1865 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 4)] ] -46.7 MCshow 1.000 UL LTb 2164 420 M 0 63 V 0 1869 R 0 -63 V stroke 2164 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 5)] ] -46.7 MCshow 1.000 UL LTb 2464 420 M 0 63 V 0 1869 R 0 -63 V stroke 2464 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 6)] ] -46.7 MCshow 1.000 UL LTb 2763 420 M 0 63 V 0 1869 R 0 -63 V stroke 2763 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 7)] ] -46.7 MCshow 1.000 UL LTb 3063 420 M 0 63 V 0 1869 R 0 -63 V stroke 3063 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 8)] ] -46.7 MCshow 1.000 UL LTb 3362 420 M 0 63 V 0 1869 R 0 -63 V stroke 3362 280 M [ [(Helvetica) 140.0 0.0 true true 0 ( 9)] ] -46.7 MCshow 1.000 UL LTb 1.000 UL LTb 966 420 M 2396 0 V 0 1932 V -2396 0 V 966 420 L LTb 140 1386 M currentpoint gsave translate 90 rotate 0 0 moveto [ [(Helvetica) 140.0 0.0 true true 0 (Displacement \(m\))] ] -46.7 MCshow grestore LTb 2164 70 M [ [(Helvetica) 140.0 0.0 true true 0 (Distance \(m\))] ] -46.7 MCshow 1.000 UP 1.000 UP 1.000 UL LT0 LTb 2711 2219 M [ [(Helvetica) 140.0 0.0 true true 0 (Exact)] ] -46.7 MRshow LT0 2795 2219 M 399 0 V 966 2330 M 75 -427 V 75 -251 V 75 -179 V 75 -130 V 299 -309 V 1865 881 L 299 -92 V 300 -62 V 299 -44 V 300 -32 V 299 -28 V 966 2330 Pls 1041 1903 Pls 1116 1652 Pls 1191 1473 Pls 1266 1343 Pls 1565 1034 Pls 1865 881 Pls 2164 789 Pls 2464 727 Pls 2763 683 Pls 3063 651 Pls 3362 623 Pls 2994 2219 Pls 1.000 UP 1.000 UL LT1 LTb 2711 2079 M [ [(Helvetica) 140.0 0.0 true true 0 (dt = 0.001)] ] -46.7 MRshow LT1 2795 2079 M 399 0 V 966 2298 M 75 -206 V 75 -367 V 75 -211 V 75 -153 V 299 -207 V 1865 898 L 2164 766 L 300 -87 V 299 -65 V 300 -46 V 299 -39 V 966 2298 Crs 1041 2092 Crs 1116 1725 Crs 1191 1514 Crs 1266 1361 Crs 1565 1154 Crs 1865 898 Crs 2164 766 Crs 2464 679 Crs 2763 614 Crs 3063 568 Crs 3362 529 Crs 2994 2079 Crs 1.000 UP 1.000 UL LT2 LTb 2711 1939 M [ [(Helvetica) 140.0 0.0 true true 0 (dt = 0.01)] ] -46.7 MRshow LT2 2795 1939 M 399 0 V 966 2342 M 75 -219 V 75 -376 V 75 -219 V 75 -155 V 299 -209 V 1865 905 L 2164 771 L 300 -87 V 299 -68 V 300 -45 V 299 -41 V 966 2342 Star 1041 2123 Star 1116 1747 Star 1191 1528 Star 1266 1373 Star 1565 1164 Star 1865 905 Star 2164 771 Star 2464 684 Star 2763 616 Star 3063 571 Star 3362 530 Star 2994 1939 Star 1.000 UP 1.000 UL LT3 LTb 2711 1799 M [ [(Helvetica) 140.0 0.0 true true 0 (dt = 0.1)] ] -46.7 MRshow LT3 2795 1799 M 399 0 V 966 2342 M 75 -219 V 75 -376 V 75 -218 V 75 -155 V 299 -210 V 1865 905 L 2164 771 L 300 -87 V 299 -68 V 300 -45 V 299 -41 V 966 2342 Box 1041 2123 Box 1116 1747 Box 1191 1529 Box 1266 1374 Box 1565 1164 Box 1865 905 Box 2164 771 Box 2464 684 Box 2763 616 Box 3063 571 Box 3362 530 Box 2994 1799 Box 1.000 UL LTb 966 420 M 2396 0 V 0 1932 V -2396 0 V 966 420 L 1.000 UP stroke grestore end showpage %%Trailer %%DocumentFonts: Helvetica --- NEW FILE: extensometer.eps --- %!PS-Adobe-2.0 EPSF-2.0 %%Title: extensometer.fig %%Creator: fig2dev Version 3.2 Patchlevel 4 %%CreationDate: Wed Nov 15 23:56:19 2006 %%For: doolin@SENSORNET1 (U-SENSORNET1\doolin,S-1-5-21-3636447637-3481046215-610954586-1006) %%BoundingBox: 0 0 377 695 %%Magnification: 1.0000 %%EndComments /$F2psDict 200 dict def $F2psDict begin $F2psDict /mtrx matrix put /col-1 {0 setgray} bind def /col0 {0.000 0.000 0.000 srgb} bind def /col1 {0.000 0.000 1.000 srgb} bind def /col2 {0.000 1.000 0.000 srgb} bind def /col3 {0.000 1.000 1.000 srgb} bind def /col4 {1.000 0.000 0.000 srgb} bind def /col5 {1.000 0.000 1.000 srgb} bind def /col6 {1.000 1.000 0.000 srgb} bind def /col7 {1.000 1.000 1.000 srgb} bind def /col8 {0.000 0.000 0.560 srgb} bind def /col9 {0.000 0.000 0.690 srgb} bind def /col10 {0.000 0.000 0.820 srgb} bind def /col11 {0.530 0.810 1.000 srgb} bind def /col12 {0.000 0.560 0.000 srgb} bind def /col13 {0.000 0.690 0.000 srgb} bind def /col14 {0.000 0.820 0.000 srgb} bind def /col15 {0.000 0.560 0.560 srgb} bind def /col16 {0.000 0.690 0.690 srgb} bind def /col17 {0.000 0.820 0.820 srgb} bind def /col18 {0.560 0.000 0.000 srgb} bind def /col19 {0.690 0.000 0.000 srgb} bind def /col20 {0.820 0.000 0.000 srgb} bind def /col21 {0.560 0.000 0.560 srgb} bind def /col22 {0.690 0.000 0.690 srgb} bind def /col23 {0.820 0.000 0.820 srgb} bind def /col24 {0.500 0.190 0.000 srgb} bind def /col25 {0.630 0.250 0.000 srgb} bind def /col26 {0.750 0.380 0.000 srgb} bind def /col27 {1.000 0.500 0.500 srgb} bind def /col28 {1.000 0.630 0.630 srgb} bind def /col29 {1.000 0.750 0.750 srgb} bind def /col30 {1.000 0.880 0.880 srgb} bind def /col31 {1.000 0.840 0.000 srgb} bind def end save newpath 0 695 moveto 0 0 lineto 377 0 lineto 377 695 lineto closepath clip newpath -791.5 1102.3 translate 1 -1 scale /cp {closepath} bind def /ef {eofill} bind def /gr {grestore} bind def /gs {gsave} bind def /sa {save} bind def /rs {restore} bind def /l {lineto} bind def /m {moveto} bind def /rm {rmoveto} bind def /n {newpath} bind def /s {stroke} bind def /sh {show} bind def /slc {setlinecap} bind def /slj {setlinejoin} bind def /slw {setlinewidth} bind def /srgb {setrgbcolor} bind def /rot {rotate} bind def /sc {scale} bind def /sd {setdash} bind def /ff {findfont} bind def /sf {setfont} bind def /scf {scalefont} bind def /sw {stringwidth} bind def /tr {translate} bind def /tnt {dup dup currentrgbcolor 4 -2 roll dup 1 exch sub 3 -1 roll mul add 4 -2 roll dup 1 exch sub 3 -1 roll mul add 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb} bind def /shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul 4 -2 roll mul srgb} bind def /DrawEllipse { /endangle exch def /startangle exch def /yrad exch def /xrad exch def /y exch def /x exch def /savematrix mtrx currentmatrix def x y tr xrad yrad sc 0 0 1 startangle endangle arc closepath savematrix setmatrix } def /$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def /$F2psEnd {$F2psEnteredState restore end} def $F2psBegin 10 setmiterlimit 0 slj 0 slc 0.06000 0.06000 sc % % Fig objects follow % % % here starts figure with depth 50 /Times-Roman ff 360.00 scf sf 13725 12300 m gs 1 -1 sc (0 m) col-1 sh gr % Ellipse 7.500 slw n 16332 10743 237 237 0 360 DrawEllipse gs col-1 s gr % Ellipse n 16332 9243 237 237 0 360 DrawEllipse gs col-1 s gr % Ellipse n 16350 7050 237 237 0 360 DrawEllipse gs col-1 s gr % Polyline n 16350 12225 m 16350 7050 l gs col-1 s gr % Polyline n 15900 10725 m 14475 10725 l gs col-1 s gr % Polyline n 15900 9225 m 14475 9225 l gs col-1 s gr % Polyline n 14925 12225 m 14925 7050 l gs col-1 s gr % Polyline n 15150 9075 m 14775 9375 l gs col-1 s gr % Polyline n 15150 10575 m 14775 10875 l gs col-1 s gr % Polyline n 15900 7050 m 14475 7050 l gs col-1 s gr % Polyline n 15150 6900 m 14775 7200 l gs col-1 s gr % Polyline n 15900 12225 m 14475 12225 l gs col-1 s gr % Polyline n 15150 12075 m 14775 12375 l gs col0 s gr % Polyline 2 slj 15.000 slw n 19086 17399 m 19091 17381 l 19097 17362 l 19103 17343 l 19110 17323 l 19116 17302 l 19123 17281 l 19130 17259 l 19138 17237 l 19145 17215 l 19152 17192 l 19159 17170 l 19167 17148 l 19174 17126 l 19180 17104 l 19187 17083 l 19193 17062 l 19200 17042 l 19206 17022 l 19211 17004 l 19216 16985 l 19222 16966 l 19227 16947 l 19233 16927 l 19238 16906 l 19244 16885 l 19250 16864 l 19256 16842 l 19261 16821 l 19267 16799 l 19272 16778 l 19277 16757 l 19283 16736 l 19288 16716 l 19292 16697 l 19297 16678 l 19301 16659 l 19306 16641 l 19310 16624 l 19314 16605 l 19319 16585 l 19323 16566 l 19328 16546 l 19332 16526 l 19337 16505 l 19341 16484 l 19346 16463 l 19350 16442 l 19355 16421 l 19359 16399 l 19363 16379 l 19367 16358 l 19370 16339 l 19374 16319 l 19377 16300 l 19381 16282 l 19384 16263 l 19386 16247 l 19389 16230 l 19392 16212 l 19394 16194 l 19397 16176 l 19400 16156 l 19402 16136 l 19405 16116 l 19408 16095 l 19410 16074 l 19413 16053 l 19415 16031 l 19417 16010 l 19420 15989 l 19422 15968 l 19424 15947 l 19425 15926 l 19427 15906 l 19429 15885 l 19430 15865 l 19432 15844 l 19433 15823 l 19435 15802 l 19436 15779 l 19437 15756 l 19438 15732 l 19439 15707 l 19441 15682 l 19441 15656 l 19442 15630 l 19443 15603 l 19443 15577 l 19444 15551 l 19444 15525 l 19444 15500 l 19444 15476 l 19444 15451 l 19443 15428 l 19443 15405 l 19442 15382 l 19441 15361 l 19440 15340 l 19439 15319 l 19438 15298 l 19437 15275 l 19435 15253 l 19433 15230 l 19431 15206 l 19429 15182 l 19427 15158 l 19425 15134 l 19422 15109 l 19420 15085 l 19417 15061 l 19414 15037 l 19411 15013 l 19409 14990 l 19406 14967 l 19403 14945 l 19400 14922 l 19397 14901 l 19394 14879 l 19391 14859 l 19388 14838 l 19385 14817 l 19381 14796 l 19378 14774 l 19374 14752 l 19370 14729 l 19366 14705 l 19361 14681 l 19356 14656 l 19351 14631 l 19346 14606 l 19340 14581 l 19334 14555 l 19328 14530 l 19322 14505 l 19315 14480 l 19309 14455 l 19302 14431 l 19295 14407 l 19287 14383 l 19280 14360 l 19272 14336 l 19264 14313 l 19256 14292 l 19248 14270 l 19239 14248 l 19230 14225 l 19221 14202 l 19211 14178 l 19200 14154 l 19189 14129 l 19178 14104 l 19166 14079 l 19153 14053 l 19141 14027 l 19128 14001 l 19115 13975 l 19101 13949 l 19088 13923 l 19074 13898 l 19060 13873 l 19047 13848 l 19033 13824 l 19020 13801 l 19006 13778 l 18993 13756 l 18980 13734 l 18967 13712 l 18954 13691 l 18939 13668 l 18925 13645 l 18910 13622 l 18894 13599 l 18879 13576 l 18863 13552 l 18846 13528 l 18829 13504 l 18812 13480 l 18794 13456 l 18777 13432 l 18759 13408 l 18741 13384 l 18723 13361 l 18705 13339 l 18687 13316 l 18670 13295 l 18653 13274 l 18636 13254 l 18620 13235 l 18604 13216 l 18588 13199 l 18573 13181 l 18557 13164 l 18540 13146 l 18523 13128 l 18506 13111 l 18489 13093 l 18471 13075 l 18453 13058 l 18434 13040 l 18415 13023 l 18396 13005 l 18377 12988 l 18357 12971 l 18338 12954 l 18319 12938 l 18299 12922 l 18281 12907 l 18262 12892 l 18244 12878 l 18226 12864 l 18208 12851 l 18191 12838 l 18174 12826 l 18158 12815 l 18139 12802 l 18120 12789 l 18101 12776 l 18081 12763 l 18061 12751 l 18040 12738 l 18019 12725 l 17998 12712 l 17976 12699 l 17954 12686 l 17932 12673 l 17910 12661 l 17889 12649 l 17868 12637 l 17847 12626 l 17827 12615 l 17807 12605 l 17788 12595 l 17769 12586 l 17751 12577 l 17732 12567 l 17713 12558 l 17694 12549 l 17675 12540 l 17655 12531 l 17634 12521 l 17613 12512 l 17591 12503 l 17569 12493 l 17547 12484 l 17525 12475 l 17502 12466 l 17479 12457 l 17457 12448 l 17435 12440 l 17413 12432 l 17391 12425 l 17369 12417 l 17347 12410 l 17326 12403 l 17306 12397 l 17285 12391 l 17264 12385 l 17242 12378 l 17219 12372 l 17196 12366 l 17172 12360 l 17147 12354 l 17122 12347 l 17096 12341 l 17070 12335 l 17044 12330 l 17018 12324 l 16993 12319 l 16967 12314 l 16942 12309 l 16918 12305 l 16894 12301 l 16871 12297 l 16848 12294 l 16826 12291 l 16804 12288 l 16780 12285 l 16756 12282 l 16731 12280 l 16707 12278 l 16681 12276 l 16656 12274 l 16630 12273 l 16604 12271 l 16578 12270 l 16552 12269 l 16527 12269 l 16501 12268 l 16477 12268 l 16453 12268 l 16430 12268 l 16407 12268 l 16386 12268 l 16365 12268 l 16345 12269 l 16326 12269 l 16304 12270 l 16283 12270 l 16262 12271 l 16240 12272 l 16218 12272 l 16195 12273 l 16172 12274 l 16149 12276 l 16126 12277 l 16103 12278 l 16080 12280 l 16057 12281 l 16035 12283 l 16013 12284 l 15991 12286 l 15970 12288 l 15949 12290 l 15928 12292 l 15909 12294 l 15889 12295 l 15869 12298 l 15848 12300 l 15826 12302 l 15804 12305 l 15781 12308 l 15757 12311 l 15733 12314 l 15708 12317 l 15683 12321 l 15659 12325 l 15634 12329 l 15610 12333 l 15586 12337 l 15563 12341 l 15540 12345 l 15518 12350 l 15496 12354 l 15474 12359 l 15454 12363 l 15434 12368 l 15413 12373 l 15392 12378 l 15371 12383 l 15349 12389 l 15327 12395 l 15304 12402 l 15281 12409 l 15258 12416 l 15234 12423 l 15211 12431 l 15187 12439 l 15164 12447 l 15141 12456 l 15118 12465 l 15096 12473 l 15074 12482 l 15053 12491 l 15032 12500 l 15011 12509 l 14991 12519 l 14970 12528 l 14949 12539 l 14928 12549 l 14906 12560 l 14884 12572 l 14862 12584 l 14839 12596 l 14816 12609 l 14793 12623 l 14770 12636 l 14747 12650 l 14724 12664 l 14701 12678 l 14679 12692 l 14658 12705 l 14637 12719 l 14617 12732 l 14598 12745 l 14580 12758 l 14562 12770 l 14545 12782 l 14529 12794 l 14512 12807 l 14495 12820 l 14478 12833 l 14461 12847 l 14445 12860 l 14428 12874 l 14411 12888 l 14394 12902 l 14378 12917 l 14361 12931 l 14345 12946 l 14329 12961 l 14313 12975 l 14298 12989 l 14282 13003 l 14268 13017 l 14253 13031 l 14239 13044 l 14224 13058 l 14210 13071 l 14196 13085 l 14181 13099 l 14165 13113 l 14149 13128 l 14133 13143 l 14116 13159 l 14098 13176 l 14081 13193 l 14062 13211 l 14044 13229 l 14025 13247 l 14007 13266 l 13989 13284 l 13971 13302 l 13954 13321 l 13937 13339 l 13921 13357 l 13905 13375 l 13890 13392 l 13875 13410 l 13861 13426 l 13847 13443 l 13834 13460 l 13820 13478 l 13806 13496 l 13792 13515 l 13778 13534 l 13764 13554 l 13750 13575 l 13736 13595 l 13722 13616 l 13708 13637 l 13695 13658 l 13681 13678 l 13668 13699 l 13656 13719 l 13644 13738 l 13632 13757 l 13621 13776 l 13611 13794 l 13600 13812 l 13590 13830 l 13579 13849 l 13568 13868 l 13557 13888 l 13546 13908 l 13536 13929 l 13525 13950 l 13514 13972 l 13503 13993 l 13492 14016 l 13481 14038 l 13471 14061 l 13461 14084 l 13451 14106 l 13442 14128 l 13433 14150 l 13425 14172 l 13417 14193 l 13410 14214 l 13403 14235 l 13396 14256 l 13390 14276 l 13384 14295 l 13378 14316 l 13373 14337 l 13367 14358 l 13362 14381 l 13356 14404 l 13351 14428 l 13345 14452 l 13340 14477 l 13335 14502 l 13330 14528 l 13325 14553 l 13320 14579 l 13316 14604 l 13311 14629 l 13307 14654 l 13303 14678 l 13299 14702 l 13295 14726 l 13292 14749 l 13288 14773 l 13285 14796 l 13281 14820 l 13278 14844 l 13274 14869 l 13271 14895 l 13267 14921 l 13264 14947 l 13260 14974 l 13256 15002 l 13253 15029 l 13250 15057 l 13246 15084 l 13243 15111 l 13240 15137 l 13237 15163 l 13235 15188 l 13232 15213 l 13230 15236 l 13228 15259 l 13226 15281 l 13224 15302 l 13223 15323 l 13221 15345 l 13219 15367 l 13218 15388 l 13217 15410 l 13216 15433 l 13215 154... [truncated message content] |
|
From: Roozbeh <rgr...@us...> - 2006-11-29 14:53:49
|
Update of /cvsroot/dda/pub/mohrcoloumb/figs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26234 Added Files: flac-lavarak-plastic-zone.eps Log Message: plastic zone eps file using FLAC is added --- NEW FILE: flac-lavarak-plastic-zone.eps --- %!PS-Adobe-3.0 EPSF-3.0 %%Title: (FLAC-Lavarak-Plastic-Zone Model \(1\)) %%Version: 1 3 %%Creator: (PScript5.dll Version 5.2) %%CreationDate: (D:20061129173227+03'30') %%For: (Roozbeh) %%DocumentData: Clean7Bit %%BoundingBox: 0 0 595 842 %%Pages: 0 %%DocumentProcessColors: Cyan Magenta Yellow Black %%DocumentSuppliedResources: %%+ procset (Adobe Acrobat - PDF operators) 1.2 0 %%EndComments 0 0 moveto 595 0 lineto 595 842 lineto 0 842 lineto closepath clip newpath %%BeginProlog %%EndProlog %%BeginSetup /currentpacking where{pop currentpacking true setpacking}if %%BeginResource: procset pdfvars [...4353 lines suppressed...] 167.16 343.7 l 161.52 343.7 l 161.52 347.48 l 169.08 347.48 l 184.2 336.14 m 184.2 343.7 l 184.2 341.84 m 186.06 343.7 l 187.98 341.84 l 187.98 339.92 l 187.98 341.84 m 189.84 343.7 l 191.76 341.84 l 191.76 336.14 l S PDFVars/TermAll get exec end end %%PageTrailer %%EndPage %%Trailer %%EOF |
|
From: Roozbeh <rgr...@us...> - 2006-11-29 14:51:52
|
Update of /cvsroot/dda/pub/mohrcoloumb/figs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv25130 Added Files: flac_lavarak_grid.eps Log Message: lavarak grid modeled using FLAC is added --- NEW FILE: flac_lavarak_grid.eps --- %!PS-Adobe-3.0 EPSF-3.0 %%Title: (FLAC-Lavarak-Grid Model \(1\)) %%Version: 1 3 %%Creator: (PScript5.dll Version 5.2) %%CreationDate: (D:20061129162853+03'30') %%For: (Roozbeh) %%DocumentData: Clean7Bit %%BoundingBox: 0 0 595 842 %%Pages: 0 %%DocumentProcessColors: Cyan Magenta Yellow Black %%DocumentSuppliedResources: %%+ procset (Adobe Acrobat - PDF operators) 1.2 0 %%EndComments 0 0 moveto 595 0 lineto 595 842 lineto 0 842 lineto closepath clip newpath %%BeginProlog %%EndProlog %%BeginSetup /currentpacking where{pop currentpacking true setpacking}if %%BeginResource: procset pdfvars [...15280 lines suppressed...] 95.58 752.96 l 86.4 740.84 l 103.08 737.72 l h 103.08 114.08 m 86.4 110.9 l 95.64 98.84 l 103.08 114.08 l h 459.96 111.14 m 450.9 98.96 l 443.22 114.08 l 459.96 111.14 l h S PDFVars/TermAll get exec end end %%PageTrailer %%EndPage %%Trailer %%EOF |
|
From: Roozbeh <rgr...@us...> - 2006-11-29 14:12:42
|
Update of /cvsroot/dda/pub/mohrcoloumb In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv11370 Modified Files: mohrcoulomb.bib mohrcoulomb_rev.tex Log Message: Comparing between FLAC and DDA is added included table and two figs Index: mohrcoulomb_rev.tex =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/mohrcoulomb_rev.tex,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mohrcoulomb_rev.tex 23 Nov 2006 18:43:57 -0000 1.1 --- mohrcoulomb_rev.tex 29 Nov 2006 14:12:38 -0000 1.2 *************** *** 843,848 **** Figure~\ref{fig:lavarak} shows the plastic zones in the rock mass surrounding the Lavarak powerhouse. Plastic zones extend approximately ! 6 m in the wall and roof.The results from the DDA simulation are ! compared in Table~\ref{tab:results}. It is seen that the trends of rock movements obtained from the DDA are the same or similar at the monitoring points. For example, the maximum error of the tunnel --- 843,854 ---- Figure~\ref{fig:lavarak} shows the plastic zones in the rock mass surrounding the Lavarak powerhouse. Plastic zones extend approximately ! 6 m in the wall and roof. The further illustrate the capabilities of the modified DDA, ! a commercial FDM (e.g. finite difference method) code, FLAC computer program, ! which is an explicit two-dimensional stress analysis code program developed by ! Itasca ~\cite{flac:fm1998} was used for the numerical simulation. The model grid and its boundary ! conditions used in the analysis are shown in Figure~\ref{fig:flac_lavarak_grid}. ! As can be seen from Figure~\ref{fig:flac-lavarak-plastic-zone} and Table~\ref{tab:results}, plastic zone and ! displacement by FLAC and modified DDA for the pilot tunnel are in very close ! agreement with each other and with field measurements as well. It is seen that the trends of rock movements obtained from the DDA are the same or similar at the monitoring points. For example, the maximum error of the tunnel *************** *** 899,902 **** --- 905,924 ---- \end{figure} + \begin{figure} + \begin{center} + \includegraphics[width=3.5in]{figs/flac_lavarak_grid.eps} + \caption{Model grid used in the FLAC.} + \label{fig:flac_lavarak_grid} + \end{center} + \end{figure} + + \begin{figure} + \begin{center} + \includegraphics[width=3.5in]{figs/flac-lavarak-plastic-zone.eps} + \caption{FLAC simulation of Lavarak pilot tunnel. + Shaded region shows plastic zone.} + \label{fig:flac-lavarak-plastic-zone} + \end{center} + \end{figure} \begin{table}[htbp] *************** *** 924,927 **** --- 946,950 ---- In situ (mm)& 8 & 4& 1.7& 1 \\\hline DDA (mm)& 7.724& 2.986& 1.628& 0.823 \\\hline + FLAC (mm)& 9.77& 4.37& 2.26& 0.9 \\\hline Relative error& 0.0345 & 0.2535 & 0.04235 & 0.177 \\\hline \end{tabular} *************** *** 979,982 **** --- 1002,1006 ---- \newcommand{\reviewercomment}[1]{{(Reviewer's comment) \sf #1}} \newcommand{\needtodo}[1]{{(TODO) \it #1}} + \newcommand{\done}[1]{{(DONE) \it #1}} \section{TODO} *************** *** 1037,1041 **** previous paper.} ! \item \needtodo{Comparison with a established FEM or FD software (if possible).} --- 1061,1065 ---- previous paper.} ! \item \done{Comparison with a established FEM or FD software (if possible).} Index: mohrcoulomb.bib =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/mohrcoulomb.bib,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mohrcoulomb.bib 10 Apr 2006 21:37:23 -0000 1.11 --- mohrcoulomb.bib 29 Nov 2006 14:12:37 -0000 1.12 *************** *** 543,544 **** --- 543,559 ---- } + @Book{flac:fm1998, + author = {FLAC}, + title = {Fast Lagrangian Analysis of Continua (FLAC)}, + publisher = {Itasca Consulting Group}, + year = {1998}, + OPTkey = {}, + OPTvolume = {}, + OPTnumber = {}, + OPTseries = {}, + address = {Mineapolis, MN, USA}, + OPTedition = {}, + OPTmonth = {}, + OPTnote = {}, + OPTannote = {} + } |
|
From: David M. D. <do...@us...> - 2006-11-25 17:50:20
|
Update of /cvsroot/dda/modec In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20331 Modified Files: ntdda.dsp ntdda.dsw Log Message: Deleted emf, rockbolt, svg projects. Index: ntdda.dsp =================================================================== RCS file: /cvsroot/dda/modec/ntdda.dsp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ntdda.dsp 29 Jul 2006 15:47:16 -0000 1.22 --- ntdda.dsp 25 Nov 2006 17:50:16 -0000 1.23 *************** *** 82,86 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 comctl32.lib opengl32.lib glu32.lib libxml2_a.lib wsock32.lib htmlhelp.lib emf.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib iconv_a.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 /out:"bin/ntddad.exe" /pdbtype:sept /libpath:"win32/dll/emf/Debug" /libpath:"C:\ddaincludes\libxml2-2.6.24.win32\lib" /libpath:"C:\ddaincludes\iconv-1.9.2.win32\lib" /libpath:"C:\ddaincludes\zlib-1.2.3.win32\lib" /libpath:"C:\Program Files\HTML Help Workshop\lib" # SUBTRACT LINK32 /pdb:none --- 82,86 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 comctl32.lib opengl32.lib glu32.lib libxml2_a.lib wsock32.lib htmlhelp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib iconv_a.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 /out:"bin/ntddad.exe" /pdbtype:sept /libpath:"win32/dll/emf/Debug" /libpath:"C:\ddaincludes\libxml2-2.6.24.win32\lib" /libpath:"C:\ddaincludes\iconv-1.9.2.win32\lib" /libpath:"C:\ddaincludes\zlib-1.2.3.win32\lib" /libpath:"C:\Program Files\HTML Help Workshop\lib" # SUBTRACT LINK32 /pdb:none Index: ntdda.dsw =================================================================== RCS file: /cvsroot/dda/modec/ntdda.dsw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ntdda.dsw 4 Jul 2006 16:06:14 -0000 1.5 --- ntdda.dsw 25 Nov 2006 17:50:16 -0000 1.6 *************** *** 4,19 **** ############################################################################### - Project: "emf"=.\win32\dll\emf\emf.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - Project: "ntdda"=.\ntdda.dsp - Package Owner=<4> --- 4,7 ---- *************** *** 28,55 **** ############################################################################### - Project: "rockbolt"=.\WIN32\DLL\rockbolt\rockbolt.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - - Project: "svg"=.\WIN32\DLL\svg\svg.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - Global: --- 16,19 ---- |
|
From: David M. D. <do...@us...> - 2006-11-25 17:13:43
|
Update of /cvsroot/dda/CVSROOT In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv7099 Modified Files: avail Log Message: Added rooz to committer list for ntdda code. Index: avail =================================================================== RCS file: /cvsroot/dda/CVSROOT/avail,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** avail 8 Jun 2006 04:57:41 -0000 1.10 --- avail 25 Nov 2006 17:13:39 -0000 1.11 *************** *** 8,10 **** --- 8,11 ---- avail|rgrayeli|htdocs avail|rgrayeli|ddadb + avail|ntdda avail|doolin |
|
From: David M. D. <do...@us...> - 2006-11-25 17:11:38
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6303/include Modified Files: drawdialog.h Log Message: Added rooz latest patch for joint drawing. Index: drawdialog.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/drawdialog.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** drawdialog.h 5 Jun 2002 13:19:57 -0000 1.3 --- drawdialog.h 25 Nov 2006 17:11:27 -0000 1.4 *************** *** 35,37 **** --- 35,39 ---- int handleSave(HWND); + BOOL CALLBACK JointDlgProc (HWND , UINT , WPARAM , LPARAM); + |
|
From: David M. D. <do...@us...> - 2006-11-25 17:11:38
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6303/src/win32gui Modified Files: drawdialog.c jointdialog.c Log Message: Added rooz latest patch for joint drawing. Index: jointdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/jointdialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jointdialog.c 1 Aug 2006 06:16:28 -0000 1.1 --- jointdialog.c 25 Nov 2006 17:11:28 -0000 1.2 *************** *** 1,4 **** ! ! /** ! * Refactor joint dialog code here. ! */ \ No newline at end of file --- 1,67 ---- ! #define STRICT ! #include<windows.h> ! #include"resource.h" ! #include "drawdialog.h" ! //#include "joint.h" ! #include"math.h" ! ! //#include "winmain.h" ! ! #ifdef __cplusplus ! extern "C" { ! #endif ! #if 0 ! } ! #endif ! ! ! extern addJoint (hDlg); ! ! // Added by Roozbeh to Draw a Joint using dialog box ! BOOL CALLBACK ! JointDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) ! { ! extern POINT ptBegin, ptNew, ptOld; ! extern int type; ! extern double ScaleX, ScaleY; ! extern int maxSize; ! extern JOINTLIST *jointlist; ! ! switch (message) { ! case WM_INITDIALOG: ! ! SetDlgItemInt (hDlg, IDC_X1, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_Y1, 0, FALSE); ! SetDlgItemInt (hDlg, IDC_X2, 10, FALSE); ! SetDlgItemInt (hDlg, IDC_Y2, 10, FALSE); ! SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); ! ! return TRUE; ! ! case WM_COMMAND: ! switch (LOWORD (wParam)) { ! ! case IDOK: ! ! // Make this a function call with a descriptive name. ! ptBegin.x = GetDlgItemInt (hDlg, IDC_X1, NULL, TRUE); ! ptBegin.y = GetDlgItemInt (hDlg, IDC_Y1, NULL, TRUE); ! ptNew.x = GetDlgItemInt (hDlg, IDC_X2, NULL, TRUE); ! ptNew.y = GetDlgItemInt (hDlg, IDC_Y2, NULL, TRUE); ! type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); ! ptBegin.x = (long) floor (ptBegin.x / (ScaleX / maxSize)); ! ptBegin.y = (long) floor (ptBegin.y / (ScaleY / maxSize)); ! ptNew.x = (long) floor (ptNew.x / (ScaleX / maxSize)); ! ptNew.y = (long) floor (ptNew.y / (ScaleY / maxSize)); ! ! addJoint (hDlg); ! ! return FALSE; ! case IDCANCEL: ! EndDialog (hDlg, 0); ! return TRUE; ! } ! break; ! } ! return FALSE; ! } \ No newline at end of file Index: drawdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** drawdialog.c 1 Aug 2006 06:16:28 -0000 1.9 --- drawdialog.c 25 Nov 2006 17:11:28 -0000 1.10 *************** *** 1,21 **** /* File contains functions to handle the creation and editing ! * of geometry files for DDA. ! * ! * Overall behavior: ! * ! * 1. At the moment, the dialog will save and write to a file ! * any created geometry. This geometry is not passed by either ! * pointer to geometry struct or by file name to the calling * program. */ ! ! /** ! * TODO list: ! * ! * 1. Object scaling needs to be handled on object creation, and ! * the current object scale needs to be stored to allow rescaling. ! * ! * ! */ #include <math.h> --- 1,21 ---- /* File contains functions to handle the creation and editing ! * of geometry files for DDA. ! * ! * Overall behavior: ! * ! * 1. At the moment, the dialog will save and write to a file ! * any created geometry. This geometry is not passed by either ! * pointer to geometry struct or by file name to the calling * program. */ ! ! /** ! * TODO list: ! * ! * 1. Object scaling needs to be handled on object creation, and ! * the current object scale needs to be stored to allow rescaling. ! * ! * ! */ #include <math.h> *************** *** 33,47 **** #pragma warning( disable : 4115 ) #endif ! ! // Unnecessary. Prototypes are used by the compiler ! // for type checking. In this case, each of these ! // callbacks is defined before being invoked, rendering // the prototype unnecessary. - //Added by Roozbeh - //BOOL CALLBACK JointDlgProc (HWND, UINT, WPARAM, LPARAM); - //BOOL CALLBACK TunnelDlgProc (HWND, UINT, WPARAM, LPARAM); - //BOOL CALLBACK ArcDlgProc (HWND, UINT, WPARAM, LPARAM); - //BOOL CALLBACK BlockDlgProc (HWND, UINT, WPARAM, LPARAM); - //Added by Roozbeh static HINSTANCE hInstance; --- 33,41 ---- #pragma warning( disable : 4115 ) #endif ! ! // Unnecessary. Prototypes are used by the compiler ! // for type checking. In this case, each of these ! // callbacks is defined before being invoked, rendering // the prototype unnecessary. static HINSTANCE hInstance; *************** *** 81,99 **** /* FIXME: Describe function of these two scale variables. */ ! static double ScaleX, ScaleY; static int ScaledX, ScaledY; /* These are typed doubly-linked lists. See drawdialog.h, * ddadlist.c and ddadlist.c */ ! static JOINTLIST *jointlist; static POINTLIST *pointlist; static Boltlist *boltlist; ! static POINT ptBegin, ptNew, ptOld; static enum TOOLTYPE tool; ! static int type = 1, inside = 0; ! static int radius, maxSize; static HPEN hCurrentPen; static HBRUSH hCurrentBr; --- 75,95 ---- /* FIXME: Describe function of these two scale variables. */ ! double ScaleX, ScaleY; static int ScaledX, ScaledY; /* These are typed doubly-linked lists. See drawdialog.h, * ddadlist.c and ddadlist.c */ ! JOINTLIST *jointlist; static POINTLIST *pointlist; static Boltlist *boltlist; ! POINT ptBegin, ptNew, ptOld; static enum TOOLTYPE tool; ! int type = 1; ! static int inside = 0; ! static int radius; ! int maxSize; static HPEN hCurrentPen; static HBRUSH hCurrentBr; *************** *** 125,129 **** /* Mouse handling functions */ ! static void addJoint (HWND); static void addPoint (HWND); static void addBolt (HWND); --- 121,125 ---- /* Mouse handling functions */ ! void addJoint (HWND); static void addPoint (HWND); static void addBolt (HWND); *************** *** 208,216 **** - - - - - // Changed some variable names to make this less verbose. static ddaboolean --- 204,207 ---- *************** *** 232,236 **** if ((currentx > endpx2 + eps) || (currentx < endpx1 - eps)) return FALSE; ! } if (endpy1 > endpy2) { --- 223,227 ---- if ((currentx > endpx2 + eps) || (currentx < endpx1 - eps)) return FALSE; ! } if (endpy1 > endpy2) { *************** *** 268,272 **** return 0; } /* close inBoundingBoxEP */ ! static int --- 259,263 ---- return 0; } /* close inBoundingBoxEP */ ! static int *************** *** 314,321 **** } ! ! ! // This routine needs to have an associated ROP ! // to redraw the background color when the object // is deselected. static void //travis --- 305,312 ---- } ! ! ! // This routine needs to have an associated ROP ! // to redraw the background color when the object // is deselected. static void //travis *************** *** 353,357 **** } /* drawBlockBox() */ ! // Need an associated "deselection" function. static void --- 344,348 ---- } /* drawBlockBox() */ ! // Need an associated "deselection" function. static void *************** *** 365,369 **** } ! /** @todo Fix the api to not take the point struct. */ --- 356,360 ---- } ! /** @todo Fix the api to not take the point struct. */ *************** *** 396,407 **** LineTo (hdc, endp2x, endp2y); ! ! // Always use bracing, even around single statement blocks. ! // They tend to grow, reduces blunders. if (jp->is_selected) { ! drawJointHandles (jp); } } ! //Added By Roozbeh --- 387,398 ---- LineTo (hdc, endp2x, endp2y); ! ! // Always use bracing, even around single statement blocks. ! // They tend to grow, reduces blunders. if (jp->is_selected) { ! drawJointHandles (jp); } } ! //Added By Roozbeh *************** *** 419,423 **** } /* close redrawPoints *///Added By Roozbeh ! /* This produces an infinite loop and does not allow the --- 410,414 ---- } /* close redrawPoints *///Added By Roozbeh ! /* This produces an infinite loop and does not allow the *************** *** 474,478 **** } /* close handlePaint() *///Added By Roozbeh ! static void --- 465,469 ---- } /* close handlePaint() *///Added By Roozbeh ! static void *************** *** 537,541 **** } /* close handleMouseDown() */ ! static void --- 528,532 ---- } /* close handleMouseDown() */ ! static void *************** *** 592,598 **** ! ! ! static void addJoint (HWND hDlg) { --- 583,587 ---- ! void addJoint (HWND hDlg) { *************** *** 939,952 **** */ return FALSE; ! } else { ! ! // The following is some ugly shit that shot ! // through the DDA code. Leave it alone for ! // now, handle it later. /* Open file and save data. * If it exists already, delete it. ! */ ! // FIXME: OpenFile is 16 bit win32. This code needs to ! // be changed to use either CreateFile, or better yet, // find a way to use fopen. if (-1 != OpenFile (filepath.gpath, &of, OF_WRITE)) --- 928,941 ---- */ return FALSE; ! } else { ! ! // The following is some ugly shit that shot ! // through the DDA code. Leave it alone for ! // now, handle it later. /* Open file and save data. * If it exists already, delete it. ! */ ! // FIXME: OpenFile is 16 bit win32. This code needs to ! // be changed to use either CreateFile, or better yet, // find a way to use fopen. if (-1 != OpenFile (filepath.gpath, &of, OF_WRITE)) *************** *** 957,984 **** MB_OK | MB_ICONINFORMATION); return 0; ! } ! // We are going to close this here because we want to ! // fopen instead, because it is posix compliant and // CreateFile and OpenFile are MS Windows specific. ! _lclose (hFile); ! ! //////////////////////////////////////////////// ! /// Because we grabbing a new struct here, then deleting /// it afterwards, we can do cooler stuff here. geomstruct = gdata_new (); ! ! // These are all going to go away soon. transferJointlistToGeomStruct (geomstruct, jointlist); ! transferPointlistToGeomStruct (geomstruct, pointlist); transferBoltlistToGeomStruct (geomstruct, boltlist); ! ! // We use fopen for posix compliance and the file pointer // for convenience. ! fp = fopen(filepath.gpath, "w+"); // This call will be replaced shortly. geomstruct->dumptofile(geomstruct, fprintf, fp); ! fclose(fp); gdata_delete (geomstruct); --- 946,973 ---- MB_OK | MB_ICONINFORMATION); return 0; ! } ! // We are going to close this here because we want to ! // fopen instead, because it is posix compliant and // CreateFile and OpenFile are MS Windows specific. ! _lclose (hFile); ! ! //////////////////////////////////////////////// ! /// Because we grabbing a new struct here, then deleting /// it afterwards, we can do cooler stuff here. geomstruct = gdata_new (); ! ! // These are all going to go away soon. transferJointlistToGeomStruct (geomstruct, jointlist); ! transferPointlistToGeomStruct (geomstruct, pointlist); transferBoltlistToGeomStruct (geomstruct, boltlist); ! ! // We use fopen for posix compliance and the file pointer // for convenience. ! fp = fopen(filepath.gpath, "w+"); // This call will be replaced shortly. geomstruct->dumptofile(geomstruct, fprintf, fp); ! fclose(fp); gdata_delete (geomstruct); *************** *** 1098,1102 **** } else { SendMessage (hDlg, WM_COMMAND, DD_GROFF, 0L); ! } } --- 1087,1091 ---- } else { SendMessage (hDlg, WM_COMMAND, DD_GROFF, 0L); ! } } *************** *** 1160,1165 **** ! ! /// Function is scheduled for deletion. void --- 1149,1154 ---- ! ! /// Function is scheduled for deletion. void *************** *** 1169,1174 **** int numjoints; JOINTLIST *ptr; ! Joint *jtmp; ! double jscale = ScaleX/maxSize; /* just in case... */ --- 1158,1163 ---- int numjoints; JOINTLIST *ptr; ! Joint *jtmp; ! double jscale = ScaleX/maxSize; /* just in case... */ *************** *** 1183,1195 **** dlist_traverse (ptr, jointlist) { jtmp = ptr->val; ! ! // Scaling needs to be performed at initialization of each joint. ! // If the geometry is rescaled, that should be handled by traversing ! // the joint list and rescaling as a ratio between old and new scales // for existing joints. New joints go in with the new scale of course. gd->joints[i + 1][1] = jtmp->epx1 * jscale; gd->joints[i + 1][2] = jtmp->epy1 * jscale; gd->joints[i + 1][3] = jtmp->epx2 * jscale; ! gd->joints[i + 1][4] = jtmp->epy2 * jscale; gd->joints[i + 1][5] = jtmp->type; i++; --- 1172,1184 ---- dlist_traverse (ptr, jointlist) { jtmp = ptr->val; ! ! // Scaling needs to be performed at initialization of each joint. ! // If the geometry is rescaled, that should be handled by traversing ! // the joint list and rescaling as a ratio between old and new scales // for existing joints. New joints go in with the new scale of course. gd->joints[i + 1][1] = jtmp->epx1 * jscale; gd->joints[i + 1][2] = jtmp->epy1 * jscale; gd->joints[i + 1][3] = jtmp->epx2 * jscale; ! gd->joints[i + 1][4] = jtmp->epy2 * jscale; gd->joints[i + 1][5] = jtmp->type; i++; *************** *** 1490,1537 **** } /* close handleMouseUp() */ - - // Added by Roozbeh to Draw a Joint using dialog box - BOOL CALLBACK - JointDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) - { - switch (message) { - case WM_INITDIALOG: - - SetDlgItemInt (hDlg, IDC_X1, 0, FALSE); - SetDlgItemInt (hDlg, IDC_Y1, 0, FALSE); - SetDlgItemInt (hDlg, IDC_X2, 10, FALSE); - SetDlgItemInt (hDlg, IDC_Y2, 10, FALSE); - SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); - - return TRUE; - - case WM_COMMAND: - switch (LOWORD (wParam)) { - - case IDOK: - - // Make this a function call with a descriptive name. - ptBegin.x = GetDlgItemInt (hDlg, IDC_X1, NULL, TRUE); - ptBegin.y = GetDlgItemInt (hDlg, IDC_Y1, NULL, TRUE); - ptNew.x = GetDlgItemInt (hDlg, IDC_X2, NULL, TRUE); - ptNew.y = GetDlgItemInt (hDlg, IDC_Y2, NULL, TRUE); - type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); - ptBegin.x = (long) floor (ptBegin.x / (ScaleX / maxSize)); - ptBegin.y = (long) floor (ptBegin.y / (ScaleY / maxSize)); - ptNew.x = (long) floor (ptNew.x / (ScaleX / maxSize)); - ptNew.y = (long) floor (ptNew.y / (ScaleY / maxSize)); - - addJoint (hDlg); - - return FALSE; - case IDCANCEL: - EndDialog (hDlg, 0); - return TRUE; - } - break; - } - return FALSE; - } - // Added by Roozbeh to Draw a Tuunel using dialog box BOOL CALLBACK --- 1479,1482 ---- *************** *** 1603,1614 **** return FALSE; } ! ! // Added by Roozbeh to Draw a Arc using dialog box ! ! // Refactor all these messages to call functions. ! // Feel free to put them into new files. It will ! // make it easier to maintain in the future. BOOL CALLBACK ArcDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) --- 1548,1559 ---- return FALSE; } ! ! // Added by Roozbeh to Draw a Arc using dialog box ! ! // Refactor all these messages to call functions. ! // Feel free to put them into new files. It will ! // make it easier to maintain in the future. BOOL CALLBACK ArcDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) |
|
From: David M. D. <do...@us...> - 2006-11-23 18:44:01
|
Update of /cvsroot/dda/pub/mohrcoloumb In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14101 Modified Files: Makefile Added Files: mohrcoulomb_rev.tex Log Message: Added reviewer comments to paper, and some proposals for addressing those comments. --- NEW FILE: mohrcoulomb_rev.tex --- \documentclass[11pt,letter]{article} \input comment \usepackage{amsmath} %\usepackage{chicago} \usepackage{citesort} \usepackage{graphicx} \usepackage{subfigure} %\usepackage[nomarkers]{endfloat} %%% Color and doublespace do not work well together. %\usepackage{color} \usepackage{doublespace} \usepackage{url} \usepackage{algorithm,algorithmic} \usepackage[nomarkers]{endfloat} %\usepackage{color} [...1197 lines suppressed...] \subsection{Other tasks} The upshot of the above is that for R1, we simply add some work to the paper to strengthen it along the lines that the R1 suggested. For R2, we eliminate as much of the vulnerable points as that reviewer attacked, recasting the focus of the paper to render his arguments specious. We don't actually need to change any of the technical content of the paper to address R2! This is a good thing! \end{spacing} \end{document} Index: Makefile =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 18 Apr 2006 15:03:01 -0000 1.3 --- Makefile 23 Nov 2006 18:43:57 -0000 1.4 *************** *** 1,2 **** --- 1,14 ---- + + + + mohrcoulomb_rev: + latex mohrcoulomb_rev + bibtex mohrcoulomb_rev + latex mohrcoulomb_rev + latex mohrcoulomb_rev + dvipdfm mohrcoulomb_rev.dvi + + + mohrcoulomb: latex mohrcoulomb *************** *** 6,7 **** --- 18,22 ---- dvipdfm mohrcoulomb.dvi + clean: + rm -rf *.dvi *.ps *.pdf *.aux *.toc *.log *.bbl *.blg *.lot *.lof \ + *.ttt *~ *.fff \ No newline at end of file |
|
From: Roozbeh <rgr...@us...> - 2006-11-16 05:35:58
|
Update of /cvsroot/dda/pub/mohrcoloumb In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv7290 Modified Files: mohrcoulomb.tex Log Message: Adding some new items in ToDo section. Index: mohrcoulomb.tex =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/mohrcoulomb.tex,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mohrcoulomb.tex 13 May 2006 00:19:03 -0000 1.41 --- mohrcoulomb.tex 16 Nov 2006 05:35:54 -0000 1.42 *************** *** 1009,1012 **** --- 1009,1020 ---- \item [Done] Rewrite abstract as last task before submitting. + \item [TODO] Comparison with both original DDA formulation and quadratic elastic meshed DDA. + + \item [TODO] Comparison with a established Fe or FD software (if possible). + + \item [TODO] Work in more complex case. + + \item [TODO] ... + \end{itemize} \end{comment} |
|
From: Roozbeh <rgr...@us...> - 2006-10-23 16:47:49
|
Update of /cvsroot/dda/htdocs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24852 Modified Files: members.php Log Message: Added new Roozbeh_bio.htm Index: members.php =================================================================== RCS file: /cvsroot/dda/htdocs/members.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** members.php 23 Oct 2006 14:17:39 -0000 1.4 --- members.php 23 Oct 2006 16:47:43 -0000 1.5 *************** *** 39,52 **** <td width="78%"> ! ! <?php ! include("dave_bio.html"); ?> - <?php ! include("roozbeh_bio.html"); ?> - - </td> </tr> --- 39,48 ---- <td width="78%"> ! <?php ! include("dave_bio.htm"); ?> <?php ! include("Roozbeh_bio.htm"); ?> </td> </tr> |
|
From: David M. D. <do...@us...> - 2006-10-23 14:17:46
|
Update of /cvsroot/dda/htdocs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5786 Modified Files: Dave_Roozbeh_Resume.htm dda.css members.php Added Files: dave_bio.html roozbeh_bio.html Log Message: Refactored bio text into separate pages, either of which can be used as a template for adding more bios. Cleaned up the wording of the text a little bit. Index: dda.css =================================================================== RCS file: /cvsroot/dda/htdocs/dda.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dda.css 27 Jul 2006 14:42:17 -0000 1.3 --- dda.css 23 Oct 2006 14:17:39 -0000 1.4 *************** *** 1,4 **** ! h3.c3 {color: #0000FF; font-family: Arial; font-size: larger; text-align: center} /* This is used in the "featured project" area, the --- 1,9 ---- ! h3.c3 { ! color: #0000FF; ! font-family: Arial; ! font-size: larger; ! text-align: center ! } /* This is used in the "featured project" area, the *************** *** 10,13 **** --- 15,23 ---- } + + p.justify { + text-align: justify; + } + p.c1 {font-family: Times New Roman; font-size: larger; text-align: center} p.c2 {text-align: center} *************** *** 17,21 **** ! p.c7 {color: #0000FF; font-family: Times New Roman; line-height: 150%; text-align: justify} p.c8 {font-weight: bold; text-align: justify} --- 27,35 ---- ! p.c7 {color: #0000FF; ! font-family: Times New Roman; ! line-height: 150%; ! text-align: justify ! } p.c8 {font-weight: bold; text-align: justify} Index: Dave_Roozbeh_Resume.htm =================================================================== RCS file: /cvsroot/dda/htdocs/Dave_Roozbeh_Resume.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Dave_Roozbeh_Resume.htm 22 Oct 2006 18:52:01 -0000 1.1 --- Dave_Roozbeh_Resume.htm 23 Oct 2006 14:17:39 -0000 1.2 *************** *** 10,31 **** <p align="justify"><font color="#0000FF">David M. Doolin:</font></p> ! <p align="justify">David was one of people who had created this project at 2003. ! He took his Ph.D. from University of California, Berkeley at 2002 about ! mathematical structure and numerical accuracy of discontinuous deformation ! analysis with Prof. Sittar as his advisor. Many outstanding papers about DDA ! have been published by David that some of them can be found in ! <a href="references.php">References page</a>. He is currently a post-doc working on wirless sensor technology.</p> <p align="justify"><font color="#0000FF">Roozbeh Grayeli:</font></p> ! <p align="justify"> ! <span style="font-size: 12.0pt; font-family: Times New Roman">He have a bachelor ! degree in Mining Engineering from <i>Poly-technique University</i> in Iran and ! entered University of Tehran as the top student for M.Sc. degree in rock ! mechanics. He studied about Discontinuous Deformation Analysis in my masters ! thesis. The title of his thesis was <i><b>Load distribution along fully grouted ! cable bolts in discontinuous rock masses using DDA method. </b></i></span>He is ! currently interested in extending DDA for more accurate assessment of ! deformation in both 2D and 3D analysis. For more information see: ! <a href="http://www.roozbeh-Grayeli.4t.com">www.Roozbeh-Grayeli.4t.com</a></p> </body> --- 10,36 ---- <p align="justify"><font color="#0000FF">David M. Doolin:</font></p> ! <p align="justify">David was one of people who had created this ! project at 2003. He took his Ph.D. from University of California, ! Berkeley at 2002 about mathematical structure and numerical accuracy ! of discontinuous deformation analysis with Prof. Sittar as his ! advisor. Many outstanding papers about DDA have been published by ! David that some of them can be found in <a ! href="references.php">References page</a>. ! He is currently a post-doc working on wirless sensor technology.</p> + + <p align="justify"><font color="#0000FF">Roozbeh Grayeli:</font></p> ! <p align="justify"> <span style="font-size: 12.0pt; font-family: Times ! New Roman">He have a bachelor degree in Mining Engineering from ! <i>Poly-technique University</i> in Iran and entered University of ! Tehran as the top student for M.Sc. degree in rock mechanics. He ! studied about Discontinuous Deformation Analysis in my masters ! thesis. The title of his thesis was <i><b>Load distribution along ! fully grouted cable bolts in discontinuous rock masses using DDA ! method. </b></i></span>He is currently interested in extending DDA ! for more accurate assessment of deformation in both 2D and 3D ! analysis. For more information see: <a ! href="http://www.roozbeh-Grayeli.4t.com">www.Roozbeh-Grayeli.4t.com</a></p> </body> Index: members.php =================================================================== RCS file: /cvsroot/dda/htdocs/members.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** members.php 22 Oct 2006 18:52:01 -0000 1.3 --- members.php 23 Oct 2006 14:17:39 -0000 1.4 *************** *** 39,45 **** <td width="78%"> <?php ! include("Dave_Roozbeh_Resume.htm"); ?> </td> </tr> --- 39,52 ---- <td width="78%"> + <?php ! include("dave_bio.html"); ?> + + <?php + include("roozbeh_bio.html"); + ?> + + </td> </tr> --- NEW FILE: roozbeh_bio.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title></title> <style type="text/css"> /*<![CDATA[*/ p.c3 {text-align: justify} span.c2 {font-size: 12.0pt; font-family: Times New Roman} p.c1 {color: #0000FF; text-align: justify} /*]]>*/ </style> </head> <body> <p class="c1"> Roozbeh Grayeli: </p> <p class="c3"> <span class="c2">Roozbeh Grayeli earned a bachelor degree in Mining Engineering from <i>Poly-technique University</i> in Iran and entered University of Tehran as the top student for M.Sc. degree in rock mechanics. The title of his thesis is <i><b>Load distribution along fully grouted cable bolts in discontinuous rock masses using DDA method.</b></i></span> He is currently interested in extending DDA for more accurate assessment of deformation in both 2D and 3D analysis. For more information see: <a href= "http://www.roozbeh-Grayeli.4t.com">www.Roozbeh-Grayeli.4t.com</a> </p> </body> </html> --- NEW FILE: dave_bio.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Doolin Bio</title> <style type="text/css"> /*<![CDATA[*/ p.c2 {text-align: justify} p.c1 {color: #0000FF; text-align: justify} /*]]>*/ </style> </head> <body> <p class="c1"> David M. Doolin: </p> <p class="c2"> David M. Doolin took his Ph.D. from University of California, Berkeley at 2002 investigating the mathematical structure and numerical accuracy of discontinuous deformation analysis with Prof. Sitar as his advisor. One of his main interests at present is developing a freely available reference implementation of DDA to illustrate the fundamental principles of the method. Dr. Doolin is currently serving as Chief Technical Officer for <a href= "http://sensornetinc.com">SensorNet, Inc.</a> a San Francisco Bay-area startup developing wireless sensor network systems. </p> </body> </html> |
|
From: Roozbeh <rgr...@us...> - 2006-10-22 18:52:07
|
Update of /cvsroot/dda/htdocs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv22367 Modified Files: members.php Added Files: Dave_Roozbeh_Resume.htm Log Message: Added new Dave_Roozbeh_Resume.htm. --- NEW FILE: Dave_Roozbeh_Resume.htm --- <html> <head> <meta http-equiv="Content-Language" content="en-us"> <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> <title>Dave and Roozbeh Resume</title> </head> <body> <p align="justify"><font color="#0000FF">David M. Doolin:</font></p> <p align="justify">David was one of people who had created this project at 2003. He took his Ph.D. from University of California, Berkeley at 2002 about mathematical structure and numerical accuracy of discontinuous deformation analysis with Prof. Sittar as his advisor. Many outstanding papers about DDA have been published by David that some of them can be found in <a href="references.php">References page</a>. He is currently a post-doc working on wirless sensor technology.</p> <p align="justify"><font color="#0000FF">Roozbeh Grayeli:</font></p> <p align="justify"> <span style="font-size: 12.0pt; font-family: Times New Roman">He have a bachelor degree in Mining Engineering from <i>Poly-technique University</i> in Iran and entered University of Tehran as the top student for M.Sc. degree in rock mechanics. He studied about Discontinuous Deformation Analysis in my masters thesis. The title of his thesis was <i><b>Load distribution along fully grouted cable bolts in discontinuous rock masses using DDA method. </b></i></span>He is currently interested in extending DDA for more accurate assessment of deformation in both 2D and 3D analysis. For more information see: <a href="http://www.roozbeh-Grayeli.4t.com">www.Roozbeh-Grayeli.4t.com</a></p> </body> </html> Index: members.php =================================================================== RCS file: /cvsroot/dda/htdocs/members.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** members.php 10 Jul 2006 22:37:01 -0000 1.2 --- members.php 22 Oct 2006 18:52:01 -0000 1.3 *************** *** 39,51 **** <td width="78%"> ! <p class="c8"> ! Under Construction ! </p> ! <p class="c9"> ! ! </p> ! <p> ! ! </p> </td> </tr> --- 39,45 ---- <td width="78%"> ! <?php ! include("Dave_Roozbeh_Resume.htm"); ! ?> </td> </tr> |
|
From: David M. D. <do...@us...> - 2006-09-16 00:23:32
|
Update of /cvsroot/dda/htdocs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16096 Modified Files: header.php Log Message: Added google analytics link to base page. Index: header.php =================================================================== RCS file: /cvsroot/dda/htdocs/header.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** header.php 8 Jul 2006 19:36:28 -0000 1.2 --- header.php 16 Sep 2006 00:23:27 -0000 1.3 *************** *** 10,12 **** <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> ! <script src="dda.js"></script> \ No newline at end of file --- 10,19 ---- <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> ! <script src="dda.js"></script> ! ! <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> ! </script> ! <script type="text/javascript"> ! _uacct = "UA-701371-1"; ! urchinTracker(); ! </script> \ No newline at end of file |
|
From: David M. D. <do...@us...> - 2006-08-01 06:16:32
|
Update of /cvsroot/dda/ntdda/src In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5641/src Modified Files: geometrydata.c joint.c Log Message: Added some dialog files. Added some code to clean up xml output. Index: joint.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/joint.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** joint.c 1 Aug 2006 05:26:10 -0000 1.4 --- joint.c 1 Aug 2006 06:16:28 -0000 1.5 *************** *** 15,19 **** // Some indentation. #ifndef I2 ! #define I2 " " #endif --- 15,19 ---- // Some indentation. #ifndef I2 ! #define I2 " " #endif Index: geometrydata.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/geometrydata.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** geometrydata.c 17 Dec 2003 23:36:36 -0000 1.20 --- geometrydata.c 1 Aug 2006 06:16:28 -0000 1.21 *************** *** 55,61 **** /* FIXME: Completely rewrite point handling code, * for the entire project. */ ! static void ! emitPoints(Geometrydata * gd, PrintFunc printer, void * stream) { --- 55,63 ---- /* FIXME: Completely rewrite point handling code, * for the entire project. + * + * NOTE: This has been done in the modec code. */ ! void ! gdata_emit_points(Geometrydata * gd, PrintFunc printer, void * stream) { *************** *** 125,130 **** ! static void ! emitBolts(Geometrydata * gd, PrintFunc printer, void * stream) { --- 127,132 ---- ! void ! gdata_emit_bolts(Geometrydata * gd, PrintFunc printer, void * stream) { *************** *** 168,213 **** ! void ! gdata_write_ddaml(Geometrydata * gd, PrintFunc printer, char * outfilename) { ! ! ! FILE * outfile; - /* FIXME: Return an error if this fails. */ - outfile = fopen(outfilename,"w"); ! /* xml header */ printer(outfile,"<?xml version=\"1.0\" standalone=\"no\"?>\n"); printer(outfile,"<!DOCTYPE DDA SYSTEM \"geometry.dtd\">\n"); ! printer(outfile,"<Berkeley:DDA xmlns:Berkeley=\"http://www.tsoft.com/~bdoolin/dda\">\n"); /* FIXME: This is a bogosity. The parser code is broken * because it requires a comment before the <Geometry> * or <Analysis> tags. ! */ printer(outfile,"<!-- Bogus comment to keep ddaml tree-stripping\n"); printer(outfile,"from seg faulting on bad child node. -->\n\n"); printer(outfile,"<Geometry>\n"); ! printer(outfile,I1"<Edgenodedist distance=\"%f\"/>\n",gd->e00); emitJoints(gd, printer, outfile); ! emitPoints(gd, printer, outfile); ! if (gd->nBolts > 0) ! emitBolts(gd, printer, outfile); ! if (gd->nMatLines > 0) ! emitMatlines(gd, printer, outfile); printer(outfile,"</Geometry>\n"); printer(outfile,"</Berkeley:DDA>\n"); fclose(outfile); ! } /* close dumpDDAMLGeometryFile() */ --- 170,250 ---- ! void ! gdata_write_ddaml_header(double edgenode, PrintFunc printer, void * outfile) { ! ! ! /* xml header */ ! printer(outfile,"<?xml version=\"1.0\" standalone=\"no\"?>\n"); ! printer(outfile,"<!DOCTYPE DDA SYSTEM \"geometry.dtd\">\n"); ! printer(outfile,"<Berkeley:DDA xmlns:Berkeley=\"http://www.tsoft.com/~doolin/dda\">\n"); ! ! /* FIXME: This is a bogosity. The parser code is broken ! * because it requires a comment before the <Geometry> ! * or <Analysis> tags. ! */ ! /** Check on the status of this problem. */ ! printer(outfile,"<!-- Bogus comment to keep ddaml tree-stripping\n"); ! printer(outfile,"from seg faulting on bad child node. -->\n\n"); ! printer(outfile,"<Geometry>\n"); ! printer(outfile,I1"<Edgenodedist distance=\"%f\"/>\n",edgenode); ! } ! ! void ! gdata_write_ddaml_trailer(PrintFunc printer, void * outfile) { ! ! printer(outfile,"</Geometry>\n"); ! printer(outfile,"</Berkeley:DDA>\n"); ! } ! ! // FIXME: This should take a FILE * instead of a file name. ! // Makes it much more flexible. Also, the function pointer ! // in the geometry struct calls for a file pointer instead ! // of a char *. The Windows compiler just isn't smart enough ! // to catch that, because it should result in a compile error. void ! gdata_write_ddaml(Geometrydata * gd, PrintFunc printer, void * outfile) { ! gdata_write_ddaml_header(gd->e00, printer, outfile); + #if 0 /* xml header */ printer(outfile,"<?xml version=\"1.0\" standalone=\"no\"?>\n"); printer(outfile,"<!DOCTYPE DDA SYSTEM \"geometry.dtd\">\n"); ! printer(outfile,"<Berkeley:DDA xmlns:Berkeley=\"http://www.tsoft.com/~doolin/dda\">\n"); /* FIXME: This is a bogosity. The parser code is broken * because it requires a comment before the <Geometry> * or <Analysis> tags. ! */ ! /** Check on the status of this problem. */ printer(outfile,"<!-- Bogus comment to keep ddaml tree-stripping\n"); printer(outfile,"from seg faulting on bad child node. -->\n\n"); printer(outfile,"<Geometry>\n"); ! printer(outfile,I1"<Edgenodedist distance=\"%f\"/>\n",gd->e00); ! #endif ! emitJoints(gd, printer, outfile); ! gdata_emit_points(gd, printer, outfile); ! if (gd->nBolts > 0) { ! gdata_emit_bolts(gd, printer, outfile); ! } + if (gd->nMatLines > 0) { + emitMatlines(gd, printer, outfile); + } + gdata_write_ddaml_trailer(printer, outfile); + #if 0 printer(outfile,"</Geometry>\n"); printer(outfile,"</Berkeley:DDA>\n"); + #endif fclose(outfile); ! } |
|
From: David M. D. <do...@us...> - 2006-08-01 06:16:31
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5641/src/win32gui Modified Files: drawdialog.c Added Files: arcdialog.c jointdialog.c tunneldialog.c Log Message: Added some dialog files. Added some code to clean up xml output. --- NEW FILE: jointdialog.c --- /** * Refactor joint dialog code here. */ --- NEW FILE: tunneldialog.c --- /** * Refactor tunnel dialog code here. */ --- NEW FILE: arcdialog.c --- /** * * Add arc dialog code, like message handling, here. */ Index: drawdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** drawdialog.c 1 Aug 2006 05:26:10 -0000 1.8 --- drawdialog.c 1 Aug 2006 06:16:28 -0000 1.9 *************** *** 919,923 **** OPENFILENAME ofn; OFSTRUCT of; ! //FILE *fp; HFILE hFile; Geometrydata *geomstruct; --- 919,923 ---- OPENFILENAME ofn; OFSTRUCT of; ! FILE *fp; HFILE hFile; Geometrydata *geomstruct; *************** *** 939,945 **** */ return FALSE; ! } else { /* Open file and save data. ! * If it exists already, delete it. ! */ if (-1 != OpenFile (filepath.gpath, &of, OF_WRITE)) hFile = OpenFile (filepath.gpath, &of, OF_DELETE); --- 939,953 ---- */ return FALSE; ! } else { ! ! // The following is some ugly shit that shot ! // through the DDA code. Leave it alone for ! // now, handle it later. ! /* Open file and save data. ! * If it exists already, delete it. ! */ ! // FIXME: OpenFile is 16 bit win32. This code needs to ! // be changed to use either CreateFile, or better yet, ! // find a way to use fopen. if (-1 != OpenFile (filepath.gpath, &of, OF_WRITE)) hFile = OpenFile (filepath.gpath, &of, OF_DELETE); *************** *** 949,953 **** MB_OK | MB_ICONINFORMATION); return 0; ! } //////////////////////////////////////////////// --- 957,965 ---- MB_OK | MB_ICONINFORMATION); return 0; ! } ! // We are going to close this here because we want to ! // fopen instead, because it is posix compliant and ! // CreateFile and OpenFile are MS Windows specific. ! _lclose (hFile); //////////////////////////////////////////////// *************** *** 955,977 **** /// it afterwards, we can do cooler stuff here. geomstruct = gdata_new (); - - transferJointlistToGeomStruct (geomstruct, jointlist); - transferPointlistToGeomStruct (geomstruct, pointlist); transferBoltlistToGeomStruct (geomstruct, boltlist); - //fp = fopen(filepath.gpath, "w+"); //Disabled by Roozbeh - //geomstruct->dumptofile(geomstruct, fprintf, fp); //Disabled by Roozbeh - geomstruct->dumptofile (geomstruct, fprintf, filepath.gpath); - //fclose(fp); //Disabled by Roozbeh gdata_delete (geomstruct); ! /* FIXME: These functions are segfaulting. */ //freeJointList(); //freePointList(); //freeBoltList(); ! _lclose (hFile); SetClassLong (hDlg, GCL_HCURSOR, (long) LoadCursor (NULL, IDC_ARROW)); ReleaseDC (hDlg, hdc); --- 967,993 ---- /// it afterwards, we can do cooler stuff here. geomstruct = gdata_new (); + + // These are all going to go away soon. + transferJointlistToGeomStruct (geomstruct, jointlist); + transferPointlistToGeomStruct (geomstruct, pointlist); transferBoltlistToGeomStruct (geomstruct, boltlist); + + // We use fopen for posix compliance and the file pointer + // for convenience. + fp = fopen(filepath.gpath, "w+"); + // This call will be replaced shortly. + geomstruct->dumptofile(geomstruct, fprintf, fp); + fclose(fp); gdata_delete (geomstruct); ! /* FIXME: These functions are segfaulting. Fix them. */ //freeJointList(); //freePointList(); //freeBoltList(); ! //_lclose (hFile); SetClassLong (hDlg, GCL_HCURSOR, (long) LoadCursor (NULL, IDC_ARROW)); ReleaseDC (hDlg, hdc); |
|
From: David M. D. <do...@us...> - 2006-08-01 06:16:31
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5641/include Modified Files: geometrydata.h joint.h Log Message: Added some dialog files. Added some code to clean up xml output. Index: joint.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/joint.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** joint.h 1 Aug 2006 05:26:10 -0000 1.3 --- joint.h 1 Aug 2006 06:16:28 -0000 1.4 *************** *** 18,22 **** /** @todo Change to incomplete type. */ struct _joint { ! int type; double epx1, epy1, epx2, epy2; double length; --- 18,22 ---- /** @todo Change to incomplete type. */ struct _joint { ! int type; double epx1, epy1, epx2, epy2; double length; *************** *** 33,39 **** */ double friction; ! double cohesion; ! double tension; ! int type; }; --- 33,39 ---- */ double friction; ! double cohesion; ! double tension; ! int type; }; *************** *** 64,67 **** --- 64,83 ---- int type); + int joint_get_type (Joint * j); + void joint_set_type (Joint * j, + int type); + + + void joint_set_endpoints (Joint * j, + double epx1, + double epy1, + double epx2, + double epy2); + + /** + * The scale factor is new_scale/old_scale. + */ + void joint_rescale (Joint * j, + double scale_factor); void joint_print_xml (Joint * j, Index: geometrydata.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/geometrydata.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** geometrydata.h 6 Jul 2006 02:28:37 -0000 1.18 --- geometrydata.h 1 Aug 2006 06:16:28 -0000 1.19 *************** *** 298,302 **** char * filename); ! Geometrydata * gdata_read_block_file (Filepaths * filepaths); #ifdef __cplusplus --- 298,314 ---- char * filename); ! Geometrydata * gdata_read_block_file (Filepaths * filepaths); ! ! ! // Temporary while some xml handling code is being rewritten. ! void gdata_emit_points (Geometrydata * gd, ! PrintFunc printer, ! void * stream); ! ! // Temporary while some xml handling code is being rewritten. ! void gdata_emit_bolts (Geometrydata * gd, ! PrintFunc printer, ! void * stream); ! #ifdef __cplusplus |
|
From: David M. D. <do...@us...> - 2006-08-01 06:16:31
|
Update of /cvsroot/dda/ntdda In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5641 Modified Files: ntdda.dsp Log Message: Added some dialog files. Added some code to clean up xml output. Index: ntdda.dsp =================================================================== RCS file: /cvsroot/dda/ntdda/ntdda.dsp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** ntdda.dsp 31 Jul 2006 02:15:28 -0000 1.43 --- ntdda.dsp 1 Aug 2006 06:16:27 -0000 1.44 *************** *** 191,194 **** --- 191,198 ---- # Begin Source File + SOURCE=.\src\win32gui\arcdialog.c + # End Source File + # Begin Source File + SOURCE=.\src\win32gui\drawdialog.c # End Source File *************** *** 203,206 **** --- 207,218 ---- # Begin Source File + SOURCE=.\src\win32gui\jointdialog.c + # End Source File + # Begin Source File + + SOURCE=.\src\win32gui\tunneldialog.c + # End Source File + # Begin Source File + SOURCE=.\src\unitdialog.c # End Source File |
|
From: David M. D. <do...@us...> - 2006-08-01 05:26:14
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21197/src/win32gui Modified Files: drawdialog.c Log Message: Added rooz patched for dialog handling. Index: drawdialog.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** drawdialog.c 31 Jul 2006 02:13:19 -0000 1.7 --- drawdialog.c 1 Aug 2006 05:26:10 -0000 1.8 *************** *** 1,5 **** /* File contains functions to handle the creation and editing ! * of geometry files for DDA. */ #include <math.h> --- 1,21 ---- /* File contains functions to handle the creation and editing ! * of geometry files for DDA. ! * ! * Overall behavior: ! * ! * 1. At the moment, the dialog will save and write to a file ! * any created geometry. This geometry is not passed by either ! * pointer to geometry struct or by file name to the calling ! * program. */ + + /** + * TODO list: + * + * 1. Object scaling needs to be handled on object creation, and + * the current object scale needs to be stored to allow rescaling. + * + * + */ #include <math.h> *************** *** 17,22 **** #pragma warning( disable : 4115 ) #endif - BOOL CALLBACK JointDlgProc (HWND, UINT, WPARAM, LPARAM); static HINSTANCE hInstance; --- 33,48 ---- #pragma warning( disable : 4115 ) #endif + + // Unnecessary. Prototypes are used by the compiler + // for type checking. In this case, each of these + // callbacks is defined before being invoked, rendering + // the prototype unnecessary. + //Added by Roozbeh + //BOOL CALLBACK JointDlgProc (HWND, UINT, WPARAM, LPARAM); + //BOOL CALLBACK TunnelDlgProc (HWND, UINT, WPARAM, LPARAM); + //BOOL CALLBACK ArcDlgProc (HWND, UINT, WPARAM, LPARAM); + //BOOL CALLBACK BlockDlgProc (HWND, UINT, WPARAM, LPARAM); + //Added by Roozbeh static HINSTANCE hInstance; *************** *** 187,192 **** ! ! static ddaboolean //entirely trg error here inBoundingBox (Joint * jp, POINT p, double eps) { --- 213,218 ---- ! // Changed some variable names to make this less verbose. ! static ddaboolean inBoundingBox (Joint * jp, POINT p, double eps) { *************** *** 206,210 **** if ((currentx > endpx2 + eps) || (currentx < endpx1 - eps)) return FALSE; ! } if (endpy1 > endpy2) { if ((currenty < endpy2 - eps) || (currenty > endpy1 + eps)) --- 232,237 ---- if ((currentx > endpx2 + eps) || (currentx < endpx1 - eps)) return FALSE; ! } ! if (endpy1 > endpy2) { if ((currenty < endpy2 - eps) || (currenty > endpy1 + eps)) *************** *** 241,246 **** return 0; } /* close inBoundingBoxEP */ ! static int //trg edit-->added BBox closetoJoint (Joint * jp, POINT p) { --- 268,274 ---- return 0; } /* close inBoundingBoxEP */ + ! static int closetoJoint (Joint * jp, POINT p) { *************** *** 278,282 **** ! static double //trg distBtwPoints (POINT p1, POINT p2) { --- 306,310 ---- ! static double distBtwPoints (POINT p1, POINT p2) { *************** *** 286,290 **** } ! static void //travis //drawBlackSquare(DPoint * ptmp, int radius) --- 314,322 ---- } ! ! ! // This routine needs to have an associated ROP ! // to redraw the background color when the object ! // is deselected. static void //travis //drawBlackSquare(DPoint * ptmp, int radius) *************** *** 321,325 **** } /* drawBlockBox() */ ! static void drawJointHandles (Joint * jp) --- 353,358 ---- } /* drawBlockBox() */ ! ! // Need an associated "deselection" function. static void drawJointHandles (Joint * jp) *************** *** 332,335 **** --- 365,369 ---- } + /** @todo Fix the api to not take the point struct. */ *************** *** 346,350 **** ! } /* close drawJointHandles() */ --- 380,384 ---- ! } *************** *** 362,368 **** LineTo (hdc, endp2x, endp2y); ! if (jp->is_selected) ! drawJointHandles (jp); ! } /* close drawJoint() */ //Added By Roozbeh --- 396,407 ---- LineTo (hdc, endp2x, endp2y); ! ! // Always use bracing, even around single statement blocks. ! // They tend to grow, reduces blunders. ! if (jp->is_selected) { ! drawJointHandles (jp); ! } ! } ! //Added By Roozbeh *************** *** 380,383 **** --- 419,423 ---- } /* close redrawPoints *///Added By Roozbeh + /* This produces an infinite loop and does not allow the *************** *** 434,437 **** --- 474,478 ---- } /* close handlePaint() *///Added By Roozbeh + static void *************** *** 496,499 **** --- 537,541 ---- } /* close handleMouseDown() */ + static void *************** *** 584,587 **** --- 626,630 ---- /* Now draw to screen */ + SelectObject (hdc, drawPen[type]); //Added By Roozbeh to draw type of line with various color MoveToEx (hdc, ptBegin.x, ptBegin.y, NULL); LineTo (hdc, ptNew.x, ptNew.y); *************** *** 625,638 **** RECT drawSize; int orig_x, orig_y, ext_x, ext_y; - - HANDLE h; - HBITMAP hbm; - - context = selection; ! ! ! /* Start test code for dialog param passing */ --- 668,676 ---- RECT drawSize; int orig_x, orig_y, ext_x, ext_y; + //HANDLE h; + //HBITMAP hbm; ! context = selection; /* Start test code for dialog param passing */ *************** *** 659,663 **** jointlist = dlist_new (); pointlist = dlist_new (); - //boltlist = make_dl(); boltlist = boltlist_new (); --- 697,700 ---- *************** *** 665,671 **** GetWindowRect (GetDlgItem (hDlg, IDC_DRAWSPACE), &drawSize); hdc = GetDC (GetDlgItem (hDlg, IDC_DRAWSPACE)); // i think this is DEADLY wrong TRG getDC does not "validate" ! ! ! SetClassLong (GetDlgItem (hDlg, IDC_DRAWSPACE), GCL_HCURSOR, --- 702,706 ---- GetWindowRect (GetDlgItem (hDlg, IDC_DRAWSPACE), &drawSize); hdc = GetDC (GetDlgItem (hDlg, IDC_DRAWSPACE)); // i think this is DEADLY wrong TRG getDC does not "validate" ! SetClassLong (GetDlgItem (hDlg, IDC_DRAWSPACE), GCL_HCURSOR, *************** *** 915,924 **** return 0; } ! geomstruct = gdata_new (); - transferJointlistToGeomStruct (geomstruct, jointlist); transferPointlistToGeomStruct (geomstruct, pointlist); transferBoltlistToGeomStruct (geomstruct, boltlist); --- 950,962 ---- return 0; } ! ! //////////////////////////////////////////////// ! /// Because we grabbing a new struct here, then deleting ! /// it afterwards, we can do cooler stuff here. geomstruct = gdata_new (); transferJointlistToGeomStruct (geomstruct, jointlist); transferPointlistToGeomStruct (geomstruct, pointlist); + transferBoltlistToGeomStruct (geomstruct, boltlist); *************** *** 995,999 **** ! // TODO: Combine this code with the code in graphics.c static void --- 1033,1037 ---- ! // TODO: Combine this code with the code in graphics.c static void *************** *** 1040,1049 **** dl_delete_node (pointlist->blink); ! if (grid) SendMessage (hDlg, WM_COMMAND, DD_GRON, 0L); ! else SendMessage (hDlg, WM_COMMAND, DD_GROFF, 0L); ! } /* close handleRemovePoint() */ --- 1078,1088 ---- dl_delete_node (pointlist->blink); ! if (grid) { SendMessage (hDlg, WM_COMMAND, DD_GRON, 0L); ! } else { SendMessage (hDlg, WM_COMMAND, DD_GROFF, 0L); + } ! } *************** *** 1072,1076 **** } ! } /* close drawPoints */ --- 1111,1115 ---- } ! } *************** *** 1105,1109 **** ! void transferJointlistToGeomStruct (Geometrydata * gd, JOINTLIST * jointlist) --- 1144,1150 ---- ! ! ! /// Function is scheduled for deletion. void transferJointlistToGeomStruct (Geometrydata * gd, JOINTLIST * jointlist) *************** *** 1112,1116 **** int numjoints; JOINTLIST *ptr; ! Joint *jtmp; /* just in case... */ numjoints = dlist_length (jointlist); --- 1153,1159 ---- int numjoints; JOINTLIST *ptr; ! Joint *jtmp; ! double jscale = ScaleX/maxSize; ! /* just in case... */ numjoints = dlist_length (jointlist); *************** *** 1124,1132 **** dlist_traverse (ptr, jointlist) { jtmp = ptr->val; ! ! gd->joints[i + 1][1] = jtmp->epx1 * (ScaleX / maxSize); //Added (ScaleX/maxSize) term by Roozbeh ! gd->joints[i + 1][2] = jtmp->epy1 * (ScaleX / maxSize); //Added (ScaleX/maxSize) term by Roozbeh ! gd->joints[i + 1][3] = jtmp->epx2 * (ScaleX / maxSize); //Added (ScaleX/maxSize) term by Roozbeh ! gd->joints[i + 1][4] = jtmp->epy2 * (ScaleX / maxSize); //Added (ScaleX/maxSize) term by Roozbeh gd->joints[i + 1][5] = jtmp->type; i++; --- 1167,1179 ---- dlist_traverse (ptr, jointlist) { jtmp = ptr->val; ! ! // Scaling needs to be performed at initialization of each joint. ! // If the geometry is rescaled, that should be handled by traversing ! // the joint list and rescaling as a ratio between old and new scales ! // for existing joints. New joints go in with the new scale of course. ! gd->joints[i + 1][1] = jtmp->epx1 * jscale; ! gd->joints[i + 1][2] = jtmp->epy1 * jscale; ! gd->joints[i + 1][3] = jtmp->epx2 * jscale; ! gd->joints[i + 1][4] = jtmp->epy2 * jscale; gd->joints[i + 1][5] = jtmp->type; i++; *************** *** 1134,1138 **** ! } /* close transferJointlistToGeomStruct() */ --- 1181,1185 ---- ! } *************** *** 1426,1431 **** ReleaseCapture (); } /* close handleMouseUp() */ - BOOL CALLBACK JointDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) --- 1473,1479 ---- ReleaseCapture (); } /* close handleMouseUp() */ + + // Added by Roozbeh to Draw a Joint using dialog box BOOL CALLBACK JointDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) *************** *** 1443,1449 **** case WM_COMMAND: ! switch (LOWORD (wParam)) { ! case IDOK: ptBegin.x = GetDlgItemInt (hDlg, IDC_X1, NULL, TRUE); ptBegin.y = GetDlgItemInt (hDlg, IDC_Y1, NULL, TRUE); --- 1491,1499 ---- case WM_COMMAND: ! switch (LOWORD (wParam)) { + case IDOK: + + // Make this a function call with a descriptive name. ptBegin.x = GetDlgItemInt (hDlg, IDC_X1, NULL, TRUE); ptBegin.y = GetDlgItemInt (hDlg, IDC_Y1, NULL, TRUE); *************** *** 1468,1471 **** --- 1518,1735 ---- } + // Added by Roozbeh to Draw a Tuunel using dialog box + BOOL CALLBACK + TunnelDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) + { + double r0, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg; + double xc, yc, rad; + int i, se = 20; + + switch (message) { + case WM_INITDIALOG: + + SetDlgItemInt (hDlg, IDC_XC, 0, FALSE); + SetDlgItemInt (hDlg, IDC_YC, 0, FALSE); + SetDlgItemInt (hDlg, IDC_SEG, 20, FALSE); + SetDlgItemInt (hDlg, IDC_RAD, 10, FALSE); + SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); + + return TRUE; + + case WM_COMMAND: + switch (LOWORD (wParam)) { + case IDOK: + + deg = 360; + r0 = ((3.1415926535) * deg) / (se * 180); + xc = GetDlgItemInt (hDlg, IDC_XC, NULL, TRUE); + yc = GetDlgItemInt (hDlg, IDC_YC, NULL, TRUE); + se = GetDlgItemInt (hDlg, IDC_SEG, NULL, TRUE); + rad = GetDlgItemInt (hDlg, IDC_RAD, NULL, TRUE); + type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); + x1 = xc + rad; + y1 = yc; + x2 = xc; + y2 = yc; + x0 = x2; + y0 = y2; + x3 = x1; + y3 = y1; + for (i = 1; i < se; i++) { + u = ((x1 - x0) * (cos (r0) - 1)) - ((y1 - y0) * sin (r0)); + v = ((x1 - x0) * sin (r0)) + ((y1 - y0) * (cos (r0) - 1)); + + x2 = x1 + u; + y2 = y1 + v; + ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); + ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); + ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); + ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); + addJoint (hDlg); + x1 = x2; + y1 = y2; + } + x2 = x3; + y2 = y3; + ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); + ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); + ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); + ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); + addJoint (hDlg); + + return FALSE; + case IDCANCEL: + EndDialog (hDlg, 0); + return TRUE; + } + break; + } + return FALSE; + } + + + + // Added by Roozbeh to Draw a Arc using dialog box + + // Refactor all these messages to call functions. + // Feel free to put them into new files. It will + // make it easier to maintain in the future. + BOOL CALLBACK + ArcDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) + { + double r0, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg; + double xc, yc, xs, ys, xe, ye; + int i, se = 20; + + switch (message) { + case WM_INITDIALOG: + + SetDlgItemInt (hDlg, IDC_XC, 0, FALSE); + SetDlgItemInt (hDlg, IDC_YC, 0, FALSE); + SetDlgItemInt (hDlg, IDC_XS, 0, FALSE); + SetDlgItemInt (hDlg, IDC_YS, 0, FALSE); + SetDlgItemInt (hDlg, IDC_XE, 0, FALSE); + SetDlgItemInt (hDlg, IDC_YE, 0, FALSE); + SetDlgItemInt (hDlg, IDC_SEG, 20, FALSE); + SetDlgItemInt (hDlg, IDC_DEG, 180, FALSE); + SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); + + return TRUE; + + case WM_COMMAND: + switch (LOWORD (wParam)) { + case IDOK: + + xc = GetDlgItemInt (hDlg, IDC_XC, NULL, TRUE); + yc = GetDlgItemInt (hDlg, IDC_YC, NULL, TRUE); + xs = GetDlgItemInt (hDlg, IDC_XS, NULL, TRUE); + ys = GetDlgItemInt (hDlg, IDC_YS, NULL, TRUE); + xe = GetDlgItemInt (hDlg, IDC_XE, NULL, TRUE); + ye = GetDlgItemInt (hDlg, IDC_YE, NULL, TRUE); + se = GetDlgItemInt (hDlg, IDC_SEG, NULL, TRUE); + deg = GetDlgItemInt (hDlg, IDC_DEG, NULL, TRUE); + type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); + r0 = ((3.1415926535) * deg) / (se * 180); + x1 = xs; + y1 = ys; + x2 = xc; + y2 = yc; + x0 = x2; + y0 = y2; + x3 = xe; + y3 = ye; + for (i = 1; i < se; i++) { + u = ((x1 - x0) * (cos (r0) - 1)) - ((y1 - y0) * sin (r0)); + v = ((x1 - x0) * sin (r0)) + ((y1 - y0) * (cos (r0) - 1)); + + x2 = x1 + u; + y2 = y1 + v; + ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); + ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); + ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); + ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); + addJoint (hDlg); + x1 = x2; + y1 = y2; + } + x2 = x3; + y2 = y3; + ptBegin.x = (long) floor (x1 / (ScaleX / maxSize)); + ptBegin.y = (long) floor (y1 / (ScaleY / maxSize)); + ptNew.x = (long) floor (x2 / (ScaleX / maxSize)); + ptNew.y = (long) floor (y2 / (ScaleY / maxSize)); + addJoint (hDlg); + + return FALSE; + case IDCANCEL: + EndDialog (hDlg, 0); + return TRUE; + } + break; + } + return FALSE; + } + + // Added by Roozbeh to Draw a Block using dialog box + BOOL CALLBACK + BlockDlgProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) + { + double xl, yl, xu, yu; + + switch (message) { + case WM_INITDIALOG: + + SetDlgItemInt (hDlg, IDC_XL, 0, FALSE); + SetDlgItemInt (hDlg, IDC_YL, 0, FALSE); + SetDlgItemInt (hDlg, IDC_XU, 0, FALSE); + SetDlgItemInt (hDlg, IDC_YU, 0, FALSE); + SetDlgItemInt (hDlg, IDC_TYPE, 1, FALSE); + + return TRUE; + + case WM_COMMAND: + switch (LOWORD (wParam)) { + case IDOK: + + xl = GetDlgItemInt (hDlg, IDC_XL, NULL, TRUE); + yl = GetDlgItemInt (hDlg, IDC_YL, NULL, TRUE); + xu = GetDlgItemInt (hDlg, IDC_XU, NULL, TRUE); + yu = GetDlgItemInt (hDlg, IDC_YU, NULL, TRUE); + type = GetDlgItemInt (hDlg, IDC_TYPE, NULL, TRUE); + + ptBegin.x = (long) floor (xl / (ScaleX / maxSize)); + ptBegin.y = (long) floor (yl / (ScaleY / maxSize)); + ptNew.x = (long) floor (xu / (ScaleX / maxSize)); + ptNew.y = (long) floor (yl / (ScaleY / maxSize)); + addJoint (hDlg); + + ptBegin.x = (long) floor (xu / (ScaleX / maxSize)); + ptBegin.y = (long) floor (yl / (ScaleY / maxSize)); + ptNew.x = (long) floor (xu / (ScaleX / maxSize)); + ptNew.y = (long) floor (yu / (ScaleY / maxSize)); + addJoint (hDlg); + + ptBegin.x = (long) floor (xu / (ScaleX / maxSize)); + ptBegin.y = (long) floor (yu / (ScaleY / maxSize)); + ptNew.x = (long) floor (xl / (ScaleX / maxSize)); + ptNew.y = (long) floor (yu / (ScaleY / maxSize)); + addJoint (hDlg); + + ptBegin.x = (long) floor (xl / (ScaleX / maxSize)); + ptBegin.y = (long) floor (yu / (ScaleY / maxSize)); + ptNew.x = (long) floor (xl / (ScaleX / maxSize)); + ptNew.y = (long) floor (yl / (ScaleY / maxSize)); + addJoint (hDlg); + + return FALSE; + case IDCANCEL: + EndDialog (hDlg, 0); + return TRUE; + } + break; + } + return FALSE; + } + static int handleWMCommand (HWND hDlg, UINT iMessage, LPARAM lParam, WPARAM wParam) *************** *** 1534,1544 **** --- 1798,1818 ---- break; + //Added by Roozbeh case IDC_JOINT: DialogBox (hInstance, MAKEINTRESOURCE (IDD_JOINT), NULL, JointDlgProc); break; + case IDC_TUNNEL: + DialogBox (hInstance, MAKEINTRESOURCE (IDD_TUNNEL), NULL, TunnelDlgProc); + break; + case IDC_ARC: + DialogBox (hInstance, MAKEINTRESOURCE (IDD_ARC), NULL, ArcDlgProc); + break; + case IDC_BLOCK: + DialogBox (hInstance, MAKEINTRESOURCE (IDD_BLOCK), NULL, BlockDlgProc); break; + //Added by Roozbeh case DD_BOLT1: |
|
From: David M. D. <do...@us...> - 2006-08-01 05:26:14
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21197/include Modified Files: Dda.rc joint.h resource.h Log Message: Added rooz patched for dialog handling. Index: joint.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/joint.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** joint.h 5 Jun 2002 13:19:57 -0000 1.2 --- joint.h 1 Aug 2006 05:26:10 -0000 1.3 *************** *** 2,5 **** --- 2,7 ---- #ifndef __JOINT_H__ #define __JOINT_H__ + + #include <ddatypes.h> #ifdef __cplusplus *************** *** 62,65 **** --- 64,71 ---- int type); + + void joint_print_xml (Joint * j, + PrintFunc printer, + void * stream); #ifdef __cplusplus Index: Dda.rc =================================================================== RCS file: /cvsroot/dda/ntdda/include/Dda.rc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Dda.rc 25 Jul 2006 15:54:41 -0000 1.8 --- Dda.rc 1 Aug 2006 05:26:10 -0000 1.9 *************** *** 213,217 **** EXSTYLE WS_EX_TOOLWINDOW CAPTION "New Geometry" ! FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "Save",IDOK,321,5,33,14 --- 213,217 ---- EXSTYLE WS_EX_TOOLWINDOW CAPTION "New Geometry" ! FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Save",IDOK,321,5,33,14 *************** *** 620,624 **** END ! IDD_JOINT DIALOG DISCARDABLE 100, 100, 227, 102 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Joint" --- 620,624 ---- END ! IDD_JOINT DIALOG DISCARDABLE 100, 100, 227, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Joint" *************** *** 629,642 **** EDITTEXT IDC_X1,52,55,45,15,ES_AUTOHSCROLL EDITTEXT IDC_X2,114,55,45,15,ES_AUTOHSCROLL ! EDITTEXT IDC_Y1,53,79,45,15,ES_AUTOHSCROLL ! EDITTEXT IDC_Y2,115,79,45,15,ES_AUTOHSCROLL EDITTEXT IDC_TYPE,66,17,45,15,ES_AUTOHSCROLL LTEXT "Joint Type",IDC_STATIC,19,19,37,11 ! LTEXT "X-Coord",IDC_STATIC,7,59,29,11 ! LTEXT "Y-Coord",IDC_STATIC,7,82,29,11 LTEXT "Start Point",IDC_STATIC,58,40,34,11 LTEXT "End Point",IDC_STATIC,119,40,34,11 END #ifdef APSTUDIO_INVOKED --- 629,709 ---- EDITTEXT IDC_X1,52,55,45,15,ES_AUTOHSCROLL EDITTEXT IDC_X2,114,55,45,15,ES_AUTOHSCROLL ! EDITTEXT IDC_Y1,52,79,45,15,ES_AUTOHSCROLL ! EDITTEXT IDC_Y2,114,79,45,15,ES_AUTOHSCROLL EDITTEXT IDC_TYPE,66,17,45,15,ES_AUTOHSCROLL LTEXT "Joint Type",IDC_STATIC,19,19,37,11 ! LTEXT "X-Coord",IDC_STATIC,14,58,29,11 ! LTEXT "Y-Coord",IDC_STATIC,13,82,29,11 LTEXT "Start Point",IDC_STATIC,58,40,34,11 LTEXT "End Point",IDC_STATIC,119,40,34,11 END + IDD_TUNNEL DIALOG DISCARDABLE 100, 100, 273, 106 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Tuunel" + FONT 8, "MS Sans Serif" + BEGIN + DEFPUSHBUTTON "Apply",IDOK,216,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,216,24,50,14 + EDITTEXT IDC_XC,47,55,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_SEG,189,55,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_YC,47,79,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_TYPE,61,17,45,15,ES_AUTOHSCROLL + LTEXT "Joint Type",IDC_STATIC,14,19,37,11 + LTEXT "X-Coord",IDC_STATIC,9,58,29,11 + LTEXT "Y-Coord",IDC_STATIC,8,82,29,11 + LTEXT "Center point",IDC_STATIC,50,40,42,11 + LTEXT "Nember of Segment",IDC_STATIC,110,57,70,11 + EDITTEXT IDC_RAD,189,78,45,15,ES_AUTOHSCROLL + LTEXT "Radius",IDC_STATIC,150,81,27,11 + END + + IDD_ARC DIALOG DISCARDABLE 100, 100, 312, 146 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Arc" + FONT 8, "MS Sans Serif" + BEGIN + DEFPUSHBUTTON "Apply",IDOK,255,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,255,24,50,14 + EDITTEXT IDC_XC,48,84,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_SEG,197,22,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_YC,48,108,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_TYPE,62,21,45,15,ES_AUTOHSCROLL + LTEXT "Joint Type",IDC_STATIC,15,23,37,11 + LTEXT "X-Coord",IDC_STATIC,10,87,29,11 + LTEXT "Y-Coord",IDC_STATIC,9,111,29,11 + LTEXT "Nember of Segment",IDC_STATIC,118,24,70,11 + EDITTEXT IDC_DEG,197,45,45,15,ES_AUTOHSCROLL + LTEXT "Degree of Arc (deg.)",IDC_STATIC,118,48,70,11 + LTEXT "Center point",IDC_STATIC,51,70,42,11 + EDITTEXT IDC_XS,114,85,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_YS,115,109,45,15,ES_AUTOHSCROLL + LTEXT "Start point",IDC_STATIC,118,71,42,11 + EDITTEXT IDC_XE,186,84,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_YE,187,108,45,15,ES_AUTOHSCROLL + LTEXT "End point",IDC_STATIC,190,71,42,11 + LTEXT "Note: All data from start to end point should be arranged in counterclockwise direction", + IDC_STATIC,9,130,270,8 + END + + IDD_BLOCK DIALOG DISCARDABLE 100, 100, 226, 106 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Block" + FONT 8, "MS Sans Serif" + BEGIN + DEFPUSHBUTTON "OK",IDOK,169,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,169,24,50,14 + EDITTEXT IDC_XL,47,55,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_XU,123,55,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_YL,47,79,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_YU,123,79,45,15,ES_AUTOHSCROLL + EDITTEXT IDC_TYPE,66,17,45,15,ES_AUTOHSCROLL + LTEXT "Joint Type",IDC_STATIC,19,19,37,11 + LTEXT "X-Coord",IDC_STATIC,9,58,29,11 + LTEXT "Y-Coord",IDC_STATIC,8,82,29,11 + LTEXT "Lower Corner",IDC_STATIC,50,40,42,11 + LTEXT "Upper Corner",IDC_STATIC,124,40,45,11 + END + #ifdef APSTUDIO_INVOKED *************** *** 774,778 **** RIGHTMARGIN, 220 TOPMARGIN, 7 ! BOTTOMMARGIN, 95 END END --- 841,869 ---- RIGHTMARGIN, 220 TOPMARGIN, 7 ! BOTTOMMARGIN, 99 ! END ! ! IDD_TUNNEL, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 266 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 99 ! END ! ! IDD_ARC, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 306 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 139 ! END ! ! IDD_BLOCK, DIALOG ! BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 219 ! TOPMARGIN, 7 ! BOTTOMMARGIN, 99 END END Index: resource.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/resource.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** resource.h 25 Jul 2006 15:54:41 -0000 1.4 --- resource.h 1 Aug 2006 05:26:10 -0000 1.5 *************** *** 98,101 **** --- 98,104 ---- #define IDD_CONTACT 170 #define IDD_JOINT 171 + #define IDD_TUNNEL 172 + #define IDD_ARC 173 + #define IDD_BLOCK 174 #define IDD_DIALOG1 200 #define IDD_BLOCKPROPS 200 *************** *** 167,172 **** --- 170,188 ---- #define IDC_X1 1074 #define IDC_BLOCK 1075 + #define IDC_XC 1075 #define IDC_TUNNEL 1076 + #define IDC_YC 1076 #define IDC_JSET 1077 + #define IDC_SEG 1077 + #define IDC_RAD 1078 + #define IDC_XS 1079 + #define IDC_YS 1080 + #define IDC_XE 1081 + #define IDC_YE 1082 + #define IDC_DEG 1083 + #define IDC_XL 1084 + #define IDC_YL 1085 + #define IDC_XU 1086 + #define IDC_YU 1087 #define IDC_LISTBOX3 1102 #define GD_SAVE 1102 *************** *** 363,369 **** #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 ! #define _APS_NEXT_RESOURCE_VALUE 172 #define _APS_NEXT_COMMAND_VALUE 40062 ! #define _APS_NEXT_CONTROL_VALUE 1075 #define _APS_NEXT_SYMED_VALUE 101 #endif --- 379,385 ---- #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 ! #define _APS_NEXT_RESOURCE_VALUE 175 #define _APS_NEXT_COMMAND_VALUE 40062 ! #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 101 #endif |
|
From: David M. D. <do...@us...> - 2006-08-01 05:26:14
|
Update of /cvsroot/dda/ntdda/src In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21197/src Modified Files: joint.c Log Message: Added rooz patched for dialog handling. Index: joint.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/joint.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** joint.c 6 Jun 2002 13:41:55 -0000 1.3 --- joint.c 1 Aug 2006 05:26:10 -0000 1.4 *************** *** 12,16 **** #endif ! /** @todo Add code for supporting Joints as --- 12,21 ---- #endif ! ! // Some indentation. ! #ifndef I2 ! #define I2 " " ! #endif ! /** @todo Add code for supporting Joints as *************** *** 99,103 **** void ! jointmat_set_tension (Jointmat * jm, double tension) { jm->tension = tension; --- 104,108 ---- void ! jointmat_set_tension (Jointmat * jm, double tension) { jm->tension = tension; *************** *** 106,110 **** int ! jointmat_get_type (Jointmat * jm) { return jm->type; --- 111,115 ---- int ! jointmat_get_type (Jointmat * jm) { return jm->type; *************** *** 112,119 **** void ! jointmat_set_type (Jointmat * jm, int type) { jm->type = type; } #ifdef __cplusplus --- 117,135 ---- void ! jointmat_set_type (Jointmat * jm, int type) { jm->type = type; } + + + void + joint_print_xml (Joint * j, PrintFunc printer, void * stream) { + + + printer(stream,I2"<Joint type=\"%d\">",j->type); + printer(stream," %14.10f %14.10f %14.10f %14.10f ", + j->epx1, j->epy1, j->epx2, j->epy2); + printer(stream,"</Joint>\n"); + } #ifdef __cplusplus |
