[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep ConnJoint.cpp,1.9,1.10 Dumper.cpp,1.26,1.27 Dumper.h,1.8,1.9 FolderRep.cpp,1.8,1.9 ModelRep.cpp,1.14,1.15

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory braindrain:/tmp/cvs-serv6256/Rep

Modified Files:
	ConnJoint.cpp Dumper.cpp Dumper.h FolderRep.cpp ModelRep.cpp 
Log Message:
The user can edit upon interpretation the eventmasks and priorities for the cardinality-based contstraints.


CVS User: zolmol

Index: ConnJoint.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnJoint.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConnJoint.cpp	30 Jul 2004 00:10:23 -0000	1.9
--- ConnJoint.cpp	5 Nov 2004 21:25:08 -0000	1.10
***************
*** 425,429 ****
  			ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  			std::string s_b = src_expr_begin + src_expr_end;
! 			cr->init( src_cons_name, /*mask:*/0, "1", 1, s_b, src_desc);
  
  			(*it)->addInitialConstraintRep( cr);
--- 425,429 ----
  			ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  			std::string s_b = src_expr_begin + src_expr_end;
! 			cr->init( src_cons_name, /*mask:*/ global_vars.genConstr.connect_mask, "1", global_vars.genConstr.priority, s_b, src_desc);
  
  			(*it)->addInitialConstraintRep( cr);
***************
*** 448,452 ****
  			ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  			std::string d_b = dst_expr_begin + dst_expr_end;
! 			cr->init( dst_cons_name, /*mask:*/0, "1", 1, d_b, dst_desc);
  
  			(*it)->addInitialConstraintRep( cr);
--- 448,452 ----
  			ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  			std::string d_b = dst_expr_begin + dst_expr_end;
! 			cr->init( dst_cons_name, /*mask:*/ global_vars.genConstr.connect_mask, "1", global_vars.genConstr.priority, d_b, dst_desc);
  
  			(*it)->addInitialConstraintRep( cr);

Index: Dumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Dumper.cpp	24 Aug 2004 17:34:38 -0000	1.26
--- Dumper.cpp	5 Nov 2004 21:25:08 -0000	1.27
***************
*** 4,7 ****
--- 4,8 ----
  #include "AspectSpecDlg.h"
  #include "GlobalAspOrder.h"
+ #include "Options.h"
  #include "Broker.h"
  #include "Token.h"
***************
*** 1594,1599 ****
  }
  
! 
! /*static*/ int Dumper::selectOutputFiles( const std::string& proj_name, const std::string& proj_path)
  {
  	try {
--- 1595,1599 ----
  }
  
! /*static*/ int Dumper::selectOutputFiles( const BON::Project& proj, const std::string& proj_name, const std::string& proj_path)
  {
  	try {
***************
*** 1653,1656 ****
--- 1653,1706 ----
  	}
  	return 1;
+ }
+ 
+ 
+ /*static*/ int Dumper::selectOptions( const BON::Project& proj)
+ {
+ 	int v1( 0), v2( 0), v3( 0), vp( 1); //default values
+ 
+ 	try { 
+ 		
+ 		// load the saved options from the registry
+ 		if( !Options::fetchOpts( proj, &v1, &v2, &v3, &vp)) return 1;
+ 
+ 		global_vars.genConstr.reg_cont_mask = v1;
+ 		global_vars.genConstr.fol_cont_mask = v2;
+ 		global_vars.genConstr.connect_mask  = v3;
+ 		global_vars.genConstr.priority      = vp;
+ 
+ 	} catch(...) {
+ 		proj->consoleMsg("[MetaInterpreter] Option load did not succeed.", MSG_ERROR);
+ 	}
+ 
+ 	if( global_vars.silent_mode)
+ 	{
+ 		return 1;
+ 	}
+ 	else
+ 	{
+ 		Options dlg;
+ 		dlg.setDefs( v1, v2, v3, vp);
+ 		int v = dlg.DoModal();
+ 		if( v == IDOK) 
+ 		{
+ 			bool dont_ask = false;
+ 			dlg.getResults( &v1, &v2, &v3, &vp, &dont_ask);
+ 			
+ 			global_vars.genConstr.reg_cont_mask = v1;
+ 			global_vars.genConstr.fol_cont_mask = v2;
+ 			global_vars.genConstr.connect_mask  = v3;
+ 			global_vars.genConstr.priority      = vp;
+ 
+ 			// save options in the registry
+ 			try {
+ 				Options::saveOpts( proj, v1, v2, v3, vp, dont_ask);
+ 			} catch(...) { 
+ 				proj->consoleMsg("[MetaInterpreter] Option saving did not succeed.", MSG_ERROR);
+ 			}
+ 		}
+ 		
+ 		return (v == IDOK)?1:2;
+ 	}
  }
  

Index: Dumper.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Dumper.h	19 Aug 2004 18:29:52 -0000	1.8
--- Dumper.h	5 Nov 2004 21:25:08 -0000	1.9
***************
*** 19,23 ****
  
  
! 	static int selectOutputFiles( const std::string& proj_name, const std::string& project_path);
  	static void registerIt( const std::string& f_name);
  	static bool doParseCardinality
--- 19,24 ----
  
  
! 	static int selectOutputFiles( const BON::Project&, const std::string& proj_name, const std::string& project_path);
! 	static int selectOptions( const BON::Project&);
  	static void registerIt( const std::string& f_name);
  	static bool doParseCardinality

Index: FolderRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FolderRep.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FolderRep.cpp	30 Jul 2004 00:10:23 -0000	1.8
--- FolderRep.cpp	5 Nov 2004 21:25:08 -0000	1.9
***************
*** 271,275 ****
  			ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  			std::string s_b = str_expr_begin + str_expr_end;
! 			cr->init( str_cons_name, /*mask:*/0, "1", 1, s_b, str_desc);
  
  			this->addInitialConstraintRep( cr); // <!> to be decided whether initial or final
--- 271,275 ----
  			ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  			std::string s_b = str_expr_begin + str_expr_end;
! 			cr->init( str_cons_name, /*mask:*/global_vars.genConstr.fol_cont_mask, "1", global_vars.genConstr.priority, s_b, str_desc);
  
  			this->addInitialConstraintRep( cr); // <!> to be decided whether initial or final

Index: ModelRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ModelRep.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ModelRep.cpp	24 Aug 2004 17:34:38 -0000	1.14
--- ModelRep.cpp	5 Nov 2004 21:25:08 -0000	1.15
***************
*** 723,727 ****
  					ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  					std::string s_b = str_expr_begin + str_expr_end;
! 					cr->init( str_cons_name, /*mask:*/0, "1", 1, s_b, str_desc);
  
  					this->addInitialConstraintRep( cr); // <!> to be dec'd whether initial or final
--- 723,727 ----
  					ConstraintRep * cr = s->createConstraintRep( BON::FCO());
  					std::string s_b = str_expr_begin + str_expr_end;
! 					cr->init( str_cons_name, /*mask:*/global_vars.genConstr.reg_cont_mask, "1", global_vars.genConstr.priority, s_b, str_desc);
  
  					this->addInitialConstraintRep( cr); // <!> to be dec'd whether initial or final