From 3827f858d0336ac7e6699d919e21d3eb48da165c Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 28 May 2008 07:58:22 +0000 Subject: [PATCH] Porting to win32 system. --- SUIT.pro | 6 +- src/HTMLService/HTMLService.pro | 11 +- src/HTMLService/HTMLService_HTML.hxx | 168 +++++++++--------- src/HTMLService/HTMLService_HTMLImage.hxx | 120 ++++++------- src/HTMLService/HTMLService_HTMLParagraph.hxx | 88 ++++----- src/HTMLService/HTMLService_HTMLTable.hxx | 154 ++++++++-------- src/HTMLService/HTMLService_HTMLTableCell.hxx | 126 ++++++------- src/HTMLService/HTMLService_HTMLTableRow.hxx | 100 +++++------ src/HTMLService/HTMLService_HTMLText.hxx | 116 ++++++------ src/LogWindow/LogWindow.pro | 16 +- src/OBJECT/OBJECT.pro | 15 +- src/ObjBrowser/ObjBrowser.pro | 16 +- 12 files changed, 485 insertions(+), 451 deletions(-) diff --git a/SUIT.pro b/SUIT.pro index f6ce44637..76ca8e837 100644 --- a/SUIT.pro +++ b/SUIT.pro @@ -1,6 +1,10 @@ -TEMPLATE = subdirs +unix:TEMPLATE = subdirs +win32:TEMPLATE = vcsubdirs + CONFIG += ordered +win32:CONFIG += embed_manifest_exe + SUBDIRS = src/Qtx \ src/Style \ src/ObjBrowser \ diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro index 54a1af46c..ea2dad205 100755 --- a/src/HTMLService/HTMLService.pro +++ b/src/HTMLService/HTMLService.pro @@ -1,4 +1,5 @@ -TEMPLATE = lib +unix:TEMPLATE = lib +win32:TEMPLATE = vclib DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc @@ -16,7 +17,13 @@ LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER} CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared -win32:DEFINES += WIN32 +win32:copy_hdr.name = Install ${QMAKE_FILE_IN} +win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.hxx +win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.hxx +win32:copy_hdr.input = HEADERS +win32:QMAKE_EXTRA_COMPILERS += copy_hdr + +win32:DEFINES += WNT WIN32 DEFINES += HTMLSERVICE_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS HEADERS = *.hxx diff --git a/src/HTMLService/HTMLService_HTML.hxx b/src/HTMLService/HTMLService_HTML.hxx index 083e6ef0c..d5d174826 100755 --- a/src/HTMLService/HTMLService_HTML.hxx +++ b/src/HTMLService/HTMLService_HTML.hxx @@ -1,84 +1,84 @@ -// File: HTMLService_HTML.hxx -// Created: 12.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLSERVICE_HTML_H -#define HTMLSERVICE_HTML_H - -#include - -#include -#include - -#include -#include - -class Quantity_Color; -class Handle(HTMLService_HTML); - -typedef NCollection_Sequence SequenceOfHTMLLine; - -/*! - Class HTMLService_HTML. Base class for HTML generation. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTML : public MMgt_TShared -{ -public: - enum { Left = 0x01, Right = 0x02, Center = 0x04, - Top = 0x08, Bottom = 0x10, Middle = 0x20, - HAlignment = Left | Right | Center, VAlignment = Top | Bottom | Middle } AlignmentFlags; - -public: - Standard_EXPORT HTMLService_HTML(); - Standard_EXPORT HTMLService_HTML( const Handle(HTMLService_HTML)& ); - Standard_EXPORT ~HTMLService_HTML(); - - Standard_EXPORT TCollection_ExtendedString GetTitle() const; - Standard_EXPORT void SetTitle( const TCollection_ExtendedString& ); - - Standard_EXPORT Standard_Boolean GenerateFile( const TCollection_ExtendedString&, - const Standard_Boolean = Standard_False ) const; - Standard_EXPORT SequenceOfHTMLLine GenerateText( const Standard_Boolean = Standard_False ) const; - - Standard_EXPORT static TCollection_ExtendedString ColorString( const Quantity_Color& ); - Standard_EXPORT static TCollection_ExtendedString AlignString( const Standard_Integer ); - - Standard_EXPORT Standard_Boolean IsVisible() const; - Standard_EXPORT void SetVisible( const Standard_Boolean ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const = 0; - Standard_EXPORT virtual void SubItemsHTML( SequenceOfHTMLLine& ) const; - - Standard_EXPORT TCollection_ExtendedString EncloseToTag( const TCollection_ExtendedString&, const TCollection_ExtendedString&, - const TCollection_ExtendedString& = TCollection_ExtendedString() ) const; - - Standard_EXPORT void ClearSubItems(); - Standard_EXPORT void InsertSubItem( const Handle(HTMLService_HTML)& ); - Standard_EXPORT void RemoveSubItem( const Handle(HTMLService_HTML)& ); - - void AppendIndent( SequenceOfHTMLLine& ) const; - void AppendIndent( TCollection_ExtendedString& ) const; - void Concatenate( SequenceOfHTMLLine&, const SequenceOfHTMLLine& ) const; - -private: - void BeginDocument( SequenceOfHTMLLine& ) const; - void EndDocument( SequenceOfHTMLLine& ) const; - -private: - typedef NCollection_Sequence HTMLSequence; - -private: - TCollection_ExtendedString myTitle; - Standard_Boolean myVisible; - HTMLSequence mySubItems; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTML) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTML, MMgt_TShared) - -#endif +// File: HTMLService_HTML.hxx +// Created: 12.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLSERVICE_HTML_H +#define HTMLSERVICE_HTML_H + +#include + +#include +#include + +#include +#include + +class Quantity_Color; +class Handle(HTMLService_HTML); + +typedef NCollection_Sequence SequenceOfHTMLLine; + +/*! + Class HTMLService_HTML. Base class for HTML generation. +*/ + +class HTMLService_HTML : public MMgt_TShared +{ +public: + enum { Left = 0x01, Right = 0x02, Center = 0x04, + Top = 0x08, Bottom = 0x10, Middle = 0x20, + HAlignment = Left | Right | Center, VAlignment = Top | Bottom | Middle } AlignmentFlags; + +public: + Standard_EXPORT HTMLService_HTML(); + Standard_EXPORT HTMLService_HTML( const Handle(HTMLService_HTML)& ); + Standard_EXPORT ~HTMLService_HTML(); + + Standard_EXPORT TCollection_ExtendedString GetTitle() const; + Standard_EXPORT void SetTitle( const TCollection_ExtendedString& ); + + Standard_EXPORT Standard_Boolean GenerateFile( const TCollection_ExtendedString&, + const Standard_Boolean = Standard_False ) const; + Standard_EXPORT SequenceOfHTMLLine GenerateText( const Standard_Boolean = Standard_False ) const; + + Standard_EXPORT static TCollection_ExtendedString ColorString( const Quantity_Color& ); + Standard_EXPORT static TCollection_ExtendedString AlignString( const Standard_Integer ); + + Standard_EXPORT Standard_Boolean IsVisible() const; + Standard_EXPORT void SetVisible( const Standard_Boolean ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const = 0; + Standard_EXPORT virtual void SubItemsHTML( SequenceOfHTMLLine& ) const; + + Standard_EXPORT TCollection_ExtendedString EncloseToTag( const TCollection_ExtendedString&, const TCollection_ExtendedString&, + const TCollection_ExtendedString& = TCollection_ExtendedString() ) const; + + Standard_EXPORT void ClearSubItems(); + Standard_EXPORT void InsertSubItem( const Handle(HTMLService_HTML)& ); + Standard_EXPORT void RemoveSubItem( const Handle(HTMLService_HTML)& ); + + void AppendIndent( SequenceOfHTMLLine& ) const; + void AppendIndent( TCollection_ExtendedString& ) const; + void Concatenate( SequenceOfHTMLLine&, const SequenceOfHTMLLine& ) const; + +private: + void BeginDocument( SequenceOfHTMLLine& ) const; + void EndDocument( SequenceOfHTMLLine& ) const; + +private: + typedef NCollection_Sequence HTMLSequence; + +private: + TCollection_ExtendedString myTitle; + Standard_Boolean myVisible; + HTMLSequence mySubItems; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTML) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTML, MMgt_TShared) + +#endif diff --git a/src/HTMLService/HTMLService_HTMLImage.hxx b/src/HTMLService/HTMLService_HTMLImage.hxx index 95bae3c1d..ba91de642 100755 --- a/src/HTMLService/HTMLService_HTMLImage.hxx +++ b/src/HTMLService/HTMLService_HTMLImage.hxx @@ -1,60 +1,60 @@ -// File: HTMLService_HTMLImage.hxx -// Created: 13.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLSERVICE_HTMLIMAGE_H -#define HTMLSERVICE_HTMLIMAGE_H - -#include -#include - -#include - -/*! - Class HTMLService_HTMLImage. Generator of the HTML image. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTMLImage : public HTMLService_HTML -{ -public: - enum { SP_Unknown, SP_File, SP_HTTP, SP_FTP } SourceProtocol; - -public: - Standard_EXPORT HTMLService_HTMLImage( const TCollection_ExtendedString& = TCollection_ExtendedString() ); - Standard_EXPORT HTMLService_HTMLImage( const Handle(HTMLService_HTML)&, - const TCollection_ExtendedString& = TCollection_ExtendedString() ); - Standard_EXPORT virtual ~HTMLService_HTMLImage(); - - Standard_EXPORT Standard_Integer GetWidth() const; - Standard_EXPORT Standard_Integer GetHeight() const; - Standard_EXPORT TCollection_ExtendedString GetSource() const; - Standard_EXPORT Standard_Integer GetAlignment() const; - Standard_EXPORT Standard_Integer GetSourceProtocol() const; - - Standard_EXPORT void SetWidth( const Standard_Integer ); - Standard_EXPORT void SetHeight( const Standard_Integer ); - Standard_EXPORT void SetAlignment( const Standard_Integer ); - Standard_EXPORT void SetSource( const TCollection_ExtendedString& ); - Standard_EXPORT void SetSourceProtocol( const Standard_Integer& ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; - -private: - TCollection_ExtendedString SourcePrefix() const; - -private: - Standard_Integer myAlign; - Standard_Integer myWidth; - Standard_Integer myHeight; - TCollection_ExtendedString mySource; - Standard_Integer mySrcProto; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTMLImage) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTMLImage, HTMLService_HTML) - -#endif +// File: HTMLService_HTMLImage.hxx +// Created: 13.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLSERVICE_HTMLIMAGE_H +#define HTMLSERVICE_HTMLIMAGE_H + +#include +#include + +#include + +/*! + Class HTMLService_HTMLImage. Generator of the HTML image. +*/ + +class HTMLService_HTMLImage : public HTMLService_HTML +{ +public: + enum { SP_Unknown, SP_File, SP_HTTP, SP_FTP } SourceProtocol; + +public: + Standard_EXPORT HTMLService_HTMLImage( const TCollection_ExtendedString& = TCollection_ExtendedString() ); + Standard_EXPORT HTMLService_HTMLImage( const Handle(HTMLService_HTML)&, + const TCollection_ExtendedString& = TCollection_ExtendedString() ); + Standard_EXPORT virtual ~HTMLService_HTMLImage(); + + Standard_EXPORT Standard_Integer GetWidth() const; + Standard_EXPORT Standard_Integer GetHeight() const; + Standard_EXPORT TCollection_ExtendedString GetSource() const; + Standard_EXPORT Standard_Integer GetAlignment() const; + Standard_EXPORT Standard_Integer GetSourceProtocol() const; + + Standard_EXPORT void SetWidth( const Standard_Integer ); + Standard_EXPORT void SetHeight( const Standard_Integer ); + Standard_EXPORT void SetAlignment( const Standard_Integer ); + Standard_EXPORT void SetSource( const TCollection_ExtendedString& ); + Standard_EXPORT void SetSourceProtocol( const Standard_Integer& ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; + +private: + TCollection_ExtendedString SourcePrefix() const; + +private: + Standard_Integer myAlign; + Standard_Integer myWidth; + Standard_Integer myHeight; + TCollection_ExtendedString mySource; + Standard_Integer mySrcProto; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTMLImage) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTMLImage, HTMLService_HTML) + +#endif diff --git a/src/HTMLService/HTMLService_HTMLParagraph.hxx b/src/HTMLService/HTMLService_HTMLParagraph.hxx index 1b65e5176..a1db35603 100755 --- a/src/HTMLService/HTMLService_HTMLParagraph.hxx +++ b/src/HTMLService/HTMLService_HTMLParagraph.hxx @@ -1,44 +1,44 @@ -// File: HTMLService_HTMLParagraph.hxx -// Created: 13.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLSERVICE_HTMLPARAGRAPH_H -#define HTMLSERVICE_HTMLPARAGRAPH_H - -#include -#include - -/*! - Class HTMLService_HTMLParagraph. Generator of the HTML paragraph text. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTMLParagraph : public HTMLService_HTMLText -{ -public: - Standard_EXPORT HTMLService_HTMLParagraph(); - Standard_EXPORT HTMLService_HTMLParagraph( const Handle(HTMLService_HTML)& ); - Standard_EXPORT virtual ~HTMLService_HTMLParagraph(); - - Standard_EXPORT Standard_Boolean GetNoBreak() const; - Standard_EXPORT void SetNoBreak( const Standard_Boolean& ); - - Standard_EXPORT void Clear(); - Standard_EXPORT void Insert( const Handle(HTMLService_HTML)& ); - Standard_EXPORT void InsertText( const TCollection_ExtendedString& ); - Standard_EXPORT void InsertImage( const TCollection_ExtendedString&, - const Standard_Integer = -1, const Standard_Integer = -1 ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; - -private: - Standard_Boolean myNoBr; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTMLParagraph) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTMLParagraph, HTMLService_HTMLText) - -#endif +// File: HTMLService_HTMLParagraph.hxx +// Created: 13.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLSERVICE_HTMLPARAGRAPH_H +#define HTMLSERVICE_HTMLPARAGRAPH_H + +#include +#include + +/*! + Class HTMLService_HTMLParagraph. Generator of the HTML paragraph text. +*/ + +class HTMLService_HTMLParagraph : public HTMLService_HTMLText +{ +public: + Standard_EXPORT HTMLService_HTMLParagraph(); + Standard_EXPORT HTMLService_HTMLParagraph( const Handle(HTMLService_HTML)& ); + Standard_EXPORT virtual ~HTMLService_HTMLParagraph(); + + Standard_EXPORT Standard_Boolean GetNoBreak() const; + Standard_EXPORT void SetNoBreak( const Standard_Boolean& ); + + Standard_EXPORT void Clear(); + Standard_EXPORT void Insert( const Handle(HTMLService_HTML)& ); + Standard_EXPORT void InsertText( const TCollection_ExtendedString& ); + Standard_EXPORT void InsertImage( const TCollection_ExtendedString&, + const Standard_Integer = -1, const Standard_Integer = -1 ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; + +private: + Standard_Boolean myNoBr; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTMLParagraph) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTMLParagraph, HTMLService_HTMLText) + +#endif diff --git a/src/HTMLService/HTMLService_HTMLTable.hxx b/src/HTMLService/HTMLService_HTMLTable.hxx index 840f0aa04..40b3b0b91 100755 --- a/src/HTMLService/HTMLService_HTMLTable.hxx +++ b/src/HTMLService/HTMLService_HTMLTable.hxx @@ -1,77 +1,77 @@ -// File: HTMLService_HTMLTable.hxx -// Created: 12.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLSERVICE_HTMLTABLE_H -#define HTMLSERVICE_HTMLTABLE_H - -#include -#include - -#include - -#include - -#include - -/*! - Class HTMLService_HTMLTable. Generator of the HTML Table text. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTMLTable : public HTMLService_HTML -{ -public: - Standard_EXPORT HTMLService_HTMLTable( const Standard_Integer = 0, const Standard_Integer = 0 ); - Standard_EXPORT HTMLService_HTMLTable( const Handle(HTMLService_HTML)&, const Standard_Integer = 0, const Standard_Integer = 0 ); - Standard_EXPORT virtual ~HTMLService_HTMLTable(); - - Standard_EXPORT Standard_Integer GetNumRows() const; - Standard_EXPORT Standard_Integer GetNumCols() const; - - Standard_EXPORT Handle(HTMLService_HTMLTableRow) GetRow( const Standard_Integer ) const; - Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer, const Standard_Integer ) const; - - Standard_EXPORT Standard_Integer GetBorder() const; - Standard_EXPORT Standard_Integer GetCellSpacing() const; - Standard_EXPORT Standard_Integer GetCellPadding() const; - Standard_EXPORT Quantity_Color GetBackgroundColor() const; - Standard_EXPORT Standard_Integer GetWidth( Standard_Boolean* = 0 ) const; - - Standard_EXPORT void SetBorder( const Standard_Integer ); - Standard_EXPORT void SetCellSpacing( const Standard_Integer ); - Standard_EXPORT void SetCellPadding( const Standard_Integer ); - Standard_EXPORT void SetBackgroundColor( const Quantity_Color& ); - Standard_EXPORT void SetWidth( const Standard_Integer, - const Standard_Boolean = Standard_False ); - - Standard_EXPORT void SetRowSpan( const Standard_Integer, const Standard_Integer ); - Standard_EXPORT void SetColumnSpan( const Standard_Integer, const Standard_Integer ); - Standard_EXPORT void SetColumnWidth( const Standard_Integer, const Standard_Integer, - const Standard_Boolean = Standard_False ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; - -private: - void PrepareCells() const; - void Initialize( const Standard_Integer, const Standard_Integer ); - -private: - Handle(TColStd_HArray1OfTransient) myRows; - - Standard_Boolean myUseBC; - Standard_Integer myWidth; - Standard_Integer myBorder; - Standard_Boolean myPercent; - Quantity_Color myBgColor; - Standard_Integer mySpacing; - Standard_Integer myPadding; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTMLTable) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTMLTable, HTMLService_HTML) - -#endif +// File: HTMLService_HTMLTable.hxx +// Created: 12.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLSERVICE_HTMLTABLE_H +#define HTMLSERVICE_HTMLTABLE_H + +#include +#include + +#include + +#include + +#include + +/*! + Class HTMLService_HTMLTable. Generator of the HTML Table text. +*/ + +class HTMLService_HTMLTable : public HTMLService_HTML +{ +public: + Standard_EXPORT HTMLService_HTMLTable( const Standard_Integer = 0, const Standard_Integer = 0 ); + Standard_EXPORT HTMLService_HTMLTable( const Handle(HTMLService_HTML)&, const Standard_Integer = 0, const Standard_Integer = 0 ); + Standard_EXPORT virtual ~HTMLService_HTMLTable(); + + Standard_EXPORT Standard_Integer GetNumRows() const; + Standard_EXPORT Standard_Integer GetNumCols() const; + + Standard_EXPORT Handle(HTMLService_HTMLTableRow) GetRow( const Standard_Integer ) const; + Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer, const Standard_Integer ) const; + + Standard_EXPORT Standard_Integer GetBorder() const; + Standard_EXPORT Standard_Integer GetCellSpacing() const; + Standard_EXPORT Standard_Integer GetCellPadding() const; + Standard_EXPORT Quantity_Color GetBackgroundColor() const; + Standard_EXPORT Standard_Integer GetWidth( Standard_Boolean* = 0 ) const; + + Standard_EXPORT void SetBorder( const Standard_Integer ); + Standard_EXPORT void SetCellSpacing( const Standard_Integer ); + Standard_EXPORT void SetCellPadding( const Standard_Integer ); + Standard_EXPORT void SetBackgroundColor( const Quantity_Color& ); + Standard_EXPORT void SetWidth( const Standard_Integer, + const Standard_Boolean = Standard_False ); + + Standard_EXPORT void SetRowSpan( const Standard_Integer, const Standard_Integer ); + Standard_EXPORT void SetColumnSpan( const Standard_Integer, const Standard_Integer ); + Standard_EXPORT void SetColumnWidth( const Standard_Integer, const Standard_Integer, + const Standard_Boolean = Standard_False ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; + +private: + void PrepareCells() const; + void Initialize( const Standard_Integer, const Standard_Integer ); + +private: + Handle(TColStd_HArray1OfTransient) myRows; + + Standard_Boolean myUseBC; + Standard_Integer myWidth; + Standard_Integer myBorder; + Standard_Boolean myPercent; + Quantity_Color myBgColor; + Standard_Integer mySpacing; + Standard_Integer myPadding; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTMLTable) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTMLTable, HTMLService_HTML) + +#endif diff --git a/src/HTMLService/HTMLService_HTMLTableCell.hxx b/src/HTMLService/HTMLService_HTMLTableCell.hxx index c90c0caae..57c33d20b 100755 --- a/src/HTMLService/HTMLService_HTMLTableCell.hxx +++ b/src/HTMLService/HTMLService_HTMLTableCell.hxx @@ -1,63 +1,63 @@ -// File: HTMLService_HTMLTableCell.hxx -// Created: 12.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLService_HTMLTABLECELL_H -#define HTMLService_HTMLTABLECELL_H - -#include -#include - -#include - -/*! - Class HTMLService_HTMLTableCell. Generator of the HTML Table cell text. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTMLTableCell : public HTMLService_HTMLParagraph -{ -public: - Standard_EXPORT HTMLService_HTMLTableCell(); - Standard_EXPORT HTMLService_HTMLTableCell( const Handle(HTMLService_HTML)& ); - Standard_EXPORT virtual ~HTMLService_HTMLTableCell(); - - Standard_EXPORT Standard_Integer GetColSpan() const; - Standard_EXPORT Standard_Integer GetRowSpan() const; - Standard_EXPORT Standard_Integer GetAlignment() const; - Standard_EXPORT Standard_Integer GetWidth( Standard_Boolean* = 0 ) const; - - Standard_EXPORT Quantity_Color GetBackgroundColor() const; - Standard_EXPORT Standard_Boolean IsHeaderCell() const; - - Standard_EXPORT void SetColSpan( const Standard_Integer ); - Standard_EXPORT void SetRowSpan( const Standard_Integer ); - Standard_EXPORT void SetAlignment( const Standard_Integer ); - Standard_EXPORT void SetWidth( const Standard_Integer, - const Standard_Boolean = Standard_False ); - Standard_EXPORT void SetBackgroundColor( const Quantity_Color& ); - Standard_EXPORT void SetHeaderCell( const Standard_Boolean ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; - -private: - TCollection_ExtendedString CellString() const; - -private: - Standard_Integer myWidth; - Standard_Integer myAlign; - Standard_Boolean myUseBC; - Standard_Boolean myPercent; - Standard_Integer myColSpan; - Standard_Integer myRowSpan; - Quantity_Color myBgColor; - Standard_Boolean myIsHeader; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTMLTableCell) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableCell, HTMLService_HTMLParagraph) - -#endif +// File: HTMLService_HTMLTableCell.hxx +// Created: 12.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLService_HTMLTABLECELL_H +#define HTMLService_HTMLTABLECELL_H + +#include +#include + +#include + +/*! + Class HTMLService_HTMLTableCell. Generator of the HTML Table cell text. +*/ + +class HTMLService_HTMLTableCell : public HTMLService_HTMLParagraph +{ +public: + Standard_EXPORT HTMLService_HTMLTableCell(); + Standard_EXPORT HTMLService_HTMLTableCell( const Handle(HTMLService_HTML)& ); + Standard_EXPORT virtual ~HTMLService_HTMLTableCell(); + + Standard_EXPORT Standard_Integer GetColSpan() const; + Standard_EXPORT Standard_Integer GetRowSpan() const; + Standard_EXPORT Standard_Integer GetAlignment() const; + Standard_EXPORT Standard_Integer GetWidth( Standard_Boolean* = 0 ) const; + + Standard_EXPORT Quantity_Color GetBackgroundColor() const; + Standard_EXPORT Standard_Boolean IsHeaderCell() const; + + Standard_EXPORT void SetColSpan( const Standard_Integer ); + Standard_EXPORT void SetRowSpan( const Standard_Integer ); + Standard_EXPORT void SetAlignment( const Standard_Integer ); + Standard_EXPORT void SetWidth( const Standard_Integer, + const Standard_Boolean = Standard_False ); + Standard_EXPORT void SetBackgroundColor( const Quantity_Color& ); + Standard_EXPORT void SetHeaderCell( const Standard_Boolean ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; + +private: + TCollection_ExtendedString CellString() const; + +private: + Standard_Integer myWidth; + Standard_Integer myAlign; + Standard_Boolean myUseBC; + Standard_Boolean myPercent; + Standard_Integer myColSpan; + Standard_Integer myRowSpan; + Quantity_Color myBgColor; + Standard_Boolean myIsHeader; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTMLTableCell) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableCell, HTMLService_HTMLParagraph) + +#endif diff --git a/src/HTMLService/HTMLService_HTMLTableRow.hxx b/src/HTMLService/HTMLService_HTMLTableRow.hxx index 6dd714e27..d626a4f6d 100755 --- a/src/HTMLService/HTMLService_HTMLTableRow.hxx +++ b/src/HTMLService/HTMLService_HTMLTableRow.hxx @@ -1,50 +1,50 @@ -// File: HTMLService_HTMLTableRow.hxx -// Created: 12.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLService_HTMLTABLEROW_H -#define HTMLService_HTMLTABLEROW_H - -#include -#include - -#include - -#include - -/*! - Class HTMLService_HTMLTableRow. Generator of the HTML Table row text. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTMLTableRow : public HTMLService_HTML -{ -public: - Standard_EXPORT HTMLService_HTMLTableRow( const Standard_Integer = 0 ); - Standard_EXPORT HTMLService_HTMLTableRow( const Handle(HTMLService_HTML)&, const Standard_Integer = 0 ); - Standard_EXPORT virtual ~HTMLService_HTMLTableRow(); - - Standard_EXPORT Standard_Integer GetSize() const; - Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer ) const; - - Standard_EXPORT Quantity_Color GetBackgroundColor() const; - Standard_EXPORT void SetBackgroundColor( const Quantity_Color& ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; - -private: - void Initialize( const Standard_Integer ); - -private: - Handle(TColStd_HArray1OfTransient) myCells; - Standard_Boolean myUseBC; - Quantity_Color myBgColor; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTMLTableRow) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableRow, HTMLService_HTML) - -#endif +// File: HTMLService_HTMLTableRow.hxx +// Created: 12.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLService_HTMLTABLEROW_H +#define HTMLService_HTMLTABLEROW_H + +#include +#include + +#include + +#include + +/*! + Class HTMLService_HTMLTableRow. Generator of the HTML Table row text. +*/ + +class HTMLService_HTMLTableRow : public HTMLService_HTML +{ +public: + Standard_EXPORT HTMLService_HTMLTableRow( const Standard_Integer = 0 ); + Standard_EXPORT HTMLService_HTMLTableRow( const Handle(HTMLService_HTML)&, const Standard_Integer = 0 ); + Standard_EXPORT virtual ~HTMLService_HTMLTableRow(); + + Standard_EXPORT Standard_Integer GetSize() const; + Standard_EXPORT Handle(HTMLService_HTMLTableCell) GetCell( const Standard_Integer ) const; + + Standard_EXPORT Quantity_Color GetBackgroundColor() const; + Standard_EXPORT void SetBackgroundColor( const Quantity_Color& ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; + +private: + void Initialize( const Standard_Integer ); + +private: + Handle(TColStd_HArray1OfTransient) myCells; + Standard_Boolean myUseBC; + Quantity_Color myBgColor; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTMLTableRow) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTMLTableRow, HTMLService_HTML) + +#endif diff --git a/src/HTMLService/HTMLService_HTMLText.hxx b/src/HTMLService/HTMLService_HTMLText.hxx index 4cd110102..06155bf72 100755 --- a/src/HTMLService/HTMLService_HTMLText.hxx +++ b/src/HTMLService/HTMLService_HTMLText.hxx @@ -1,58 +1,58 @@ -// File: HTMLService_HTMLText.hxx -// Created: 13.10.2006 -// Author: Sergey TELKOV -// Copyright (C) AREVA NP 2006 - -#ifndef HTMLSERVICE_HTMLTEXT_H -#define HTMLSERVICE_HTMLTEXT_H - -#include -#include - -#include - -/*! - Class HTMLService_HTMLText. Generator of the simple HTML text. -*/ - -class HTMLSERVICE_EXPORT HTMLService_HTMLText : public HTMLService_HTML -{ -public: - enum { Normal = 0x00, Bold = 0x01, Italic = 0x02, Underline = 0x04, - StrikeOut = 0x08, Subscript = 0x10, Superscript = 0x20 } FontFlags; - -public: - Standard_EXPORT HTMLService_HTMLText( const TCollection_ExtendedString& = TCollection_ExtendedString(), - const Standard_Integer = Normal ); - Standard_EXPORT HTMLService_HTMLText( const Handle(HTMLService_HTML)&, - const TCollection_ExtendedString& = TCollection_ExtendedString(), - const Standard_Integer = Normal ); - Standard_EXPORT virtual ~HTMLService_HTMLText(); - - Standard_EXPORT TCollection_ExtendedString GetText() const; - Standard_EXPORT Standard_Integer GetFontFlags() const; - Standard_EXPORT Standard_Integer GetHeadingLevel() const; - Standard_EXPORT Quantity_Color GetForegroundColor() const; - - Standard_EXPORT void SetFontFlags( const Standard_Integer ); - Standard_EXPORT void SetHeadingLevel( const Standard_Integer ); - Standard_EXPORT void SetForegroundColor( const Quantity_Color& ); - Standard_EXPORT void SetText( const TCollection_ExtendedString& ); - -protected: - Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; - -private: - TCollection_ExtendedString myText; - Quantity_Color myColor; - Standard_Integer myHeading; - Standard_Boolean myUseColor; - Standard_Integer myFontFlags; - -public: - DEFINE_STANDARD_RTTI(HTMLService_HTMLText) -}; - -DEFINE_STANDARD_HANDLE(HTMLService_HTMLText, HTMLService_HTML) - -#endif +// File: HTMLService_HTMLText.hxx +// Created: 13.10.2006 +// Author: Sergey TELKOV +// Copyright (C) AREVA NP 2006 + +#ifndef HTMLSERVICE_HTMLTEXT_H +#define HTMLSERVICE_HTMLTEXT_H + +#include +#include + +#include + +/*! + Class HTMLService_HTMLText. Generator of the simple HTML text. +*/ + +class HTMLService_HTMLText : public HTMLService_HTML +{ +public: + enum { Normal = 0x00, Bold = 0x01, Italic = 0x02, Underline = 0x04, + StrikeOut = 0x08, Subscript = 0x10, Superscript = 0x20 } FontFlags; + +public: + Standard_EXPORT HTMLService_HTMLText( const TCollection_ExtendedString& = TCollection_ExtendedString(), + const Standard_Integer = Normal ); + Standard_EXPORT HTMLService_HTMLText( const Handle(HTMLService_HTML)&, + const TCollection_ExtendedString& = TCollection_ExtendedString(), + const Standard_Integer = Normal ); + Standard_EXPORT virtual ~HTMLService_HTMLText(); + + Standard_EXPORT TCollection_ExtendedString GetText() const; + Standard_EXPORT Standard_Integer GetFontFlags() const; + Standard_EXPORT Standard_Integer GetHeadingLevel() const; + Standard_EXPORT Quantity_Color GetForegroundColor() const; + + Standard_EXPORT void SetFontFlags( const Standard_Integer ); + Standard_EXPORT void SetHeadingLevel( const Standard_Integer ); + Standard_EXPORT void SetForegroundColor( const Quantity_Color& ); + Standard_EXPORT void SetText( const TCollection_ExtendedString& ); + +protected: + Standard_EXPORT virtual void Generate( SequenceOfHTMLLine& ) const; + +private: + TCollection_ExtendedString myText; + Quantity_Color myColor; + Standard_Integer myHeading; + Standard_Boolean myUseColor; + Standard_Integer myFontFlags; + +public: + DEFINE_STANDARD_RTTI(HTMLService_HTMLText) +}; + +DEFINE_STANDARD_HANDLE(HTMLService_HTMLText, HTMLService_HTML) + +#endif diff --git a/src/LogWindow/LogWindow.pro b/src/LogWindow/LogWindow.pro index aafb19a4f..121b5e8b2 100644 --- a/src/LogWindow/LogWindow.pro +++ b/src/LogWindow/LogWindow.pro @@ -1,17 +1,17 @@ -TEMPLATE = lib +unix:TEMPLATE = lib +win32:TEMPLATE = vclib DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH = ../../include -win32:LIBS += ../../lib/suit.lib ../../lib/qtx.lib -unix:LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx +LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared -win32:DEFINES += WIN32 +win32:DEFINES += WNT WIN32 DEFINES += LOGWINDOW_EXPORTS HEADERS = *.h @@ -25,7 +25,7 @@ win32:GUIResources = ..\\..\\resources lrelease.name = LRELASE ${QMAKE_FILE_IN} unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm -win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm +win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm lrelease.input = TRANSLATIONS @@ -34,6 +34,12 @@ win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm lrelease.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += lrelease +win32:copy_hdr.name = Install ${QMAKE_FILE_IN} +win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h +win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h +win32:copy_hdr.input = HEADERS +win32:QMAKE_EXTRA_COMPILERS += copy_hdr + includes.files = $$HEADERS includes.path = ../../include diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro index 86459b714..5400a4b8b 100644 --- a/src/OBJECT/OBJECT.pro +++ b/src/OBJECT/OBJECT.pro @@ -1,4 +1,5 @@ -TEMPLATE = lib +unix:TEMPLATE = lib +win32:TEMPLATE = vclib DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc @@ -6,7 +7,8 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET CAS_CPPFLAGS = $(CASINC) -CAS_LDPATH = -L$(CASLIB) -lTKV3d +unix:CAS_LDPATH = -L$(CASLIB) -lTKV3d +win32:CAS_LDPATH = -L$(CASLIB) -lTKernel -lTKMath -lTKV3d INCLUDEPATH += ../../include $${CAS_CPPFLAGS} LIBS += $${CAS_LDPATH} @@ -14,7 +16,7 @@ LIBS += $${CAS_LDPATH} CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared -win32:DEFINES += WIN32 +win32:DEFINES += WNT WIN32 DEFINES += $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS HEADERS = *.hxx @@ -24,6 +26,13 @@ HEADERS += *.jxx SOURCES = *.cxx +win32:COPY_FILES = *.hxx *.h +win32:copy_hxx.name = Install(.hxx) ${QMAKE_FILE_IN} +win32:copy_hxx.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.hxx +win32:copy_hxx.output = ../../include/${QMAKE_FILE_BASE}.hxx +win32:copy_hxx.input = COPY_FILES +win32:QMAKE_EXTRA_COMPILERS += copy_hxx + includes.files = $$HEADERS includes.path = ../../include diff --git a/src/ObjBrowser/ObjBrowser.pro b/src/ObjBrowser/ObjBrowser.pro index 61bf93c5b..0a11142b5 100644 --- a/src/ObjBrowser/ObjBrowser.pro +++ b/src/ObjBrowser/ObjBrowser.pro @@ -1,4 +1,5 @@ -TEMPLATE = lib +unix:TEMPLATE = lib +win32:TEMPLATE = vclib DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc @@ -10,8 +11,8 @@ LIBS += -L../../$(CONFIG_ID)/lib -lQtx CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared -win32:DEFINES += WIN32 -DEFINES += LOGWINDOW_EXPORTS +win32:DEFINES += WNT WIN32 +DEFINES += OB_EXPORTS HEADERS = *.h @@ -24,7 +25,7 @@ win32:GUIResources = ..\\..\\resources lrelease.name = LRELASE ${QMAKE_FILE_IN} unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm -win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm +win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm lrelease.input = TRANSLATIONS @@ -33,6 +34,13 @@ win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm lrelease.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += lrelease +win32:copy_hdr.name = Install ${QMAKE_FILE_IN} +win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h +win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h +win32:copy_hdr.input = HEADERS +win32:QMAKE_EXTRA_COMPILERS += copy_hdr + + includes.files = $$HEADERS includes.path = ../../include -- 2.39.2