Skip to content

Adding Aspect Ratio to Display #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adragnevVW wants to merge 1 commit into from
Closed

Adding Aspect Ratio to Display #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/GDTFManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2877,12 +2877,14 @@ GdtfGeometryDisplay::GdtfGeometryDisplay(GdtfGeometry* parent)
:GdtfGeometry(parent)
{
fTexture = "";
fAspectRatio = "";
}

GdtfGeometryDisplay::GdtfGeometryDisplay(const TXString& name, GdtfModelPtr refToModel,const VWTransformMatrix& ma, GdtfGeometry* parent)
:GdtfGeometry(name,refToModel,ma, parent)
{
fTexture = "";
fTexture = "";
fAspectRatio = "";
}

GdtfGeometryDisplay::~GdtfGeometryDisplay()
Expand All @@ -2899,12 +2901,22 @@ void GdtfGeometryDisplay::SetTexture(const TXString& texture)
fTexture = texture;
}

const TXString& GdtfGeometryDisplay::GetAspectRatio() const
{
return fAspectRatio;
}

void GdtfGeometryDisplay::SetAspectRatio( const TXString& aspectRatio )
{
fAspectRatio = aspectRatio;
}
void GdtfGeometryDisplay::OnPrintToFile(IXMLFileNodePtr pNode)
{
//------------------------------------------------------------------------------------
// Call the parent
GdtfGeometry::OnPrintToFile(pNode);
pNode->SetNodeAttributeValue(XML_GDTF_DisplayTexture, fTexture);
pNode->SetNodeAttributeValue( XML_GDTF_DisplayTexture, fTexture);
pNode->SetNodeAttributeValue( XML_GDTF_DisplayAspectRatio, fAspectRatio );
}

void GdtfGeometryDisplay::OnReadFromNode(const IXMLFileNodePtr& pNode)
Expand All @@ -2913,7 +2925,8 @@ void GdtfGeometryDisplay::OnReadFromNode(const IXMLFileNodePtr& pNode)
// Call the parent
GdtfGeometry::OnReadFromNode(pNode);

pNode->GetNodeAttributeValue(XML_GDTF_DisplayTexture, fTexture);
pNode->GetNodeAttributeValue( XML_GDTF_DisplayTexture, fTexture);
pNode->GetNodeAttributeValue( XML_GDTF_DisplayAspectRatio, fAspectRatio );
}

void GdtfGeometryDisplay::OnErrorCheck(const IXMLFileNodePtr& pNode)
Expand Down
3 changes: 3 additions & 0 deletions src/GDTFManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,12 +990,15 @@ namespace SceneData

private:
TXString fTexture;
TXString fAspectRatio;

public:
virtual EGdtfObjectType GetObjectType();
const TXString& GetTexture();
const TXString& GetAspectRatio() const;

void SetTexture(const TXString& texture);
void SetAspectRatio( const TXString& aspectRatio );

protected:
virtual TXString GetNodeName();
Expand Down
25 changes: 25 additions & 0 deletions src/Implementation/CGdtfGeometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,31 @@ VectorworksMVR::VCOMError VectorworksMVR::CGdtfGeometryImpl::SetTexture(MvrStrin
return kVCOMError_NoError;
}

MvrString VectorworksMVR::CGdtfGeometryImpl::GetAspectRatio()
{
if(!fGeometry) return "";

if( fGeometryType != EGdtfObjectType::eGdtfGeometryDisplay) return "";

SceneData::GdtfGeometryDisplayPtr display = static_cast<SceneData::GdtfGeometryDisplayPtr>(fGeometry);
if(!display) return "";

return display->GetAspectRatio().GetCharPtr();
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfGeometryImpl::SetAspectRatio(MvrString aspectRatio)
{
if (!fGeometry) return kVCOMError_NotInitialized;

if( fGeometryType != EGdtfObjectType::eGdtfGeometryDisplay) return kVCOMError_WrongGeometryType;

SceneData::GdtfGeometryDisplayPtr display = static_cast<SceneData::GdtfGeometryDisplayPtr>(fGeometry);
if(!display) return kVCOMError_Failed;

display->SetAspectRatio(aspectRatio);
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfGeometryImpl::GetCountLinkedDmxChannel(size_t& count, IGdtfDmxMode * forMode)
{
// Get Count
Expand Down
5 changes: 4 additions & 1 deletion src/Implementation/CGdtfGeometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ namespace VectorworksMVR

// Display
virtual MvrString VCOM_CALLTYPE GetTexture();
virtual VCOMError VCOM_CALLTYPE SetTexture(MvrString texture);
virtual MvrString VCOM_CALLTYPE GetAspectRatio();
virtual VCOMError VCOM_CALLTYPE SetTexture(MvrString texture);
virtual VCOMError VCOM_CALLTYPE SetAspectRatio(MvrString aspectRatio);


// Helpers
virtual VCOMError VCOM_CALLTYPE GetCountLinkedDmxChannel(size_t& count, IGdtfDmxMode * forMode);
Expand Down
3 changes: 3 additions & 0 deletions src/Include/IMediaRessourceVectorInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,10 @@ namespace VectorworksMVR

// Display
virtual MvrString VCOM_CALLTYPE GetTexture() = 0;
virtual MvrString VCOM_CALLTYPE GetAspectRatio() = 0;

virtual VCOMError VCOM_CALLTYPE SetTexture(MvrString texture) = 0;
virtual VCOMError VCOM_CALLTYPE SetAspectRatio(MvrString aspectRatio) = 0;

// GDTF 1.2
// Lamp
Expand Down
1 change: 1 addition & 0 deletions src/Prefix/CommonPrefix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ const Sint32 kMVR_MinorVersion = 5;

#define XML_GDTF_DisplayNodeName "Display"
#define XML_GDTF_DisplayTexture "Texture"
#define XML_GDTF_DisplayAspectRatio "AspectRatio"

#define XML_GDTF_LaserProtocolNodeName "Protocol"
#define XML_GDTF_LaserProtocolName "Name"
Expand Down
Loading