Skip to content

Commit

Permalink
Integrated change child position and string value command responses
Browse files Browse the repository at this point in the history
  • Loading branch information
@ad3154
ad3154 committed Nov 4, 2023
1 parent 8877cdd commit 8740d0d
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 112 deletions.
2 changes: 2 additions & 0 deletions include/ServerMainComponent.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class ServerMainComponent : public juce::Component

void on_change_active_mask_callback(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t workingSet, std::uint16_t newMask);
void on_change_numeric_value_callback(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t objectID, std::uint32_t value);
void on_change_string_value_callback(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t objectID, std::string value);
void on_change_child_position_callback(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t parentObjectID, std::uint16_t objectID, std::uint16_t newX, std::uint16_t newY);
void repaint_data_and_soft_key_mask();

const std::string ISO_DATA_PATH = "iso_data";
Expand Down
6 changes: 3 additions & 3 deletions src/DataMaskRenderAreaComponent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ void DataMaskRenderAreaComponent::mouseUp(const MouseEvent &event)
if (0 != i)
{
currentModalComponentCache.push_back(JuceManagedWorkingSetCache::create_component(parentWorkingSet, child));
comboPopup->addCustomItem(i, *currentModalComponentCache.back().get(), currentModalComponentCache.back()->getWidth(), currentModalComponentCache.back()->getHeight(), true, nullptr, "Object " + std::to_string(clickedList->get_child_id(i)));
comboPopup->addCustomItem(i, *currentModalComponentCache.back().get(), currentModalComponentCache.back()->getWidth(), currentModalComponentCache.back()->getHeight(), true, nullptr, "Object " + std::to_string(clickedList->get_child_id(static_cast<std::uint16_t>(i))));
}
}
inputListModal->addButton("OK", 0);
auto resultCallback = [this](int result) {
auto resultCallback = [this](int /*result*/) {
this->inputListModal->exitModalState();
inputListModal.reset();
};
Expand Down Expand Up @@ -193,7 +193,7 @@ void DataMaskRenderAreaComponent::mouseUp(const MouseEvent &event)

for (std::uint32_t i = 0; i < clickedNumber->get_number_children(); i++)
{
auto child = clickedNumber->get_object_by_id(clickedNumber->get_child_id(i));
auto child = clickedNumber->get_object_by_id(clickedNumber->get_child_id(static_cast<std::uint16_t>(i)));

if ((nullptr != child) && (isobus::VirtualTerminalObjectType::NumberVariable == child->get_object_type()))
{
Expand Down
4 changes: 2 additions & 2 deletions src/OutputStringComponent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ void OutputStringComponent::paint(Graphics &g)

if (get_option(Options::AutoWrap)) // TODO need to figure out proper font clipping
{
g.drawFittedText(value, 0, 0, get_width(), get_height(), convert_justification(get_horizontal_justification(), get_vertical_justification()), std::floor((static_cast<float>(get_height()) + 0.1f) / fontHeight), 0.8f);
g.drawFittedText(value, 0, 0, get_width(), get_height(), convert_justification(get_horizontal_justification(), get_vertical_justification()), static_cast<int>(std::floor((static_cast<float>(get_height()) + 0.1f) / fontHeight)), 0.8f);
}
else
{
g.drawFittedText(value, 0, 0, get_width(), get_height(), convert_justification(get_horizontal_justification(), get_vertical_justification()), std::floor((static_cast<float>(get_height()) + 0.1f) / fontHeight), 0.8f);
g.drawFittedText(value, 0, 0, get_width(), get_height(), convert_justification(get_horizontal_justification(), get_vertical_justification()), static_cast<int>(std::floor((static_cast<float>(get_height()) + 0.1f) / fontHeight)), 0.8f);
}
}

Expand Down
250 changes: 143 additions & 107 deletions src/ServerMainComponent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ServerMainComponent::ServerMainComponent(std::shared_ptr<isobus::InternalControl
softKeyMaskRenderer(*this)
{
VirtualTerminalServer::initialize();
languageCommandInterface.set_country_code("us");
languageCommandInterface.set_country_code("US"); // TODO add a way to change these in the GUI, save to file
languageCommandInterface.set_language_code("en");
languageCommandInterface.initialize();
mAudioDeviceManager.initialise(0, 1, nullptr, true);
Expand Down Expand Up @@ -97,7 +97,7 @@ std::vector<std::uint8_t> ServerMainComponent::get_versions(isobus::NAME clientN
std::vector<std::uint8_t> ServerMainComponent::get_supported_objects() const
{
// These are defined by ISO 11783-6 Table A.1 "Virtual terminal objects"
return {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 37, 39};
return { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 37, 39 };
}

std::vector<std::uint8_t> ServerMainComponent::load_version(const std::vector<std::uint8_t> &versionLabel, isobus::NAME clientNAME)
Expand Down Expand Up @@ -217,6 +217,8 @@ void ServerMainComponent::timerCallback()
activeWorkingSet = ws;
ws->save_callback_handle(get_on_change_active_mask_event_dispatcher().add_listener([this](std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t workingSet, std::uint16_t newMask) { this->on_change_active_mask_callback(affectedWorkingSet, workingSet, newMask); }));
ws->save_callback_handle(get_on_change_numeric_value_event_dispatcher().add_listener([this](std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t objectID, std::uint32_t value) { this->on_change_numeric_value_callback(affectedWorkingSet, objectID, value); }));
ws->save_callback_handle(get_on_change_string_value_event_dispatcher().add_listener([this](std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t objectID, std::string value) { this->on_change_string_value_callback(affectedWorkingSet, objectID, value); }));
ws->save_callback_handle(get_on_change_child_position_event_dispatcher().add_listener([this](std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t parentObjectID, std::uint16_t objectID, std::uint16_t newX, std::uint16_t newY) { this->on_change_child_position_callback(affectedWorkingSet, parentObjectID, objectID, newX, newY); }));
}
}
else if (isobus::VirtualTerminalServerManagedWorkingSet::ObjectPoolProcessingThreadState::Fail == ws->get_object_pool_processing_state())
Expand Down Expand Up @@ -289,41 +291,38 @@ void ServerMainComponent::on_change_active_mask_callback(std::shared_ptr<isobus:
{
if (isobus::VirtualTerminalServerManagedWorkingSet::ObjectPoolProcessingThreadState::Joined == affectedWorkingSet->get_object_pool_processing_state())
{
if (activeWorkingSet == affectedWorkingSet)
{
const MessageManagerLock mmLock;
dataMaskRenderer.on_change_active_mask(activeWorkingSet);
softKeyMaskRenderer.on_change_active_mask(activeWorkingSet);
const MessageManagerLock mmLock;
dataMaskRenderer.on_change_active_mask(activeWorkingSet);
softKeyMaskRenderer.on_change_active_mask(activeWorkingSet);

auto activeMask = affectedWorkingSet->get_object_by_id(newMask);

auto activeMask = affectedWorkingSet->get_object_by_id(newMask);
if ((nullptr != activeMask) && (isobus::VirtualTerminalObjectType::AlarmMask == activeMask->get_object_type()))
{
auto alarmMask = std::static_pointer_cast<isobus::AlarmMask>(activeMask);

if ((nullptr != activeMask) && (isobus::VirtualTerminalObjectType::AlarmMask == activeMask->get_object_type()))
switch (alarmMask->get_signal_priority())
{
auto alarmMask = std::static_pointer_cast<isobus::AlarmMask>(activeMask);
case isobus::AlarmMask::AcousticSignal::Highest:
{
mSoundPlayer.play(AlarmMaskAudio::alarmMaskHigh_mp3, AlarmMaskAudio::alarmMaskHigh_mp3Size);
}
break;

switch (alarmMask->get_signal_priority())
case isobus::AlarmMask::AcousticSignal::Medium:
{
case isobus::AlarmMask::AcousticSignal::Highest:
{
mSoundPlayer.play(AlarmMaskAudio::alarmMaskHigh_mp3, AlarmMaskAudio::alarmMaskHigh_mp3Size);
}
break;
mSoundPlayer.play(AlarmMaskAudio::alarmMaskMedium_mp3, AlarmMaskAudio::alarmMaskMedium_mp3Size);
}
break;

case isobus::AlarmMask::AcousticSignal::Medium:
{
mSoundPlayer.play(AlarmMaskAudio::alarmMaskMedium_mp3, AlarmMaskAudio::alarmMaskMedium_mp3Size);
}
break;
case isobus::AlarmMask::AcousticSignal::Lowest:
{
mSoundPlayer.play(AlarmMaskAudio::alarmMaskLow_mp3, AlarmMaskAudio::alarmMaskLow_mp3Size);
}
break;

case isobus::AlarmMask::AcousticSignal::Lowest:
{
mSoundPlayer.play(AlarmMaskAudio::alarmMaskLow_mp3, AlarmMaskAudio::alarmMaskLow_mp3Size);
}
default:
break;

default:
break;
}
}
}
}
Expand All @@ -333,105 +332,142 @@ void ServerMainComponent::on_change_numeric_value_callback(std::shared_ptr<isobu
{
if (isobus::VirtualTerminalServerManagedWorkingSet::ObjectPoolProcessingThreadState::Joined == affectedWorkingSet->get_object_pool_processing_state())
{
if (activeWorkingSet == affectedWorkingSet)
const MessageManagerLock mmLock;
auto affectedObject = affectedWorkingSet->get_object_by_id(objectID);

switch (affectedObject->get_object_type())
{
const MessageManagerLock mmLock;
auto affectedObject = affectedWorkingSet->get_object_by_id(objectID);
case isobus::VirtualTerminalObjectType::InputBoolean:
{
std::static_pointer_cast<isobus::InputBoolean>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

switch (affectedObject->get_object_type())
case isobus::VirtualTerminalObjectType::InputNumber:
{
case isobus::VirtualTerminalObjectType::InputBoolean:
{
std::static_pointer_cast<isobus::InputBoolean>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
std::static_pointer_cast<isobus::InputNumber>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::InputNumber:
{
std::static_pointer_cast<isobus::InputNumber>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::InputList:
{
std::static_pointer_cast<isobus::InputList>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::InputList:
{
std::static_pointer_cast<isobus::InputList>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::OutputNumber:
{
std::static_pointer_cast<isobus::OutputNumber>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::OutputNumber:
{
std::static_pointer_cast<isobus::OutputNumber>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::OutputList:
{
std::static_pointer_cast<isobus::OutputList>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::OutputList:
{
std::static_pointer_cast<isobus::OutputList>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::OutputMeter:
{
std::static_pointer_cast<isobus::OutputMeter>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::OutputMeter:
{
std::static_pointer_cast<isobus::OutputMeter>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::OutputLinearBarGraph:
{
std::static_pointer_cast<isobus::OutputLinearBarGraph>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::OutputLinearBarGraph:
{
std::static_pointer_cast<isobus::OutputLinearBarGraph>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::OutputArchedBarGraph:
{
std::static_pointer_cast<isobus::OutputArchedBarGraph>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::OutputArchedBarGraph:
{
std::static_pointer_cast<isobus::OutputArchedBarGraph>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::NumberVariable:
{
std::static_pointer_cast<isobus::NumberVariable>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::NumberVariable:
{
std::static_pointer_cast<isobus::NumberVariable>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::ObjectPointer:
{
std::static_pointer_cast<isobus::ObjectPointer>(affectedObject)->pop_child();
std::static_pointer_cast<isobus::ObjectPointer>(affectedObject)->add_child(value, 0, 0);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::ObjectPointer:
{
std::static_pointer_cast<isobus::ObjectPointer>(affectedObject)->pop_child();
std::static_pointer_cast<isobus::ObjectPointer>(affectedObject)->add_child(value, 0, 0);
repaint_data_and_soft_key_mask();
}
break;
case isobus::VirtualTerminalObjectType::ExternalObjectPointer:
{
// TODO
}
break;

case isobus::VirtualTerminalObjectType::ExternalObjectPointer:
{
// TODO
}
break;
case isobus::VirtualTerminalObjectType::Animation:
{
//Todo std::static_pointer_cast<Animation>(lTargetObject)->set_value(value);
}
break;

case isobus::VirtualTerminalObjectType::Animation:
{
//Todo std::static_pointer_cast<Animation>(lTargetObject)->set_value(value);
}
default:
break;
}
}
}

default:
{
}
break;
void ServerMainComponent::on_change_string_value_callback(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> affectedWorkingSet, std::uint16_t objectID, std::string value)
{
if (isobus::VirtualTerminalServerManagedWorkingSet::ObjectPoolProcessingThreadState::Joined == affectedWorkingSet->get_object_pool_processing_state())
{
const MessageManagerLock mmLock;
auto affectedObject = affectedWorkingSet->get_object_by_id(objectID);

switch (affectedObject->get_object_type())
{
case isobus::VirtualTerminalObjectType::StringVariable:
{
std::static_pointer_cast<isobus::StringVariable>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::InputString:
{
std::static_pointer_cast<isobus::InputString>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

case isobus::VirtualTerminalObjectType::OutputString:
{
std::static_pointer_cast<isobus::OutputString>(affectedObject)->set_value(value);
repaint_data_and_soft_key_mask();
}
break;

default:
break;
}
}
}

void ServerMainComponent::on_change_child_position_callback(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet>, std::uint16_t, std::uint16_t, std::uint16_t, std::uint16_t)
{
const MessageManagerLock mmLock;
repaint_data_and_soft_key_mask();
}

void ServerMainComponent::repaint_data_and_soft_key_mask()
{
dataMaskRenderer.on_change_active_mask(activeWorkingSet);
Expand Down

0 comments on commit 8740d0d

Please sign in to comment.