Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
113 lines
3.7 KiB
JavaScript
113 lines
3.7 KiB
JavaScript
'use strict';
|
|
|
|
(function($){
|
|
|
|
$(function() {
|
|
|
|
|
|
|
|
new QWebChannel(qt.webChannelTransport, function(channel)
|
|
{
|
|
|
|
// Connect to a signal:
|
|
//channel.objects.webNotifier.jsonChanged.connect(function()
|
|
//{
|
|
/// // This callback will be invoked whenever the signal is emitted on the C++/QML side.
|
|
// console.log(arguments);
|
|
// });
|
|
window.webNotifier = channel.objects.webNotifier;
|
|
console.log(webNotifier.jsonString);
|
|
|
|
// To get notified about remote property changes,
|
|
// simply connect to the corresponding notify signal:
|
|
webNotifier.jsonStringChanged.connect(function(newValue)
|
|
{
|
|
var hierarchy = $('#chart-container').orgchart('getHierarchy');
|
|
// console.error(JSON.stringify(hierarchy, null, 2));
|
|
})
|
|
|
|
webNotifier.getHierarchy.connect(function()
|
|
{
|
|
//console.error("I AM BATMAN!")
|
|
var hierarchy = $('#chart-container').orgchart('getHierarchy');
|
|
// console.error(JSON.stringify(hierarchy, null, 2));
|
|
|
|
webNotifier.gotHierarchy(JSON.stringify(hierarchy));
|
|
});
|
|
|
|
|
|
webNotifier.updateStringChanged.connect(function(newValue)
|
|
{
|
|
// console.error(JSON.stringify(newValue, null, 2));
|
|
var success = $('#chart-container').orgchart('updateNode', newValue);
|
|
})
|
|
|
|
|
|
});
|
|
|
|
$('#chart-container').orgchart(
|
|
{
|
|
'data' : datascource,
|
|
'nodeContent': 'title',
|
|
'draggable': isDragEnabled,
|
|
'zoom': true,
|
|
'pan': true,
|
|
'menu': isMenuEnabled,
|
|
'menu_edit': menuEdit,
|
|
'menu_delete': menuDelete,
|
|
'unit_name': unitName,
|
|
'exportButton': false,
|
|
'exportFilename': 'Orbat',
|
|
'toggleSiblingsResp': false,
|
|
'dropCriteria': function($draggedNode, $dragZone, $dropZone)
|
|
{
|
|
if($dropZone.find('.unit').text() !== unitName )
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
},
|
|
|
|
})
|
|
.children('.orgchart').on('nodedropped.orgchart', function(event)
|
|
{
|
|
console.log('draggedNode:' + event.draggedNode.children('.title').text()
|
|
+ ', dragZone:' + event.dragZone.children('.title').text()
|
|
+ ', dropZone:' + event.dropZone.children('.title').text()
|
|
);
|
|
});
|
|
|
|
$("html").on("contextmenu",function(e)
|
|
{
|
|
//prevent default context menu for right click
|
|
e.preventDefault();
|
|
});
|
|
|
|
$("html").on("click", function()
|
|
{
|
|
$(".menu").hide();
|
|
window.currentSelectedDiv="";
|
|
});
|
|
|
|
$('.menuEdit').on("click", function()
|
|
{
|
|
$(".menu").hide();
|
|
//console.error(JSON.stringify(currentSelectedId));
|
|
webNotifier.startEdit(JSON.stringify(currentSelectedDiv));
|
|
});
|
|
|
|
$('.menuDelete').on("click", function()
|
|
{
|
|
|
|
$(".menu").hide();
|
|
$('#chart-container').orgchart('removeNode', currentSelectedDiv.id);
|
|
webNotifier.startDelete(JSON.stringify(currentSelectedDiv));
|
|
});
|
|
|
|
|
|
});
|
|
|
|
})(jQuery);
|
|
|
|
|