Skip to content

Fixed converting from higher to lower resolution #135

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

Merged
VzhelevVector merged 2 commits into from
Dec 11, 2025
Merged

Fixed converting from higher to lower resolution #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1d3d1
fixed converting from higher to lower resolution
VzhelevVector Dec 11, 2025
7037599
fix tests
VzhelevVector Dec 11, 2025
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
1 change: 0 additions & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"version": "0.2.0",
"configurations": [
{
CreateDmxChannelSet
"preLaunchTask": "build"
},
{
Expand Down
16 changes: 6 additions & 10 deletions src/GDTFManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5589,16 +5589,12 @@ const TGdtfDmxLogicalChannelArray GdtfDmxChannel::GetLogicalChannelArray()

EGdtfChannelBitResolution SceneData::GdtfDmxChannel::GetChannelBitResolution()
{
// 0 is false, everything else is true
if ((!fCoarse) && !fFine && !fUltra && !fUber) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_32; }
else if (( fCoarse) && !fFine && !fUltra && !fUber) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_8; }
else if (( fCoarse) &&( fFine) && !fUltra && !fUber ) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_16; }
else if (( fCoarse) &&( fFine) && ( fUltra) && !fUber ) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_24; }
else if (( fCoarse) &&( fFine) && ( fUltra) && ( fUber)) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_32; }

// Other states are invalid. This line should never be reached.
DSTOP((kEveryone, "Invalid state in GetChannelBitResolution()"));
return EGdtfChannelBitResolution::eGdtfChannelBitResolution_8;
if (!fCoarse) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_16; }
else if (!fFine) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_8; }
else if (!fUltra) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_16; }
else if (!fUber ) { return EGdtfChannelBitResolution::eGdtfChannelBitResolution_24; }

return EGdtfChannelBitResolution::eGdtfChannelBitResolution_32;
}

DmxValue SceneData::GdtfDmxChannel::GetChannelMaxDmx()
Expand Down
21 changes: 19 additions & 2 deletions src/XmlFileHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//-----------------------------------------------------------------------------

#include "Prefix/StdAfx.h"
#include <cmath>
using namespace VectorworksMVR::VWFC;

#include "SceneDataExchange.h"
Expand Down Expand Up @@ -745,7 +746,23 @@ bool SceneData::GdtfConverter::ConvertDMXValue(const TXString& strValue, const I

double percentage = (dmxValueRaw / maxResolution);

intValue = percentage * maxChannelUnit;
double result = percentage * maxChannelUnit;

// Clamp to avoid floating-point precision errors when converting from higher to lower resolution
if (result > maxChannelUnit) {
intValue = maxChannelUnit;
} else {
// Preserve ordering: ensure non-zero inputs stay non-zero
if (dmxValueRaw > 0 && result < 1.0) {
intValue = 1;
} else {
intValue = static_cast<DmxValue>(result + 0.5);
}

if (intValue > maxChannelUnit) {
intValue = maxChannelUnit;
}
}

}
else
Expand All @@ -757,7 +774,7 @@ bool SceneData::GdtfConverter::ConvertDMXValue(const TXString& strValue, const I



if ( GetChannelMaxDmx(chanlReso) < intValue)
if ( intValue > GetChannelMaxDmx(chanlReso))
{
GdtfParsingError error (GdtfDefines::EGdtfParsingError::eValueError_DmxValueHasWrongValue, node);
SceneData::GdtfFixture::AddError(error);
Expand Down
23 changes: 12 additions & 11 deletions unittest/GdtfDmxUnittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,14 @@ void GdtfDmxUnittest::WriteFile()
virtualFunction->SetAttribute(attribute5);
__checkVCOM(virtualFunction->SetDefaultValue(50000));

IGdtfDmxChannelSetPtr virtualChannelSet1;
virtualFunction->CreateDmxChannelSet("My Name1", 0, 0, &virtualChannelSet1);

IGdtfDmxChannelSetPtr virtualChannelSet3;
virtualFunction->CreateDmxChannelSet("My Name3", 4294967295, 4294967295, &virtualChannelSet3);
IGdtfDmxChannelSetPtr virtualChannelSet1;
virtualFunction->CreateDmxChannelSet("My Name1", 0, 0, &virtualChannelSet1);

IGdtfDmxChannelSetPtr virtualChannelSet2;
virtualFunction->CreateDmxChannelSet("", 1, 65534, &virtualChannelSet2);

IGdtfDmxChannelSetPtr virtualChannelSet3;
virtualFunction->CreateDmxChannelSet("My Name3", 65535, 65535, &virtualChannelSet3);
__checkVCOM(gdtfWrite->Close());
}
}
Expand Down Expand Up @@ -581,13 +582,13 @@ void GdtfDmxUnittest::ReadFile()
this->CheckChannelSet(virtualChannelSet1, "My Name1", 0, 0);


IGdtfDmxChannelSetPtr virtualChannelSet2;
__checkVCOM(virtualFunction->GetDmxChannelSetAt(1, &virtualChannelSet2));
this->CheckChannelSet(virtualChannelSet2, "", 1, 4294967294);
IGdtfDmxChannelSetPtr virtualChannelSet2;
__checkVCOM(virtualFunction->GetDmxChannelSetAt(1, &virtualChannelSet2));
this->CheckChannelSet(virtualChannelSet2, "", 1, 65534);

IGdtfDmxChannelSetPtr virtualChannelSet3;
__checkVCOM(virtualFunction->GetDmxChannelSetAt(2, &virtualChannelSet3));
this->CheckChannelSet(virtualChannelSet3, "My Name3", 4294967295, 4294967295);
IGdtfDmxChannelSetPtr virtualChannelSet3;
__checkVCOM(virtualFunction->GetDmxChannelSetAt(2, &virtualChannelSet3));
this->CheckChannelSet(virtualChannelSet3, "My Name3", 65535, 65535);
}

PrintParsingErrorList(gdtfRead);
Expand Down