[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 LogStream.cpp,NONE,1.1 LogStream.h,NONE,1.1 BON2Component.cpp,1.20,1.21 BON2Component.h,1.9,1.10 Component.rc,1.6,1.7 Globals.h,1.3,1.4 MetaGME2004.dsp,1.12,1.13 logger.h,1.2,1.3 resource.h,1.4,1.5

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Thu Jul 29 20:10:25 CDT 2004 

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

Modified Files:
	BON2Component.cpp BON2Component.h Component.rc Globals.h 
	MetaGME2004.dsp logger.h resource.h 
Added Files:
	LogStream.cpp LogStream.h 
Log Message:
Name selector dialog box for chosing the preferred name in case of equivalent objects.
Errors dumped to console window.


CVS User: zolmol

--- NEW FILE: LogStream.cpp ---
#include "stdafx.h"
#include "LogStream.h"
#include "BON.h"
#include "BONImpl.h"

LogStream::LogStream()
	: m_proj( BON::Project())
	, m_msgtype( MSG_NORMAL)
	, m_buff()
{ }

LogStream::~LogStream() 
{
	m_proj = BON::Project();
	m_buff = "";
}

void LogStream::flushit()
{
	*this << "\n"; // flush
}

//
// friend put-to operators

LogStream& operator<<( LogStream& stream, msgtype_enum msgtype)
{
	if( !stream.m_buff.empty()) stream << "\n"; // like a flush

	stream.m_msgtype = msgtype;
	/*switch( stream.m_msgtype) {
		case MSG_ERROR:		stream.write( "Error: ", 7); break;
		case MSG_WARNING:	stream.write( "Warning: ", 9); break;
		case MSG_INFO:		stream.write( "Info: ", 5); break;
		case MSG_NORMAL:	;
	}*/

	return stream;

}

LogStream& operator<<( LogStream& stream, const BON::FCO& fco)
{
	std::string tok = "<b>Null_object</b>";
	if( fco)
	{
		try {
			std::string id, nm;
			id = fco->getID();
			nm = fco->getName();
			tok = "<A HREF=\"mga:" + id +"\">" + nm + "</A>";
		} catch( ...) {
		}
	}

	return stream << tok;
}

LogStream& operator<<( LogStream& stream, const char * r)
{
	return stream << std::string( r);
}

LogStream& operator<<( LogStream& stream, const std::string& r)
{
	stream.write( r.c_str(), r.length());
	
	stream.m_buff += r;
	if( r.find('\n') != std::string::npos)
	{
		stream.m_proj->consoleMsg( stream.m_buff, stream.m_msgtype);
		stream.m_buff = "";
	}
	
	return stream;
}


--- NEW FILE: LogStream.h ---
#ifndef LOGSTREAM_H
#define LOGSTREAM_H

#include "fstream"
#include "string"
#include "BON.h"
#include "BONImpl.h"

class LogStream : public std::ofstream
{
public:
	LogStream();
	~LogStream();
	void flushit();

	// friend put-to operators
	friend LogStream& operator<<( LogStream& s, msgtype_enum msgtype);
	friend LogStream& operator<<( LogStream& s, const BON::FCO& fco);
	friend LogStream& operator<<( LogStream& s, const char * r);
	friend LogStream& operator<<( LogStream& s, const std::string& r);

	BON::Project m_proj;
	msgtype_enum m_msgtype;
	std::string  m_buff;
};

#endif //LOGSTREAM_H

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BON2Component.cpp	24 Jul 2004 19:52:16 -0000	1.20
--- BON2Component.cpp	30 Jul 2004 00:10:22 -0000	1.21
***************
*** 27,33 ****
  
  #include "Dumper.h"
! 
  #include "globals.h"
  Globals global_vars;
  
  namespace BON
--- 27,34 ----
  
  #include "Dumper.h"
[...1090 lines suppressed...]
! 		else
! 		{
! 			//AfxMessageBox( "Metainterpretation completed.", MB_ICONINFORMATION);
! 			project->consoleMsg("Metainterpretation completed.", MSG_INFO);
! 		}
! 	}
  #endif
+ #endif
+ 
+ 	global_vars.err.flushit();
+ 	global_vars.err.m_proj = (Project) 0;
  }
  
***************
*** 1813,1815 ****
--- 1964,1967 ----
  
  }; // namespace BON
+ 
  

Index: BON2Component.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BON2Component.h	20 Jul 2004 10:48:35 -0000	1.9
--- BON2Component.h	30 Jul 2004 00:10:22 -0000	1.10
***************
*** 96,99 ****
--- 96,100 ----
  	void equivalenceFinder();
  	void removeProxiesAndEquiv();
+ 	bool nameSelector();
  	int isProxy( const ObjPointer& ptr);
  	void operandSearchAndReplace( const std::vector<ObjPointer>& proxy_obj, const ObjPointer& real_obj);

Index: Component.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Component.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Component.rc	16 Jun 2004 18:56:51 -0000	1.6
--- Component.rc	30 Jul 2004 00:10:22 -0000	1.7
***************
*** 125,128 ****
--- 125,136 ----
          BOTTOMMARGIN, 139
      END
+ 
+     IDD_EQUIVDIALOG, DIALOG
+     BEGIN
+         LEFTMARGIN, 7
+         RIGHTMARGIN, 192
+         TOPMARGIN, 7
+         BOTTOMMARGIN, 219
+     END
  END
  #endif    // APSTUDIO_INVOKED
***************
*** 154,157 ****
--- 162,176 ----
                      BS_VCENTER,WS_EX_TRANSPARENT
      LTEXT           "Global aspect order",IDC_STATIC,16,10,94,8
+ END
+ 
+ IDD_EQUIVDIALOG DIALOG DISCARDABLE  0, 0, 199, 226
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Name selector dialog"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+     DEFPUSHBUTTON   "OK",IDOK,21,207,50,14
+     PUSHBUTTON      "Use metamodel defaults",IDCANCEL,91,207,89,14
+     LTEXT           "Select the desired name in the first column",IDC_STATIC,
+                     7,3,148,8
  END
  

Index: Globals.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Globals.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Globals.h	30 Jun 2004 17:55:18 -0000	1.3
--- Globals.h	30 Jul 2004 00:10:22 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  #define GLOBALS_H
  
+ #include "LogStream.h"
  #include "fstream"
  #include "string"
***************
*** 13,17 ****
  		{ }
  
! 	std::ofstream err;
  	std::ofstream dmp;
  
--- 14,19 ----
  		{ }
  
! 	//std::ofstream err;
! 	LogStream     err;
  	std::ofstream dmp;
  

Index: MetaGME2004.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.dsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MetaGME2004.dsp	30 Jun 2004 17:55:18 -0000	1.12
--- MetaGME2004.dsp	30 Jul 2004 00:10:22 -0000	1.13
***************
*** 242,245 ****
--- 242,249 ----
  # Begin Source File
  
+ SOURCE=.\LogStream.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\Regexp.cpp
  # End Source File
***************
*** 253,257 ****
  # End Source File
  # End Group
! # Begin Group "Asp"
  
  # PROP Default_Filter ""
--- 257,261 ----
  # End Source File
  # End Group
! # Begin Group "GUI"
  
  # PROP Default_Filter ""
***************
*** 280,283 ****
--- 284,295 ----
  SOURCE=.\Asp\InPlaceList.cpp
  # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\Asp\NameSpecDlg.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\Asp\NameSpecTbl.cpp
+ # End Source File
  # End Group
  # Begin Source File
***************
*** 530,533 ****
--- 542,549 ----
  # Begin Source File
  
+ SOURCE=.\LogStream.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\Regexp.h
  # End Source File
***************
*** 541,545 ****
  # End Source File
  # End Group
! # Begin Group "Asp H"
  
  # PROP Default_Filter ""
--- 557,561 ----
  # End Source File
  # End Group
! # Begin Group "GUI H"
  
  # PROP Default_Filter ""
***************
*** 567,570 ****
--- 583,594 ----
  
  SOURCE=.\Asp\InPlaceList.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\Asp\NameSpecDlg.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\Asp\NameSpecTbl.h
  # End Source File
  # End Group

Index: logger.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/logger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** logger.h	30 Jun 2004 17:55:18 -0000	1.2
--- logger.h	30 Jul 2004 00:10:22 -0000	1.3
***************
*** 6,14 ****
  #include "globals.h"
  
- extern std::ofstream err;
- extern std::ofstream dmp;
- 
- extern std::string err_file_name;
- extern std::string xmp_file_name;
  extern int ind;
  
--- 6,9 ----

Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/resource.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** resource.h	16 Jun 2004 18:56:51 -0000	1.4
--- resource.h	30 Jul 2004 00:10:22 -0000	1.5
***************
*** 16,19 ****
--- 16,20 ----
  #define IDI_ICONDN                      221
  #define IDI_ICONUP                      222
+ #define IDD_EQUIVDIALOG                 224
  
  // Next default values for new objects
***************
*** 21,27 ****
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        223
  #define _APS_NEXT_COMMAND_VALUE         32768
! #define _APS_NEXT_CONTROL_VALUE         211
  #define _APS_NEXT_SYMED_VALUE           101
  #endif
--- 22,28 ----
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        225
  #define _APS_NEXT_COMMAND_VALUE         32768
! #define _APS_NEXT_CONTROL_VALUE         216
  #define _APS_NEXT_SYMED_VALUE           101
  #endif

More information about the GME-commit mailing list