Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include <ossia/detail/config.hpp>

#include <QDebug>
#if defined(OSSIA_PROTOCOL_ARTNET)
//#if defined(OSSIA_PROTOCOL_ARTNET)
#if 1
#include "ArtnetDevice.hpp"
#include "ArtnetSpecificSettings.hpp"

Expand Down Expand Up @@ -102,21 +103,21 @@ static void addArtnetFixture(
name = capa.effectName.toStdString();
else
name = capa.type.toStdString();

auto cld = node.create_child(name);
auto cld_p = std::make_unique<ossia::net::dmx_parameter>(
*cld, buffer, k, capa.range.first, capa.range.second);
cld_p->set_value(int(capa.range.first));
cld->set_parameter(std::move(cld_p));

assert(dynamic_cast<ossia::net::dmx_parameter*>(cld->get_parameter()));
if(!capa.comment.isEmpty())
ossia::net::set_description(*cld, capa.comment.toStdString());
}

}
} vis{*chan_node, buffer, dmx_channel};

ossia::visit(vis, chan.capabilities);
p.set_value(chan.defaultValue);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ class FixtureDatabase : public TreeNodeBasedItemModel<FixtureNode>
if(auto it = doc.FindMember("name"); it != doc.MemberEnd())
{
QString name = it->value.GetString();

int newRowPosition = 0;
auto other_fixture_it = manufacturer.begin();
while(other_fixture_it != manufacturer.end()
Expand Down Expand Up @@ -572,6 +571,7 @@ class AddFixtureDialog : public QDialog
m_setupLayout.addRow(tr("Channels"), &m_content);
m_setupLayoutContainer.addStretch(0);
m_setupLayoutContainer.addWidget(&m_buttons);
m_address.setValue(1);
connect(&m_buttons, &QDialogButtonBox::accepted, this, &AddFixtureDialog::accept);
connect(&m_buttons, &QDialogButtonBox::rejected, this, &AddFixtureDialog::reject);

Expand Down Expand Up @@ -605,6 +605,7 @@ class AddFixtureDialog : public QDialog
int numChannels = mode.channels.size();
m_address.setRange(0, 512 - numChannels);


m_content.setText(mode.content());
}

Expand All @@ -628,6 +629,7 @@ class AddFixtureDialog : public QDialog
f.address = m_address.value();
f.controls = mode.channels;


return f;
}

Expand Down