[GME-commit] GMESRC/GME/Gme GMEView.cpp,1.158,1.159
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jan 5 14:07:04 CST 2005
Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv11044
Modified Files:
GMEView.cpp
Log Message:
Paste Closure/Smart introduced.
CVS User: zolmol
Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** GMEView.cpp 12 Nov 2004 15:09:49 -0000 1.158
--- GMEView.cpp 5 Jan 2005 20:07:01 -0000 1.159
***************
*** 273,279 ****
ON_COMMAND(ID_CNTX_ATTRIBUTES, OnCntxAttributes)
ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
- ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateEditCopy)
ON_COMMAND(ID_EDIT_COPYCLOSURE, OnEditCopyClosure)
ON_COMMAND(ID_EDIT_COPYSMART, OnEditCopySmart)
ON_UPDATE_COMMAND_UI(ID_EDIT_COPYCLOSURE, OnUpdateEditCopyClosure)
ON_UPDATE_COMMAND_UI(ID_EDIT_COPYSMART, OnUpdateEditCopySmart)
--- 273,279 ----
ON_COMMAND(ID_CNTX_ATTRIBUTES, OnCntxAttributes)
ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
ON_COMMAND(ID_EDIT_COPYCLOSURE, OnEditCopyClosure)
ON_COMMAND(ID_EDIT_COPYSMART, OnEditCopySmart)
+ ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateEditCopy)
ON_UPDATE_COMMAND_UI(ID_EDIT_COPYCLOSURE, OnUpdateEditCopyClosure)
ON_UPDATE_COMMAND_UI(ID_EDIT_COPYSMART, OnUpdateEditCopySmart)
***************
*** 330,336 ****
ON_COMMAND(ID_FILE_CHECKSEL, OnFileCheckSelected)
ON_COMMAND(ID_CNTX_INTERPRET, OnCntxInterpret)
- ON_COMMAND(ID_CNTX_CHECK, OnCntxCheck)
ON_UPDATE_COMMAND_UI(ID_CNTX_INTERPRET, OnUpdateCntxInterpret)
- ON_UPDATE_COMMAND_UI(ID_CNTX_CHECK, OnUpdateCntxCheck)
ON_COMMAND(ID_CNTX_REGISTRY, OnCntxRegistry)
ON_COMMAND(ID_EDIT_REGISTRY, OnEditRegistry)
--- 330,334 ----
***************
*** 344,350 ****
--- 342,350 ----
ON_COMMAND(ID_EDIT_PASTESPECIAL_ASREFERENCE, OnEditPastespecialAsreference)
ON_COMMAND(ID_EDIT_PASTESPECIAL_ASSUBTYPE, OnEditPastespecialAssubtype)
+ ON_COMMAND(ID_EDIT_PASTESPECIAL_ASCLOSURE, OnEditPastespecialAsclosure)
ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASINSTANCE, OnUpdateEditPastespecialAsinstance)
ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASREFERENCE, OnUpdateEditPastespecialAsreference)
ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASSUBTYPE, OnUpdateEditPastespecialAssubtype)
+ ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASCLOSURE, OnUpdateEditPastespecialAsclosure)
ON_COMMAND(ID_CNTX_PASTESPECIAL_ASINSTANCE, OnCntxPastespecialAsinstance)
ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_ASINSTANCE, OnUpdateCntxPastespecialAsinstance)
***************
*** 353,356 ****
--- 353,358 ----
ON_COMMAND(ID_CNTX_PASTESPECIAL_ASSUBTYPE, OnCntxPastespecialAssubtype)
ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_ASSUBTYPE, OnUpdateCntxPastespecialAssubtype)
+ ON_COMMAND(ID_CNTX_PASTESPECIAL_ASCLOSURE, OnCntxPastespecialAsclosure)
+ ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_ASCLOSURE, OnUpdateCntxPastespecialAsclosure)
ON_COMMAND(ID_CNTX_REDIRECTIONPASTE, OnCntxRedirectionpaste)
ON_UPDATE_COMMAND_UI(ID_CNTX_REDIRECTIONPASTE, OnUpdateCntxRedirectionpaste)
***************
*** 377,381 ****
ON_COMMAND(ID_CNTX_SRCAR_SET, OnCntxSrcarSet)
ON_COMMAND(ID_CNTX_DSTAR_SET, OnCntxDstarSet)
- ON_COMMAND(ID_PRINT_METAFILE, OnPrintMetafile)
ON_UPDATE_COMMAND_UI( ID_CNTX_DSTAR_NORTH, OnUpdateCntxAutoRouters )
ON_UPDATE_COMMAND_UI( ID_CNTX_SRCAR_SOUTH, OnUpdateCntxAutoRouters )
--- 379,382 ----
***************
*** 389,392 ****
--- 390,394 ----
ON_UPDATE_COMMAND_UI( ID_CNTX_SRCAR_SET, OnUpdateCntxAutoRouters )
ON_UPDATE_COMMAND_UI( ID_CNTX_DSTAR_SET, OnUpdateCntxAutoRouters )
+ ON_COMMAND(ID_PRINT_METAFILE, OnPrintMetafile)
//}}AFX_MSG_MAP
// Standard printing commands
***************
*** 2434,2438 ****
! bool CGMEView::DoPasteItem(COleDataObject* pDataObject,bool drag,bool move,bool reference,bool derive,bool instance,CGuiObject *ref,CPoint pt)
{
CGMEEventLogger::LogGMEEvent("CGMEView::DoPasteItem");
--- 2436,2440 ----
! bool CGMEView::DoPasteItem(COleDataObject* pDataObject,bool drag,bool move,bool reference,bool derive,bool instance,bool closure,CGuiObject *ref,CPoint pt)
{
CGMEEventLogger::LogGMEEvent("CGMEView::DoPasteItem");
***************
*** 2447,2450 ****
--- 2449,2454 ----
if(instance)
CGMEEventLogger::LogGMEEvent(" INSTANCE");
+ if(closure)
+ CGMEEventLogger::LogGMEEvent(" CLOSURE");
CGMEEventLogger::LogGMEEvent(" in "+path+name+"\r\n");
if(ref)
***************
*** 2458,2462 ****
CWaitCursor wait;
! if (CGMEDataSource::IsGmeNativeDataAvailable(pDataObject,theApp.mgaProject))
{
ok = DoPasteNative(pDataObject,drag,move,reference,derive,instance,ref,pt);
--- 2462,2466 ----
CWaitCursor wait;
! if (CGMEDataSource::IsGmeNativeDataAvailable(pDataObject,theApp.mgaProject) && !closure)
{
ok = DoPasteNative(pDataObject,drag,move,reference,derive,instance,ref,pt);
***************
*** 2464,2468 ****
--- 2468,2474 ----
else if( CGMEDataSource::IsXMLDataAvailable(pDataObject) )
{
+ if( closure) theApp.mgaConstMgr->Enable( false); // if closure is inserted disable the constraint manager ...
ok = CGMEDataSource::ParseXMLData(pDataObject, currentModel);
+ if( closure) theApp.mgaConstMgr->Enable( true); // ... and enable it after done
}
else
***************
*** 2565,2572 ****
COMTHROW(newFcos.CoCreateInstance(L"Mga.MgaFCOs"));
! CComPtr<IMgaMetaFCO> metaFco;
COMTHROW(currentModel->get_Meta(&metaFco));
CComPtr<IMgaMetaModel> metaModel;
! COMTHROW(metaFco.QueryInterface(&metaModel));
bool normalExit = true;
HRESULT hr = S_OK;
--- 2571,2578 ----
COMTHROW(newFcos.CoCreateInstance(L"Mga.MgaFCOs"));
! /*CComPtr<IMgaMetaFCO> metaFco;
COMTHROW(currentModel->get_Meta(&metaFco));
CComPtr<IMgaMetaModel> metaModel;
! COMTHROW(metaFco.QueryInterface(&metaModel));*/ // commented by zolmol, these vars are NOT used
bool normalExit = true;
HRESULT hr = S_OK;
***************
*** 2675,2682 ****
else {
COMTHROW(newFcos.CoCreateInstance(L"Mga.MgaFCOs"));
! CComPtr<IMgaMetaFCO> metaFco;
COMTHROW(currentModel->get_Meta(&metaFco));
CComPtr<IMgaMetaModel> metaModel;
! COMTHROW(metaFco.QueryInterface(&metaModel));
MGACOLL_ITERATE(IMgaFCO,fcos) {
CComPtr<IMgaFCO> fco;
--- 2681,2688 ----
else {
COMTHROW(newFcos.CoCreateInstance(L"Mga.MgaFCOs"));
! /*CComPtr<IMgaMetaFCO> metaFco;
COMTHROW(currentModel->get_Meta(&metaFco));
CComPtr<IMgaMetaModel> metaModel;
! COMTHROW(metaFco.QueryInterface(&metaModel));*/ // commented by zolmol, these vars are NOT used
MGACOLL_ITERATE(IMgaFCO,fcos) {
CComPtr<IMgaFCO> fco;
***************
*** 4200,4203 ****
--- 4206,4210 ----
derivedDrop,
instanceDrop,
+ false,
((guiRef || compRef) && !sameTarget) ? target : 0,
point);
***************
*** 4848,4852 ****
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,false,false,false,0,contextMenuLocation);
}
}
--- 4855,4859 ----
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,false,false,false,false,0,contextMenuLocation);
}
}
***************
*** 5285,5313 ****
}
- void CGMEView::OnCntxCheck()
- {
- CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxCheck\r\n");
- CGMEEventLogger::LogGMEEvent(" Selected FCOs:");
- GMEEVENTLOG_GUIFCOS(selected);
-
- ASSERT(theApp.mgaConstMgr);
- if(!theApp.mgaConstMgr)
- return;
-
- MSGTRY
- {
- CComPtr<IMgaFCO> selfco;
-
- if (selected.IsEmpty())
- selfco = currentModel;
- else
- {
- POSITION pos = selected.GetHeadPosition();
- selfco = selected.GetNext(pos)->mgaFco;
- }
- theApp.mgaConstMgr->ObjectsInvokeEx(theApp.mgaProject, selfco, NULL, NULL);
- }
- MSGCATCH("Error while trying to check the selected or current model",;)
- }
void CGMEView::OnCntxInterpret()
--- 5292,5295 ----
***************
*** 5343,5350 ****
}
- void CGMEView::OnUpdateCntxCheck(CCmdUI* pCmdUI)
- {
- pCmdUI->Enable(!selected.IsEmpty() || currentModel != NULL);
- }
void CGMEView::OnUpdateCntxInterpret(CCmdUI* pCmdUI)
--- 5325,5328 ----
***************
*** 5689,5692 ****
--- 5667,5681 ----
}
+ void CGMEView::OnEditPastespecialAsclosure()
+ {
+ CGMEEventLogger::LogGMEEvent("CGMEView::OnEditPastespecialAssubtype in "+path+name+"\r\n");
+ if(isType) {
+ COleDataObject clipboardData;
+ clipboardData.AttachClipboard();
+ derivedDrop = instanceDrop = false;
+ DoPasteItem(&clipboardData,false,false,false,false,false,true);
+ }
+ }
+
void CGMEView::OnUpdateEditPastespecialAsinstance(CCmdUI* pCmdUI)
{
***************
*** 5704,5707 ****
--- 5693,5701 ----
}
+ void CGMEView::OnUpdateEditPastespecialAsclosure(CCmdUI* pCmdUI)
+ {
+ OnUpdateEditPaste(pCmdUI);
+ }
+
void CGMEView::OnCntxPastespecialAsinstance()
{
***************
*** 5711,5715 ****
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = true;
! DoPasteItem(&clipboardData,true,false,false,true,true,0,contextMenuLocation);
}
}
--- 5705,5709 ----
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = true;
! DoPasteItem(&clipboardData,true,false,false,true,true,false,0,contextMenuLocation);
}
}
***************
*** 5727,5731 ****
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,true,false,false,0,contextMenuLocation);
}
}
--- 5721,5725 ----
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,true,false,false,false,0,contextMenuLocation);
}
}
***************
*** 5744,5748 ****
derivedDrop = true;
instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,false,true,false,0,contextMenuLocation);
}
}
--- 5738,5742 ----
derivedDrop = true;
instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,false,true,false,false,0,contextMenuLocation);
}
}
***************
*** 5753,5756 ****
--- 5747,5767 ----
}
+ void CGMEView::OnCntxPastespecialAsclosure()
+ {
+ CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxPastespecialAsclosure in "+path+name+"\r\n");
+ if(isType) {
+ COleDataObject clipboardData;
+ clipboardData.AttachClipboard();
+ derivedDrop = true;
+ instanceDrop = false;
+ DoPasteItem(&clipboardData,false,false,false,false,false,true,0,contextMenuLocation);
+ }
+ }
+
+ void CGMEView::OnUpdateCntxPastespecialAsclosure(CCmdUI* pCmdUI)
+ {
+ OnUpdateEditPaste(pCmdUI);
+ }
+
void CGMEView::OnCntxRedirectionpaste()
{
***************
*** 5764,5768 ****
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,true,false,false,ref,contextMenuLocation);
}
}
--- 5775,5779 ----
clipboardData.AttachClipboard();
derivedDrop = instanceDrop = false;
! DoPasteItem(&clipboardData,true,false,true,false,false,false,ref,contextMenuLocation);
}
}
***************
*** 6290,6294 ****
Invalidate();
return 0;
! }
!
!
--- 6301,6303 ----
Invalidate();
return 0;
! }
\ No newline at end of file
More information about the GME-commit
mailing list