[commit] r1471 - trunk/Tools/AutoLayout

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Aug  5 15:59:04 2011
New Revision: 1471

Log:
Dont run AutoLayout on instances

Modified:
   trunk/Tools/AutoLayout/   (props changed)
   trunk/Tools/AutoLayout/RawComponent.cpp

Modified: trunk/Tools/AutoLayout/RawComponent.cpp
==============================================================================
--- trunk/Tools/AutoLayout/RawComponent.cpp	Fri Aug  5 15:53:00 2011	(r1470)
+++ trunk/Tools/AutoLayout/RawComponent.cpp	Fri Aug  5 15:59:04 2011	(r1471)
@@ -46,13 +46,11 @@
 									IMgaFCOs *selectedobjs,  long param) {
 	COMTRY 
     {
-	  if(interactive) 
-      {
 		CComBSTR projname;
 		CComObjPtr<IMgaTerritory> terr;
 		COMTHROW(project->CreateTerritory(NULL, PutOut(terr)));
 		COMTHROW(project->BeginTransaction(terr));
-		try 
+		try
         {
             if(currentobj==NULL)
                 throw 0;
@@ -61,13 +59,23 @@
             COMTHROW(currentobj->get_ObjType(&objType));
             if( objType != OBJTYPE_MODEL )
             {
-                AfxMessageBox(_T("AutoLayout can only run on models. Open a model and try again!"));
+				if (param != GME_SILENT_MODE)
+					AfxMessageBox(_T("AutoLayout can only run on models."));
                 throw 0;
             }
 
-            CDlgAutoLayout dlg;
+			VARIANT_BOOL isInstance;
+			COMTHROW(currentobj->get_IsInstance(&isInstance));
+			if (isInstance != VARIANT_FALSE)
+			{
+				if (param != GME_SILENT_MODE)
+					AfxMessageBox(_T("AutoLayout cannot run on instances. Please AutoLayout run on the basetype instead."));
+				throw 0;
+			}
+			
+			CDlgAutoLayout dlg;
             dlg.initialize( project, (IMgaModel*)currentobj );
-			if (param == 128)
+			if (param == GME_SILENT_MODE)
 			{
 				Gdiplus::GdiplusStartupInput  gdiplusStartupInput;
 				Gdiplus::GdiplusStartupOutput  gdiplusStartupOutput;
@@ -100,7 +108,6 @@
         { 
             project->AbortTransaction(); 
         }		
-	  } 
 	} COMCATCH(;);
 }