[GME-commit] GMESRC/GME/MgaDecorators MgaDecorators.vcproj,NONE,1.1
BitmapUtil.cpp,1.3,1.4 BitmapUtil.h,1.2,1.3
BoxDecorator.cpp,1.39,1.40 BoxDecorator.h,1.15,1.16
DIBRead.cpp,1.1,1.2 DecoratorUtil.cpp,1.7,1.8
MgaDecorators.cpp,1.3,1.4 MgaDecorators.def,1.1,1.2
StdAfx.cpp,1.1,1.2 StdAfx.h,1.8,1.9
StereotypeDecorators.cpp,1.13,1.14 MgaDecorators.dsp,1.16,NONE
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:26 CST 2005
- Previous message: [GME-commit] GMESRC/GME/Annotator Annotator.vcproj,NONE,1.1
DecoratorApp.cpp,1.2,1.3 DecoratorApp.def,1.3,1.4
StdAfx.cpp,1.2,1.3 Annotator.dsp,1.10,NONE
- Next message: [GME-commit]
GMESRC/GME/Console Console.vcproj,NONE,1.1 Console.cpp,1.2,1.3
Console.def,1.1,1.2 ConsoleCtl.cpp,1.2,1.3 ConsoleCtl.h,1.2,1.3
HtmlCtrl.cpp,1.1,1.2 ScriptEdit.h,1.1,1.2 ScriptHost.h,1.1,1.2
StdAfx.cpp,1.2,1.3 StdAfx.h,1.2,1.3 Console.dsp,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/GME/MgaDecorators
In directory braindrain:/tmp/cvs-serv19193/GME/MgaDecorators
Modified Files:
BitmapUtil.cpp BitmapUtil.h BoxDecorator.cpp BoxDecorator.h
DIBRead.cpp DecoratorUtil.cpp MgaDecorators.cpp
MgaDecorators.def StdAfx.cpp StdAfx.h StereotypeDecorators.cpp
Added Files:
MgaDecorators.vcproj
Removed Files:
MgaDecorators.dsp
Log Message:
Checkin for VC7.1 upgrade
CVS User: zolmol
--- NEW FILE: MgaDecorators.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="MgaDecorators"
SccProjectName=""
SccLocalPath=""
Keyword="AtlProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="2"
UseOfMFC="0"
UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2"
ManagedExtensions="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../Common,..\Interfaces,../include/gifhelp,../include/stlport"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OLD_DECORATOR_LOOKANDFEEL"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/MgaDecorators.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
Outputs="$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="gdiplus.lib"
OutputFile=".\Debug/MgaDecorators.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\lib"
ModuleDefinitionFile=".\MgaDecorators.def"
GenerateDebugInformation="TRUE"
AssemblyDebug="1"
ProgramDatabaseFile=".\Debug/MgaDecorators.pdb"
SubSystem="2"
BaseAddress="0x60700000"
ImportLibrary=".\Debug/MgaDecorators.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
AdditionalIncludeDirectories="..\Interfaces"
TargetEnvironment="1"
TypeLibraryName=".\Debug/MgaDecorators.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
UseOfMFC="0"
UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../Common,..\Interfaces,../include/gifhelp,../include/stlport"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OLD_DECORATOR_LOOKANDFEEL"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Release/MgaDecorators.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
Outputs="$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="gdiplus.lib"
OutputFile=".\Release/MgaDecorators.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\lib"
ModuleDefinitionFile=".\MgaDecorators.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/MgaDecorators.pdb"
GenerateMapFile="TRUE"
MapFileName=".\Release/MgaDecorators.map"
SubSystem="2"
BaseAddress="0x60700000"
ImportLibrary=".\Release/MgaDecorators.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
AdditionalIncludeDirectories="..\Interfaces"
TargetEnvironment="1"
TypeLibraryName=".\Release/MgaDecorators.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="BitmapUtil.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"/>
</FileConfiguration>
</File>
<File
RelativePath="BoxDecorator.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"/>
</FileConfiguration>
</File>
<File
RelativePath="..\common\CommonError.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\Common\CommonMfc.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\common\CommonSmart.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="DecoratorDefs.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"/>
</FileConfiguration>
</File>
<File
RelativePath="DecoratorUtil.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"/>
</FileConfiguration>
</File>
<File
RelativePath="Dibapi.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="DIBRead.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="MgaDecoratorLib.idl">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCMIDLTool"
AdditionalIncludeDirectories=""
TargetEnvironment="1"
GenerateStublessProxies="TRUE"
TypeLibraryName="MgaDecoratorLib.tlb"
HeaderFileName="MgaDecoratorLib.h"
InterfaceIdentifierFileName="MgaDecoratorLib_i.c"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCMIDLTool"
AdditionalIncludeDirectories=""
TargetEnvironment="1"
GenerateStublessProxies="TRUE"
TypeLibraryName="MgaDecoratorLib.tlb"
HeaderFileName="MgaDecoratorLib.h"
InterfaceIdentifierFileName="MgaDecoratorLib_i.c"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaDecorators.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="MgaDecorators.def">
</File>
<File
RelativePath="MgaDecorators.rc">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
AdditionalIncludeDirectories="$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
AdditionalIncludeDirectories="$(OUTDIR)"/>
</FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="1"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath="StereotypeDecorators.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="BitmapUtil.h">
</File>
<File
RelativePath="BoxDecorator.h">
</File>
<File
RelativePath="..\Common\CommonError.h">
</File>
<File
RelativePath="..\Common\CommonMfc.h">
</File>
<File
RelativePath="..\Common\CommonSmart.h">
</File>
<File
RelativePath="DecoratorDefs.h">
</File>
<File
RelativePath="DecoratorUtil.h">
</File>
<File
RelativePath="DIBAPI.H">
</File>
<File
RelativePath="Resource.h">
</File>
<File
RelativePath="StdAfx.h">
</File>
<File
RelativePath="StereotypeDecorators.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File
RelativePath="res\atom.bmp">
</File>
<File
RelativePath="res\atomport.bmp">
</File>
<File
RelativePath="BoxDecorator.rgs">
</File>
<File
RelativePath="res\icon_instance.bmp">
</File>
<File
RelativePath="res\icon_instance_disabled.bmp">
</File>
<File
RelativePath="res\icon_reference.bmp">
</File>
<File
RelativePath="res\icon_reference_disabled.bmp">
</File>
<File
RelativePath="res\icon_subtype.bmp">
</File>
<File
RelativePath="res\icon_subtype_disabled.bmp">
</File>
<File
RelativePath="res\icon_type.bmp">
</File>
<File
RelativePath="res\icon_type_disabled.bmp">
</File>
<File
RelativePath="res\model.bmp">
</File>
<File
RelativePath="res\modelport.bmp">
</File>
<File
RelativePath="res\nullref.bmp">
</File>
<File
RelativePath="res\reference.bmp">
</File>
<File
RelativePath="res\referenceport.bmp">
</File>
<File
RelativePath="res\refport.bmp">
</File>
<File
RelativePath="res\reftonull.bmp">
</File>
<File
RelativePath="res\Set.bmp">
</File>
<File
RelativePath="res\setport.bmp">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Index: BitmapUtil.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/BitmapUtil.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BitmapUtil.cpp 13 Oct 2004 15:17:55 -0000 1.3
--- BitmapUtil.cpp 26 Jan 2005 17:30:50 -0000 1.4
***************
*** 200,204 ****
void BitmapBase::draw( CDC* pDC, const CRect& cRect, const TileVector& vecTiles ) const
{
! for ( unsigned long i = 0 ; i < vecTiles.size() ; i++ ) {//zolmol!
CPoint srcTopLeft = vecTiles[ i ].getPartTopLeft().calcPoint( m_lWidth, m_lHeight );
--- 200,204 ----
void BitmapBase::draw( CDC* pDC, const CRect& cRect, const TileVector& vecTiles ) const
{
! for ( unsigned long i = 0 ; i < vecTiles.size() ; i++ ) {
CPoint srcTopLeft = vecTiles[ i ].getPartTopLeft().calcPoint( m_lWidth, m_lHeight );
***************
*** 339,343 ****
CFile fDIB;
CFileException fexDIB;
! for ( unsigned int i = 0 ; i < vecPathes.size() ; i++ ) {//zolmol!
if ( fDIB.Open( vecPathes[ i ] + strFName, CFile::modeRead | CFile::shareDenyWrite, &fexDIB ) ) {
TRY {
--- 339,343 ----
CFile fDIB;
CFileException fexDIB;
! for ( unsigned int i = 0 ; i < vecPathes.size() ; i++ ) {
if ( fDIB.Open( vecPathes[ i ] + strFName, CFile::modeRead | CFile::shareDenyWrite, &fexDIB ) ) {
TRY {
***************
*** 369,419 ****
//################################################################################################
//
! // CLASS : BitmapGIF
//
//################################################################################################
! BitmapGIF::BitmapGIF( const CString& strName )
! : BitmapBase( strName ), m_pImage( NULL ), m_pPalette( NULL )
{
load( strName );
}
! BitmapGIF::BitmapGIF( const CString& strName, COLORREF crColor, bool bIsTransparent )
! : BitmapBase( strName, crColor, bIsTransparent ), m_pImage( NULL ), m_pPalette( NULL )
{
load( strName );
}
! BitmapGIF::BitmapGIF( const CString& strName, COLORREF crTransparentColor, COLORREF crBackgroundColor )
! : BitmapBase( strName, crTransparentColor, crBackgroundColor ), m_pImage( NULL ), m_pPalette( NULL )
{
load( strName );
}
!
! BitmapGIF::~BitmapGIF()
{
! delete m_pImage;
}
! void BitmapGIF::draw( CDC* pDC, const CRect& srcRect, const CRect& dstRect, DWORD dwOpCode ) const
{
! CPalette *pOldPalette = NULL;
! if ( m_pPalette ) {
! COLORREF crBack = pDC->GetBkColor();
! unsigned char r, g, b;
! r = GetRValue( crBack );
! g = GetGValue( crBack );
! b = GetBValue(crBack );
!
! m_pImage->SetPalRGB( m_pImage->transindex, &r, &g, &b );
! pOldPalette = pDC->SelectPalette( m_pPalette, TRUE );
! pDC->RealizePalette();
! }
! m_pImage->Stretch( pDC, dstRect.left, dstRect.top, dstRect.Width(), dstRect.Height(), srcRect.left, srcRect.top, srcRect.Width(), srcRect.Height() );
! if( m_pPalette )
! pDC->SelectPalette( pOldPalette, TRUE );
}
! void BitmapGIF::load( const CString& strName )
{
if ( ! m_pImage ) {
--- 369,411 ----
//################################################################################################
//
! // CLASS : BitmapGen
//
//################################################################################################
!
! BitmapGen::BitmapGen( const CString& strName )
! : BitmapBase( strName ), m_pImage( NULL )
{
load( strName );
}
! BitmapGen::BitmapGen( const CString& strName, COLORREF crColor, bool bIsTransparent )
! : BitmapBase( strName, crColor, bIsTransparent ), m_pImage( NULL )
{
load( strName );
}
! BitmapGen::BitmapGen( const CString& strName, COLORREF crTransparentColor, COLORREF crBackgroundColor )
! : BitmapBase( strName, crTransparentColor, crBackgroundColor ), m_pImage( NULL )
{
load( strName );
}
! BitmapGen::~BitmapGen()
{
! if( m_pImage)
! {
! delete m_pImage;
! m_pImage = 0;
! }
}
! void BitmapGen::draw( CDC* pDC, const CRect& srcRect, const CRect& dstRect, DWORD dwOpCode ) const
{
! ASSERT( m_pImage);
! Graphics graphics(pDC->m_hDC);
! graphics.DrawImage(m_pImage, dstRect.left, dstRect.top, dstRect.Width(), dstRect.Height());
}
! void BitmapGen::load( const CString& strName )
{
if ( ! m_pImage ) {
***************
*** 422,444 ****
std::vector<CString> vecPathes = getFacilities().getPathes();
CString strFName = strName;
! for ( unsigned int i = 0 ; i < vecPathes.size() ; i++ ) {//zolmol!
! CString strPath = vecPathes[ i ];
! m_pImage = new CImage( vecPathes[ i ] + strFName, CIMAGE_FORMAT_GIF );
! if ( ! m_pImage->GetImplementation() ) {
! delete m_pImage;
! m_pImage = NULL;
! }
! else {
setSize( m_pImage->GetWidth(), m_pImage->GetHeight() );
! m_pPalette = m_pImage->GetPalette();
! return;
}
}
}
}
! bool BitmapGIF::isInitialized() const
{
return m_pImage != NULL;
--- 414,441 ----
std::vector<CString> vecPathes = getFacilities().getPathes();
+ bool success = false;
CString strFName = strName;
! for ( unsigned int i = 0 ; !success && i < vecPathes.size() ; i++ )
! {
! m_pImage = Image::FromFile( CA2W( (LPCTSTR) vecPathes[ i ] + strFName));
! if( m_pImage && m_pImage->GetLastStatus() == Ok)
! {
! ASSERT( m_pImage->GetWidth() > 0); // valid sizes, otherwise AutoRouter fails
! ASSERT( m_pImage->GetHeight() > 0);
setSize( m_pImage->GetWidth(), m_pImage->GetHeight() );
! success = true;
}
}
+
+ if( !success && m_pImage)
+ {
+ delete m_pImage;
+ m_pImage = 0;
+ }
}
}
! bool BitmapGen::isInitialized() const
{
return m_pImage != NULL;
Index: BitmapUtil.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/BitmapUtil.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BitmapUtil.h 13 Oct 2004 15:17:55 -0000 1.2
--- BitmapUtil.h 26 Jan 2005 17:30:50 -0000 1.3
***************
*** 13,17 ****
#include "StdAfx.h"
#include "DIBAPI.h"
- #include "CImage.h"
#include <vector>
--- 13,16 ----
***************
*** 197,216 ****
//################################################################################################
//
! // CLASS : BitmapGIF
! //
//################################################################################################
! class BitmapGIF
: public BitmapBase
{
private :
! CImage* m_pImage;
! CImagePalette* m_pPalette;
public :
! BitmapGIF( const CString& strName );
! BitmapGIF( const CString& strName, COLORREF crColor, bool bIsTransparent );
! BitmapGIF( const CString& strName, COLORREF crTransparentColor, COLORREF crBackgroundColor );
! ~BitmapGIF();
public :
--- 196,216 ----
//################################################################################################
//
! // CLASS : BitmapGen
! // this class is suitable for all image formats: BMP, GIF, JPEG, PNG, TIFF, EMF
! // however we will use it only for BMP, GIF, JPEG, PNG
! //
//################################################################################################
! class BitmapGen
: public BitmapBase
{
private :
! Image* m_pImage;
public :
! BitmapGen( const CString& strName );
! BitmapGen( const CString& strName, COLORREF crColor, bool bIsTransparent );
! BitmapGen( const CString& strName, COLORREF crTransparentColor, COLORREF crBackgroundColor );
! ~BitmapGen();
public :
Index: BoxDecorator.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/BoxDecorator.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** BoxDecorator.cpp 13 Oct 2004 15:17:55 -0000 1.39
--- BoxDecorator.cpp 26 Jan 2005 17:30:50 -0000 1.40
***************
*** 10,13 ****
--- 10,17 ----
#include "StereotypeDecorators.h"
+ int CBoxDecorator::m_nOfInits = 0;
+ GdiplusStartupInput CBoxDecorator::m_gdiplusStartupInput; // needed for GDI+ initialization
+ ULONG_PTR CBoxDecorator::m_gdiplusToken;
+
//################################################################################################
//
***************
*** 27,34 ****
--- 31,46 ----
: m_spProject( NULL ), m_spPart( NULL ), m_spFCO( NULL ), m_pDecorator( NULL ), m_bLocationSet( false )
{
+ if( m_nOfInits++ == 0)
+ {
+ VERIFY(GdiplusStartup(&m_gdiplusToken, &m_gdiplusStartupInput, NULL)==Ok);
+ }
}
CBoxDecorator::~CBoxDecorator()
{
+ if( --m_nOfInits == 0)
+ {
+ GdiplusShutdown(m_gdiplusToken);
+ }
}
***************
*** 227,231 ****
}
! for ( unsigned int i = 0 ; i < vecPorts.size() ; i++ )//zolmol!
COMTHROW( spFCOs->Append( vecPorts[ i ]->getFCO() ) );
--- 239,243 ----
}
! for ( unsigned int i = 0 ; i < vecPorts.size() ; i++ )
COMTHROW( spFCOs->Append( vecPorts[ i ]->getFCO() ) );
Index: BoxDecorator.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/BoxDecorator.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BoxDecorator.h 19 May 2003 14:52:28 -0000 1.15
--- BoxDecorator.h 26 Jan 2005 17:30:50 -0000 1.16
***************
*** 40,43 ****
--- 40,47 ----
bool m_bLocationSet;
+ static int m_nOfInits;
+ static GdiplusStartupInput m_gdiplusStartupInput; // needed for GDI+
+ static ULONG_PTR m_gdiplusToken;
+
public:
CBoxDecorator();
Index: DIBRead.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/DIBRead.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DIBRead.cpp 29 Jul 2001 22:29:00 -0000 1.1
--- DIBRead.cpp 26 Jan 2005 17:30:50 -0000 1.2
***************
*** 35,39 ****
LPSTR pDIB;
! dwBitsSize = file.GetLength();
if (file.Read((LPSTR)&bmfHeader, sizeof(bmfHeader)) != sizeof(bmfHeader))
--- 35,39 ----
LPSTR pDIB;
! dwBitsSize = (DWORD) file.GetLength();
if (file.Read((LPSTR)&bmfHeader, sizeof(bmfHeader)) != sizeof(bmfHeader))
***************
*** 47,51 ****
pDIB = (LPSTR) ::GlobalLock((HGLOBAL) hDIB);
! if (file.ReadHuge(pDIB, dwBitsSize - sizeof(BITMAPFILEHEADER)) !=
dwBitsSize - sizeof(BITMAPFILEHEADER) )
{
--- 47,51 ----
pDIB = (LPSTR) ::GlobalLock((HGLOBAL) hDIB);
! if (file.Read(pDIB, dwBitsSize - sizeof(BITMAPFILEHEADER)) != //ReadHuge previously
dwBitsSize - sizeof(BITMAPFILEHEADER) )
{
Index: DecoratorUtil.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/DecoratorUtil.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DecoratorUtil.cpp 13 Oct 2004 15:17:55 -0000 1.7
--- DecoratorUtil.cpp 26 Jan 2005 17:30:50 -0000 1.8
***************
*** 226,229 ****
--- 226,234 ----
while( ! strPath.IsEmpty() ) {
int iPos = strPath.Find( ';' );
+ if( iPos == 0) // zolmol: if accidentaly there are two semicolons, or the path starts with a semicolon
+ {
+ strPath = strPath.Right( strPath.GetLength() - 1 );
+ continue;
+ }
CString strDir;
if ( iPos != -1 ) {
***************
*** 416,456 ****
return it->second;
! CString strExt;
if ( strName.GetLength() >= 4 ) {
! strExt = strName.Right( 4 );
! strExt.MakeLower();
! if ( strExt != ".bmp" && strExt != ".gif" && strExt != ".res" )
strExt = "";
}
! if ( strExt == ".bmp" || strExt.IsEmpty() ) {
! CString strName2 = strName + ( ( strExt.IsEmpty() ) ? ".bmp" : "" );
! BitmapDIB* pBMP = NULL;
! if ( bHasTC )
! pBMP = ( bHasBC ) ? new BitmapDIB( strName2, crTC, crBC ) : new BitmapDIB( strName2, crTC, true );
! else
! pBMP = ( bHasBC ) ? new BitmapDIB( strName2, crBC, false ) : new BitmapDIB( strName2);
! if ( pBMP->isInitialized() ) {
! m_mapBitmaps.insert( std::map<CString,BitmapBase*>::value_type( strID, pBMP ) );
! return pBMP;
}
- delete pBMP;
- if ( ! strExt.IsEmpty() )
- return NULL;
}
! if ( strExt == ".gif" || strExt.IsEmpty() ) {
! CString strName2 = strName + ( ( strExt.IsEmpty() ) ? ".gif" : "" );
! BitmapGIF* pBMP = NULL;
if ( bHasTC )
! pBMP = ( bHasBC ) ? new BitmapGIF( strName2, crTC, crBC ) : new BitmapGIF( strName2, crTC, true );
else
! pBMP = ( bHasBC ) ? new BitmapGIF( strName2, crBC, false ) : new BitmapGIF( strName2 );
if ( pBMP->isInitialized() ) {
m_mapBitmaps.insert( std::map<CString,BitmapBase*>::value_type( strID, pBMP ) );
return pBMP;
}
! delete pBMP;
! if ( ! strExt.IsEmpty() )
! return NULL;
}
if ( strExt == ".res" || strExt.IsEmpty() ) {
int iID = atoi( strName.Left( strName.GetLength() - ( ( strExt.IsEmpty() ) ? 0 : 4 ) ) );
--- 421,471 ----
return it->second;
! CString strExt, strEx2;
if ( strName.GetLength() >= 4 ) {
! strExt = strName.Right( 4 ).MakeLower();
!
! if( strName.GetLength() >= 5) // in case of ".jpeg"
! strEx2 = strName.Right(5).MakeLower();
!
! if ( strExt != ".bmp" && strExt != ".gif" && strExt != ".png"
! && strExt != ".jpg" && strExt != ".jpe" && strEx2 != ".jpeg"
! && strExt != ".res" )
strExt = "";
}
!
! if( strExt.IsEmpty()) // if no extension then try the different formats
! {
! bool success = false;
! static char * exts[] = { ".bmp", ".gif", ".png", ".jpg", ".jpe", ".jpeg" };
! for( int i = 0; !success && i < 6; ++i)
! {
! CString strName2 = strName + exts[i];
! BitmapGen* pBMP = NULL;
! if ( bHasTC )
! pBMP = ( bHasBC ) ? new BitmapGen( strName2, crTC, crBC ) : new BitmapGen( strName2, crTC, true );
! else
! pBMP = ( bHasBC ) ? new BitmapGen( strName2, crBC, false ) : new BitmapGen( strName2);
! if ( pBMP->isInitialized() ) {
! m_mapBitmaps.insert( std::map<CString,BitmapBase*>::value_type( strID, pBMP ) );
! success = true;
! return pBMP;
! }
! delete pBMP;
}
}
! else if( strExt != ".res") // if regular file use name as is
! {
! BitmapGen* pBMP = NULL;
if ( bHasTC )
! pBMP = ( bHasBC ) ? new BitmapGen( strName, crTC, crBC ) : new BitmapGen( strName, crTC, true );
else
! pBMP = ( bHasBC ) ? new BitmapGen( strName, crBC, false ) : new BitmapGen( strName);
if ( pBMP->isInitialized() ) {
m_mapBitmaps.insert( std::map<CString,BitmapBase*>::value_type( strID, pBMP ) );
return pBMP;
}
! return NULL; // if the image not found
}
+
if ( strExt == ".res" || strExt.IsEmpty() ) {
int iID = atoi( strName.Left( strName.GetLength() - ( ( strExt.IsEmpty() ) ? 0 : 4 ) ) );
Index: MgaDecorators.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/MgaDecorators.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MgaDecorators.cpp 30 May 2001 21:47:00 -0000 1.3
--- MgaDecorators.cpp 26 Jan 2005 17:30:50 -0000 1.4
***************
*** 24,27 ****
--- 24,30 ----
{
public:
+ int m_nOfInits;
+ GdiplusStartupInput m_gdiplusStartupInput; // needed for GDI+
+ ULONG_PTR m_gdiplusToken;
// Overrides
Index: MgaDecorators.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/MgaDecorators.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaDecorators.def 3 Nov 2000 00:02:00 -0000 1.1
--- MgaDecorators.def 26 Jan 2005 17:30:50 -0000 1.2
***************
*** 4,9 ****
EXPORTS
! DllCanUnloadNow @1 PRIVATE
! DllGetClassObject @2 PRIVATE
! DllRegisterServer @3 PRIVATE
! DllUnregisterServer @4 PRIVATE
--- 4,9 ----
EXPORTS
! DllCanUnloadNow PRIVATE
! DllGetClassObject PRIVATE
! DllRegisterServer PRIVATE
! DllUnregisterServer PRIVATE
Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp 3 Nov 2000 00:02:00 -0000 1.1
--- StdAfx.cpp 26 Jan 2005 17:30:51 -0000 1.2
***************
*** 7,12 ****
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
- #include <statreg.cpp>
#endif
-
- #include <atlimpl.cpp>
--- 7,9 ----
Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/StdAfx.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StdAfx.h 13 Oct 2004 15:17:55 -0000 1.8
--- StdAfx.h 26 Jan 2005 17:30:51 -0000 1.9
***************
*** 23,26 ****
--- 23,29 ----
#include <afxtempl.h>
+ #include <gdiplus.h>
+ using namespace Gdiplus;
+
#include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override
Index: StereotypeDecorators.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaDecorators/StereotypeDecorators.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** StereotypeDecorators.cpp 13 Oct 2004 15:17:55 -0000 1.13
--- StereotypeDecorators.cpp 26 Jan 2005 17:30:51 -0000 1.14
***************
*** 389,393 ****
dc.SelectObject(getFacilities().getFont( m_iFontKey )->pFont);
CSize cSize(0,0);
! for ( unsigned int i = 0 ; i < m_vecName.size() ; i++ ) {//zolmol!
CSize tmpSize = dc.GetTextExtent(m_vecName[ i ]);
cSize.cy += tmpSize.cy;
--- 389,393 ----
dc.SelectObject(getFacilities().getFont( m_iFontKey )->pFont);
CSize cSize(0,0);
! for ( unsigned int i = 0 ; i < m_vecName.size() ; i++ ) {
CSize tmpSize = dc.GetTextExtent(m_vecName[ i ]);
cSize.cy += tmpSize.cy;
***************
*** 443,447 ****
int iLabelSize = getFacilities().getFont( m_iFontKey )->iSize;
CPoint pt = getLabelPosition();
! for ( unsigned int i = 0 ; i < m_vecName.size() ; i++ )//zolmol!
getFacilities().drawText( pDC, m_vecName[ i ], CPoint( pt.x, pt.y + i * iLabelSize ), getFacilities().getFont( m_iFontKey )->pFont, ( m_bActive ) ? m_crName : COLOR_GRAY, iAlign, m_iMaxTextLength, "", "", false );
}
--- 443,447 ----
int iLabelSize = getFacilities().getFont( m_iFontKey )->iSize;
CPoint pt = getLabelPosition();
! for ( unsigned int i = 0 ; i < m_vecName.size() ; i++ )
getFacilities().drawText( pDC, m_vecName[ i ], CPoint( pt.x, pt.y + i * iLabelSize ), getFacilities().getFont( m_iFontKey )->pFont, ( m_bActive ) ? m_crName : COLOR_GRAY, iAlign, m_iMaxTextLength, "", "", false );
}
***************
*** 826,830 ****
ModelDecorator::~ModelDecorator()
{
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )//zolmol!
delete m_vecLeftPorts[ i ];
for ( i = 0 ; i < m_vecRightPorts.size() ; i++ )
--- 826,830 ----
ModelDecorator::~ModelDecorator()
{
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )
delete m_vecLeftPorts[ i ];
for ( i = 0 ; i < m_vecRightPorts.size() ; i++ )
***************
*** 904,908 ****
long lMax = 0;
! for ( unsigned int i = 0 ; i < vecPorts.size() ; i++ ) {//zolmol!
lMin = min( lMin, vecPorts[ i ]->getInnerPosition().x );
lMax = max( lMax, vecPorts[ i ]->getInnerPosition().x );
--- 904,908 ----
long lMax = 0;
! for ( unsigned int i = 0 ; i < vecPorts.size() ; i++ ) {
lMin = min( lMin, vecPorts[ i ]->getInnerPosition().x );
lMax = max( lMax, vecPorts[ i ]->getInnerPosition().x );
***************
*** 947,951 ****
TypeableDecorator::setBoxLocation( cRect );
long lY = ( m_Rect.Height() - m_vecLeftPorts.size() * ( HEIGHT_PORT + GAP_PORT ) + GAP_PORT ) / 2;
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ ) {//zolmol!
m_vecLeftPorts[ i ]->setBoxLocation( CRect( GAP_XMODELPORT, lY, GAP_XMODELPORT + WIDTH_PORT, lY + HEIGHT_PORT ) );
lY += HEIGHT_PORT + GAP_PORT;
--- 947,951 ----
TypeableDecorator::setBoxLocation( cRect );
long lY = ( m_Rect.Height() - m_vecLeftPorts.size() * ( HEIGHT_PORT + GAP_PORT ) + GAP_PORT ) / 2;
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ ) {
m_vecLeftPorts[ i ]->setBoxLocation( CRect( GAP_XMODELPORT, lY, GAP_XMODELPORT + WIDTH_PORT, lY + HEIGHT_PORT ) );
lY += HEIGHT_PORT + GAP_PORT;
***************
*** 961,965 ****
{
TypeableDecorator::setActive( bActive );
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )//zolmol!
m_vecLeftPorts[ i ]->setActive( bActive );
for ( i = 0 ; i < m_vecRightPorts.size() ; i++ )
--- 961,965 ----
{
TypeableDecorator::setActive( bActive );
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )
m_vecLeftPorts[ i ]->setActive( bActive );
for ( i = 0 ; i < m_vecRightPorts.size() ; i++ )
***************
*** 970,974 ****
{
std::vector<PortDecorator*> vecPorts( m_vecLeftPorts );
! for ( unsigned int i = 0 ; i < m_vecRightPorts.size() ; i++ )//zolmol!
vecPorts.push_back( m_vecRightPorts[ i ] );
return vecPorts;
--- 970,974 ----
{
std::vector<PortDecorator*> vecPorts( m_vecLeftPorts );
! for ( unsigned int i = 0 ; i < m_vecRightPorts.size() ; i++ )
vecPorts.push_back( m_vecRightPorts[ i ] );
return vecPorts;
***************
*** 977,981 ****
PortDecorator* ModelDecorator::getPort( CComPtr<IMgaFCO> spFCO ) const
{
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )//zolmol!
if ( m_vecLeftPorts[ i ]->getFCO() == spFCO )
return m_vecLeftPorts[ i ];
--- 977,981 ----
PortDecorator* ModelDecorator::getPort( CComPtr<IMgaFCO> spFCO ) const
{
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )
if ( m_vecLeftPorts[ i ]->getFCO() == spFCO )
return m_vecLeftPorts[ i ];
***************
*** 1016,1020 ****
cRect.BottomRight() += CPoint( 1, 1 );
CPoint ptOrigin = pDC->OffsetViewportOrg( (long) ( cRect.left * ( (double) cExtentD.cx / cExtentL.cx ) ), (long) ( cRect.top * ( (double) cExtentD.cy / cExtentL.cy ) ) );
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )//zolmol!
m_vecLeftPorts[ i ]->draw( pDC );
for ( i = 0 ; i < m_vecRightPorts.size() ; i++ )
--- 1016,1020 ----
cRect.BottomRight() += CPoint( 1, 1 );
CPoint ptOrigin = pDC->OffsetViewportOrg( (long) ( cRect.left * ( (double) cExtentD.cx / cExtentL.cx ) ), (long) ( cRect.top * ( (double) cExtentD.cy / cExtentL.cy ) ) );
! for ( unsigned int i = 0 ; i < m_vecLeftPorts.size() ; i++ )
m_vecLeftPorts[ i ]->draw( pDC );
for ( i = 0 ; i < m_vecRightPorts.size() ; i++ )
--- MgaDecorators.dsp DELETED ---
- Previous message: [GME-commit] GMESRC/GME/Annotator Annotator.vcproj,NONE,1.1
DecoratorApp.cpp,1.2,1.3 DecoratorApp.def,1.3,1.4
StdAfx.cpp,1.2,1.3 Annotator.dsp,1.10,NONE
- Next message: [GME-commit]
GMESRC/GME/Console Console.vcproj,NONE,1.1 Console.cpp,1.2,1.3
Console.def,1.1,1.2 ConsoleCtl.cpp,1.2,1.3 ConsoleCtl.h,1.2,1.3
HtmlCtrl.cpp,1.1,1.2 ScriptEdit.h,1.1,1.2 ScriptHost.h,1.1,1.2
StdAfx.cpp,1.2,1.3 StdAfx.h,1.2,1.3 Console.dsp,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list