[Dda-cvs] ntdda/include Dda.rc, 1.8, 1.9 joint.h, 1.2, 1.3 resource.h, 1.4, 1.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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