[GME-commit] GMESRC/GME/MgaUtil GmeDlg.cpp,1.7,1.8 GmeDlg.h,1.6,1.7
MgaRegistrar.cpp,1.38,1.39 MgaRegistrar.h,1.16,1.17
MgaUtil.rc,1.39,1.40 resource.h,1.24,1.25
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Aug 25 16:36:34 CDT 2004
Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv9882/GME/MgaUtil
Modified Files:
GmeDlg.cpp GmeDlg.h MgaRegistrar.cpp MgaRegistrar.h MgaUtil.rc
resource.h
Log Message:
Optional label avoidance for connections
CVS User: volgy
Index: GmeDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/GmeDlg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GmeDlg.cpp 2 Mar 2004 21:51:28 -0000 1.7
--- GmeDlg.cpp 25 Aug 2004 20:36:32 -0000 1.8
***************
*** 31,34 ****
--- 31,35 ----
m_ext_enable = FALSE;
m_ext_editor = _T("");
+ m_labelavoidance = FALSE;
//}}AFX_DATA_INIT
}
***************
*** 49,52 ****
--- 50,54 ----
DDX_Check(pDX, IDC_EXT_ENABLE, m_ext_enable);
DDX_Text(pDX, IDC_EXT_EDITOR, m_ext_editor);
+ DDX_Check(pDX, IDC_LABELAVOIDANCE, m_labelavoidance);
//}}AFX_DATA_MAP
}
***************
*** 158,161 ****
--- 160,169 ----
COMTHROW( registrar->get_ExternalEditor(REGACCESS_USER, PutOut(m_ext_editor)) );
+
+ // Autorouter
+ VARIANT_BOOL labelavoidance;
+ COMTHROW( registrar->get_LabelAvoidance(REGACCESS_USER, &labelavoidance) );
+ m_labelavoidance = (labelavoidance == VARIANT_FALSE) ? FALSE : TRUE;
+
}
MSGCATCH("Error while initializing GmeDlg",;)
***************
*** 204,207 ****
--- 212,219 ----
COMTHROW( registrar->put_ExternalEditor(REGACCESS_USER, PutInBstr(m_ext_editor)) );
+
+ // Autorouter
+ VARIANT_BOOL labelavoidance = (m_labelavoidance == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
+ COMTHROW( registrar->put_LabelAvoidance(REGACCESS_USER, labelavoidance) );
}
Index: GmeDlg.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/GmeDlg.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GmeDlg.h 2 Mar 2004 21:51:28 -0000 1.6
--- GmeDlg.h 25 Aug 2004 20:36:32 -0000 1.7
***************
*** 32,35 ****
--- 32,36 ----
BOOL m_ext_enable;
CString m_ext_editor;
+ BOOL m_labelavoidance;
//}}AFX_DATA
Index: MgaRegistrar.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaRegistrar.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** MgaRegistrar.cpp 22 Jul 2004 16:14:33 -0000 1.38
--- MgaRegistrar.cpp 25 Aug 2004 20:36:32 -0000 1.39
***************
*** 502,505 ****
--- 502,557 ----
}
+
+ STDMETHODIMP CMgaRegistrar::get_LabelAvoidance(regaccessmode_enum mode, VARIANT_BOOL *enabled)
+ {
+ COMTRY
+ {
+ LONG res;
+ CString str;
+ if(mode & RM_USER) {
+ CRegKey mga;
+ res = mga.Open(HKEY_CURRENT_USER, rootreg, KEY_READ);
+ if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
+ if(res == ERROR_SUCCESS) {
+ str = QueryValue(mga, "LabelAvoidance");
+ if(!str.IsEmpty()) {
+ REVOKE_SYS2(mode);
+ }
+ }
+ }
+ if(mode & (RM_SYSDOREAD)) {
+ CRegKey mga;
+ res = mga.Open(HKEY_LOCAL_MACHINE, rootreg, KEY_READ);
+ if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
+ if(res == ERROR_SUCCESS) {
+ str = QueryValue(mga, "LabelAvoidance");
+ }
+ }
+ *enabled = (str == "1") ? VARIANT_TRUE : VARIANT_FALSE; // Default value: false
+ }
+ COMCATCH(;)
+ }
+
+
+ STDMETHODIMP CMgaRegistrar::put_LabelAvoidance(regaccessmode_enum mode, VARIANT_BOOL enabled)
+ {
+ COMTRY
+ {
+ CString str = (enabled == VARIANT_FALSE) ? "0" : "1";
+ if(mode & RM_USER) {
+ CRegKey mga;
+ ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
+ ERRTHROW( mga.SetValue(str, "LabelAvoidance") );
+ }
+ if(mode & (RM_SYS | RM_TEST)) {
+ CRegKey mga;
+ ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
+ if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "LabelAvoidance") );
+ }
+ }
+ COMCATCH(;)
+ }
+
+
STDMETHODIMP CMgaRegistrar::get_Paradigms(regaccessmode_enum mode, VARIANT *names)
{
Index: MgaRegistrar.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaRegistrar.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MgaRegistrar.h 20 Jul 2004 13:55:47 -0000 1.16
--- MgaRegistrar.h 25 Aug 2004 20:36:32 -0000 1.17
***************
*** 45,48 ****
--- 45,50 ----
STDMETHOD(get_ExternalEditor)(regaccessmode_enum mode, BSTR *path);
STDMETHOD(put_ExternalEditor)(regaccessmode_enum mode, BSTR path);
+ STDMETHOD(get_LabelAvoidance)(regaccessmode_enum mode, VARIANT_BOOL *enabled);
+ STDMETHOD(put_LabelAvoidance)(regaccessmode_enum mode, VARIANT_BOOL enabled);
STDMETHOD(get_Paradigms)(regaccessmode_enum mode, VARIANT *names);
Index: MgaUtil.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaUtil.rc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** MgaUtil.rc 20 Jul 2004 13:55:47 -0000 1.39
--- MgaUtil.rc 25 Aug 2004 20:36:32 -0000 1.40
***************
*** 65,69 ****
END
! IDD_GMEDLG DIALOG DISCARDABLE 0, 0, 247, 246
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GME properties"
--- 65,69 ----
END
! IDD_GMEDLG DIALOG DISCARDABLE 0, 0, 247, 275
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GME properties"
***************
*** 96,104 ****
PUSHBUTTON "...",IDC_AUTOSAVE_DIR_BUTTON,205,175,30,14
CONTROL "Open model in multiple views",IDC_MULTIPLE_OPEN,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,205,107,10
CONTROL "Enable Event Logging",IDC_EVENT_LOGGING,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,130,205,86,10
! DEFPUSHBUTTON "OK",IDOK,50,225,50,15
! PUSHBUTTON "Cancel",IDCANCEL,140,225,50,15
END
--- 96,107 ----
PUSHBUTTON "...",IDC_AUTOSAVE_DIR_BUTTON,205,175,30,14
CONTROL "Open model in multiple views",IDC_MULTIPLE_OPEN,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,10,235,107,10
CONTROL "Enable Event Logging",IDC_EVENT_LOGGING,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,125,235,86,10
! DEFPUSHBUTTON "OK",IDOK,48,252,50,15
! PUSHBUTTON "Cancel",IDCANCEL,139,252,50,15
! GROUPBOX "Autorouter",IDC_STATIC,5,200,235,25
! CONTROL "Connections keep clear of labels",IDC_LABELAVOIDANCE,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,210,119,10
END
***************
*** 629,633 ****
RIGHTMARGIN, 240
TOPMARGIN, 7
! BOTTOMMARGIN, 239
END
--- 632,636 ----
RIGHTMARGIN, 240
TOPMARGIN, 7
! BOTTOMMARGIN, 266
END
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/resource.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** resource.h 30 Jun 2004 17:50:47 -0000 1.24
--- resource.h 25 Aug 2004 20:36:32 -0000 1.25
***************
*** 176,179 ****
--- 176,180 ----
#define IDC_LIST1 2241
#define IDC_LIBR3 2242
+ #define IDC_LABELAVOIDANCE 2243
#define ID_CNTX_ADDNODE 32774
#define ID_CNTX_CLEARNODE 32775
***************
*** 187,191 ****
#define _APS_NEXT_RESOURCE_VALUE 2067
#define _APS_NEXT_COMMAND_VALUE 32778
! #define _APS_NEXT_CONTROL_VALUE 2243
#define _APS_NEXT_SYMED_VALUE 2091
#endif
--- 188,192 ----
#define _APS_NEXT_RESOURCE_VALUE 2067
#define _APS_NEXT_COMMAND_VALUE 32778
! #define _APS_NEXT_CONTROL_VALUE 2244
#define _APS_NEXT_SYMED_VALUE 2091
#endif
More information about the GME-commit
mailing list