[commit] r1853 - trunk/GME/Gme
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Mar 7 15:09:58 CST 2012
Author: ksmyth
Date: Wed Mar 7 15:09:58 2012
New Revision: 1853
Log:
Increase maximum number of interpreters
Modified:
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Gme/MainFrm.cpp
trunk/GME/Gme/resource.h
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Wed Mar 7 11:30:39 2012 (r1852)
+++ trunk/GME/Gme/GMEApp.cpp Wed Mar 7 15:09:58 2012 (r1853)
@@ -107,10 +107,10 @@
// MRU - most recently used project menu
ON_UPDATE_COMMAND_UI(ID_FILE_MRU_PRJ1, OnUpdateRecentProjectMenu)
ON_COMMAND_EX_RANGE(ID_FILE_MRU_PRJ1, ID_FILE_MRU_PRJ16, OnOpenRecentProject)
- ON_COMMAND_RANGE(ID_FILE_RUNPLUGIN1, ID_FILE_RUNPLUGIN8, OnRunPlugin)
- ON_COMMAND_RANGE(ID_FILE_INTERPRET1, ID_FILE_INTERPRET18, OnRunInterpreter)
- ON_UPDATE_COMMAND_UI_RANGE( ID_FILE_RUNPLUGIN1, ID_FILE_RUNPLUGIN8, OnUpdateFilePluginX)
- ON_UPDATE_COMMAND_UI_RANGE( ID_FILE_INTERPRET1, ID_FILE_INTERPRET18, OnUpdateFileInterpretX)
+ ON_COMMAND_RANGE(ID_FILE_RUNPLUGIN1, ID_FILE_RUNPLUGIN_LAST, OnRunPlugin)
+ ON_COMMAND_RANGE(ID_FILE_INTERPRET1, ID_FILE_INTERPRET_LAST, OnRunInterpreter)
+ ON_UPDATE_COMMAND_UI_RANGE( ID_FILE_RUNPLUGIN1, ID_FILE_RUNPLUGIN_LAST, OnUpdateFilePluginX)
+ ON_UPDATE_COMMAND_UI_RANGE( ID_FILE_INTERPRET1, ID_FILE_INTERPRET_LAST, OnUpdateFileInterpretX)
ON_COMMAND(ID_FOCUS_BROWSER, OnFocusBrowser)
ON_COMMAND(ID_FOCUS_INSPECTOR, OnFocusInspector)
END_MESSAGE_MAP()
@@ -867,17 +867,19 @@
// Traversing the plugins and interpreters
- for(int i = 0; i < plugins.GetSize() + interpreters.GetSize(); ++i)
+ int plugins_size = min(plugins.GetSize(), ID_FILE_RUNPLUGIN_LAST - ID_FILE_RUNPLUGIN1);
+ int interpreters_size = min(interpreters.GetSize(), ID_FILE_INTERPRET_LAST - ID_FILE_INTERPRET1);
+ for(int i = 0; i < plugins_size + interpreters_size; ++i)
{
// Querying component name
CComBSTR componentName;
- if(i < plugins.GetSize()) // if it is a plugin
+ if(i < plugins_size) // if it is a plugin
{
componentName = plugins[i];
}
else // if it is an interpreter
{
- componentName = interpreters[i-plugins.GetSize()];
+ componentName = interpreters[i-plugins_size];
}
// Obtaining ToolTip
@@ -888,7 +890,7 @@
{
toolTip = componentName;
}
- if(i < plugins.GetSize())
+ if(i < plugins_size)
{
pluginTooltips.Add(toolTip);
}
@@ -952,14 +954,14 @@
ASSERT(succ == TRUE);
// Adding button
- INT_PTR commandID = (i < plugins.GetSize()) ? ID_FILE_RUNPLUGIN1 + i : ID_FILE_INTERPRET1 + i - plugins.GetSize();
+ INT_PTR commandID = (i < plugins_size) ? ID_FILE_RUNPLUGIN1 + i : ID_FILE_INTERPRET1 + i - plugins_size;
CMFCToolBarButton toolBarButton(commandID, nIndex, componentName + '\n' + toolTip, TRUE);
- componentBar.InsertButton(toolBarButton);
+ VERIFY(componentBar.InsertButton(toolBarButton) != -1);
if (hModule)
FreeLibrary(hModule);
}
- if (plugins.GetSize() + interpreters.GetSize() != 0) {
+ if (plugins_size + interpreters_size != 0) {
componentBar.AdjustLayout(); // CMFCToolBar::AdjustLayout
componentBar.AdjustSizeImmediate(TRUE);
componentBar.RecalcLayout(); // CPane::RecalcLayout
@@ -1081,7 +1083,7 @@
} else {
CMenu pluginmenu;
pluginmenu.CreatePopupMenu();
- for(int i = 0; i < plugins.GetSize(); ++i) {
+ for(int i = 0; i < min(plugins.GetSize(), ID_FILE_RUNPLUGIN_LAST - ID_FILE_RUNPLUGIN1); ++i) {
pluginmenu.AppendMenu(MF_ENABLED, ID_FILE_RUNPLUGIN1 + i, pluginTooltips[i]);
}
toolmenu->InsertMenu(idx,
@@ -1101,7 +1103,7 @@
} else {
CMenu pluginmenu;
pluginmenu.CreatePopupMenu();
- for(int i = 0; i < interpreters.GetSize(); ++i) {
+ for(int i = 0; i < min(interpreters.GetSize(), ID_FILE_INTERPRET1 - ID_FILE_INTERPRET_LAST); ++i) {
pluginmenu.AppendMenu(MF_ENABLED, ID_FILE_INTERPRET1 + i, interpreterTooltips[i]);
}
toolmenu->InsertMenu(idx,
@@ -2933,14 +2935,14 @@
void CGMEApp::OnUpdateFilePluginX(CCmdUI* pCmdUI)
{
bool enabled = m_vecDisabledPlugIns.find( pCmdUI->m_nID) == m_vecDisabledPlugIns.end();
- if( pCmdUI->m_nID >= ID_FILE_RUNPLUGIN1 && pCmdUI->m_nID <= ID_FILE_RUNPLUGIN8)
+ if( pCmdUI->m_nID >= ID_FILE_RUNPLUGIN1 && pCmdUI->m_nID <= ID_FILE_RUNPLUGIN_LAST)
pCmdUI->Enable( enabled );
}
void CGMEApp::OnUpdateFileInterpretX(CCmdUI* pCmdUI)
{
bool enabled = m_vecDisabledComps.find( pCmdUI->m_nID) == m_vecDisabledComps.end();
- if( pCmdUI->m_nID >= ID_FILE_INTERPRET1 && pCmdUI->m_nID <= ID_FILE_INTERPRET18)
+ if( pCmdUI->m_nID >= ID_FILE_INTERPRET1 && pCmdUI->m_nID <= ID_FILE_INTERPRET_LAST)
pCmdUI->Enable( enabled );
}
Modified: trunk/GME/Gme/MainFrm.cpp
==============================================================================
--- trunk/GME/Gme/MainFrm.cpp Wed Mar 7 11:30:39 2012 (r1852)
+++ trunk/GME/Gme/MainFrm.cpp Wed Mar 7 15:09:58 2012 (r1853)
@@ -46,11 +46,11 @@
if (pButton) {
UINT nID = pButton->m_nID;
- if(nID >= ID_FILE_RUNPLUGIN1 && nID <= ID_FILE_RUNPLUGIN8) {
+ if(nID >= ID_FILE_RUNPLUGIN1 && nID <= ID_FILE_RUNPLUGIN_LAST) {
_tcsncpy(pTTT->szText, theApp.pluginTooltips[nID-ID_FILE_RUNPLUGIN1], 79);
return FALSE;
}
- if(nID >= ID_FILE_INTERPRET1 && nID <= ID_FILE_INTERPRET18) {
+ if(nID >= ID_FILE_INTERPRET1 && nID <= ID_FILE_INTERPRET_LAST) {
_tcsncpy(pTTT->szText, theApp.interpreterTooltips[nID-ID_FILE_INTERPRET1], 79);
return FALSE;
}
Modified: trunk/GME/Gme/resource.h
==============================================================================
--- trunk/GME/Gme/resource.h Wed Mar 7 11:30:39 2012 (r1852)
+++ trunk/GME/Gme/resource.h Wed Mar 7 15:09:58 2012 (r1853)
@@ -301,32 +301,6 @@
#define ID_FILE_REGCOMPONENTS 32875
#define ID_FILE_UPDATETHROUGHXML 32876
#define ID_VIEW_ATTRIBUTES 32879
-#define ID_FILE_RUNPLUGIN1 32880
-#define ID_FILE_RUNPLUGIN2 32881
-#define ID_FILE_RUNPLUGIN3 32882
-#define ID_FILE_RUNPLUGIN4 32883
-#define ID_FILE_RUNPLUGIN5 32884
-#define ID_FILE_RUNPLUGIN6 32885
-#define ID_FILE_RUNPLUGIN7 32886
-#define ID_FILE_RUNPLUGIN8 32887
-#define ID_FILE_INTERPRET1 32890
-#define ID_FILE_INTERPRET2 32891
-#define ID_FILE_INTERPRET3 32892
-#define ID_FILE_INTERPRET4 32893
-#define ID_FILE_INTERPRET5 32894
-#define ID_FILE_INTERPRET6 32895
-#define ID_FILE_INTERPRET7 32896
-#define ID_FILE_INTERPRET8 32897
-#define ID_FILE_INTERPRET9 32898
-#define ID_FILE_INTERPRET10 32899
-#define ID_FILE_INTERPRET11 32900
-#define ID_FILE_INTERPRET12 32901
-#define ID_FILE_INTERPRET13 32902
-#define ID_FILE_INTERPRET14 32903
-#define ID_FILE_INTERPRET15 32904
-#define ID_FILE_INTERPRET16 32905
-#define ID_FILE_INTERPRET17 32906
-#define ID_FILE_INTERPRET18 32907
#define ID_FILE_SAVEPROJECTAS 32908
#define ID_FILE_ABORTPROJECT 32909
#define ID_ATTRIBUTE_CHANGE 32910
@@ -473,6 +447,68 @@
#define ID_VIEW_CYCLEASPECTBACKWARDSKEY 33111
#define ID_VIEW_RENAME 33112
#define ID_VIEW_TOOLBARS 33200
+
+
+#define ID_FILE_RUNPLUGIN1 33201
+#define ID_FILE_RUNPLUGIN2 33202
+#define ID_FILE_RUNPLUGIN3 33203
+#define ID_FILE_RUNPLUGIN4 33204
+#define ID_FILE_RUNPLUGIN5 33205
+#define ID_FILE_RUNPLUGIN6 33206
+#define ID_FILE_RUNPLUGIN7 33207
+#define ID_FILE_RUNPLUGIN8 33208
+#define ID_FILE_RUNPLUGIN_LAST ID_FILE_RUNPLUGIN8
+#define ID_FILE_INTERPRET1 33211
+#define ID_FILE_INTERPRET2 33212
+#define ID_FILE_INTERPRET3 33213
+#define ID_FILE_INTERPRET4 33214
+#define ID_FILE_INTERPRET5 33215
+#define ID_FILE_INTERPRET6 33216
+#define ID_FILE_INTERPRET7 33217
+#define ID_FILE_INTERPRET8 33218
+#define ID_FILE_INTERPRET9 33219
+#define ID_FILE_INTERPRET10 33220
+#define ID_FILE_INTERPRET11 33221
+#define ID_FILE_INTERPRET12 33222
+#define ID_FILE_INTERPRET13 33223
+#define ID_FILE_INTERPRET14 33224
+#define ID_FILE_INTERPRET15 33225
+#define ID_FILE_INTERPRET16 33226
+#define ID_FILE_INTERPRET17 33227
+#define ID_FILE_INTERPRET18 33228
+#define ID_FILE_INTERPRET19 33229
+#define ID_FILE_INTERPRET20 33230
+#define ID_FILE_INTERPRET21 33231
+#define ID_FILE_INTERPRET22 33232
+#define ID_FILE_INTERPRET23 33233
+#define ID_FILE_INTERPRET24 33234
+#define ID_FILE_INTERPRET25 33235
+#define ID_FILE_INTERPRET26 33236
+#define ID_FILE_INTERPRET27 33237
+#define ID_FILE_INTERPRET28 33238
+#define ID_FILE_INTERPRET29 33239
+#define ID_FILE_INTERPRET30 33240
+#define ID_FILE_INTERPRET31 33241
+#define ID_FILE_INTERPRET32 33242
+#define ID_FILE_INTERPRET33 33243
+#define ID_FILE_INTERPRET34 33244
+#define ID_FILE_INTERPRET35 33245
+#define ID_FILE_INTERPRET36 33246
+#define ID_FILE_INTERPRET37 33247
+#define ID_FILE_INTERPRET38 33248
+#define ID_FILE_INTERPRET39 33249
+#define ID_FILE_INTERPRET40 33250
+#define ID_FILE_INTERPRET41 33251
+#define ID_FILE_INTERPRET42 33252
+#define ID_FILE_INTERPRET43 33253
+#define ID_FILE_INTERPRET44 33254
+#define ID_FILE_INTERPRET45 33255
+#define ID_FILE_INTERPRET46 33256
+#define ID_FILE_INTERPRET47 33257
+#define ID_FILE_INTERPRET48 33258
+#define ID_FILE_INTERPRET49 33259
+#define ID_FILE_INTERPRET_LAST ID_FILE_INTERPRET49
+
#define IDW_TOOLBAR_MAIN 0xE820
#define IDW_TOOLBAR_WINS 0xE821
#define IDW_TOOLBAR_COMPONENT 0xE822
More information about the gme-commit
mailing list