kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

3DConnexion SpaceBall and configuration dialog improvements

Browse Source
This commit is contained in:
Christopher Coley
2020-08-18 00:54:27 -07:00
committed by wwmayer
parent cc81f791da
commit f6411f8221
5 changed files with 168 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Gui/3Dconnexion/3DConnexion.xml
View File

@@ -1,9 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<ButtonMap DeviceName="Default">
<Mapping>
<Map Description="1" KeyCode="0" DownTime="short" Command=""/>
<Map Description="2" KeyCode="1" DownTime="short" Command=""/>
<Map Description="3" KeyCode="2" DownTime="short" Command=""/>
<Map Description="4" KeyCode="3" DownTime="short" Command=""/>
<Map Description="5" KeyCode="4" DownTime="short" Command=""/>
<Map Description="6" KeyCode="5" DownTime="short" Command=""/>
<Map Description="7" KeyCode="6" DownTime="short" Command=""/>
<Map Description="8" KeyCode="7" DownTime="short" Command=""/>
<Map Description="9" KeyCode="8" DownTime="short" Command=""/>
<Map Description="10" KeyCode="9" DownTime="short" Command=""/>
<Map Description="11" KeyCode="10" DownTime="short" Command=""/>
<Map Description="12" KeyCode="11" DownTime="short" Command=""/>
<Map Description="13" KeyCode="12" DownTime="short" Command=""/>
<Map Description="14" KeyCode="13" DownTime="short" Command=""/>
<Map Description="15" KeyCode="14" DownTime="short" Command=""/>
<Map Description="16" KeyCode="15" DownTime="short" Command=""/>
<Map Description="17" KeyCode="16" DownTime="short" Command=""/>
<Map Description="18" KeyCode="17" DownTime="short" Command=""/>
<Map Description="19" KeyCode="18" DownTime="short" Command=""/>
<Map Description="20" KeyCode="19" DownTime="short" Command=""/>
<Map Description="21" KeyCode="20" DownTime="short" Command=""/>
<Map Description="22" KeyCode="21" DownTime="short" Command=""/>
<Map Description="23" KeyCode="22" DownTime="short" Command=""/>
<Map Description="24" KeyCode="23" DownTime="short" Command=""/>
<Map Description="25" KeyCode="24" DownTime="short" Command=""/>
<Map Description="26" KeyCode="25" DownTime="short" Command=""/>
<Map Description="27" KeyCode="26" DownTime="short" Command=""/>
<Map Description="28" KeyCode="27" DownTime="short" Command=""/>
<Map Description="29" KeyCode="28" DownTime="short" Command=""/>
<Map Description="30" KeyCode="29" DownTime="short" Command=""/>
<Map Description="31" KeyCode="30" DownTime="short" Command=""/>
</Mapping>
</ButtonMap>
<ButtonMap DeviceName="SpacePilot">
<Mapping>
<Map Description="Ortho" KeyCode="0" DownTime="short" Command="Std_OrthographicCamera"/>
<Map Description="Front" KeyCode="1" DownTime="short" Command="Std_ViewFront"/>
<Map Description="Rear" KeyCode="2" DownTime="short" Command="Std_ViewFitAll"/>
<Map Description="1" KeyCode="0" DownTime="short" Command=""/>
<Map Description="2" KeyCode="1" DownTime="short" Command=""/>
<Map Description="3" KeyCode="2" DownTime="short" Command=""/>
<Map Description="4" KeyCode="3" DownTime="short" Command=""/>
<Map Description="5" KeyCode="4" DownTime="short" Command=""/>
<Map Description="6" KeyCode="5" DownTime="short" Command=""/>
<Map Description="Top" KeyCode="6" DownTime="short" Command="Std_ViewTop"/>
<Map Description="Left" KeyCode="7" DownTime="short" Command="Std_ViewLeft"/>
<Map Description="Right" KeyCode="8" DownTime="short" Command="Std_ViewRight"/>
<Map Description="Front" KeyCode="9" DownTime="short" Command="Std_ViewFront"/>
<Map Description="ESC" KeyCode="10" DownTime="short" Command=""/>
<Map Description="ALT" KeyCode="11" DownTime="short" Command=""/>
<Map Description="SHIFT" KeyCode="12" DownTime="short" Command=""/>
<Map Description="CTRL" KeyCode="13" DownTime="short" Command=""/>
<Map Description="Fit" KeyCode="14" DownTime="short" Command="Std_ViewFitAll"/>
<Map Description="PANEL" KeyCode="15" DownTime="short" Command=""/>
<Map Description="+" KeyCode="16" DownTime="short" Command=""/>
<Map Description="-" KeyCode="17" DownTime="short" Command=""/>
<Map Description="Dom" KeyCode="18" DownTime="short" Command=""/>
<Map Description="3D" KeyCode="19" DownTime="short" Command="Std_ViewIsometric"/>
<Map Description="CONFIG" KeyCode="20" DownTime="short" Command=""/>
</Mapping>
</ButtonMap>

6
src/Gui/3Dconnexion/GuiNativeEventMac.cpp
View File

@@ -166,7 +166,11 @@ void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
Base::Console().Log("Couldn't connect to 3Dconnexion driver\n");
return;
}
// Turn on all features and buttons
SetConnexionClientMask(tdxClientID, kConnexionMaskAll);
SetConnexionClientButtonMask(tdxClientID, kConnexionMaskAllButtons);
Base::Console().Log("3Dconnexion driver initialized. Client ID: %d\n", tdxClientID);
mainApp->setSpaceballPresent(true);
}

13
src/Gui/3Dconnexion/GuiNativeEventMac.h
View File

@@ -29,6 +29,10 @@ class QMainWindow;
#include <IOKit/IOKitLib.h>
#include <ConnexionClientAPI.h>
extern int16_t SetConnexionHandlers(ConnexionMessageHandlerProc messageHandler,
ConnexionAddedHandlerProc addedHandler,
ConnexionRemovedHandlerProc removedHandler,
bool useSeparateThread) __attribute__((weak_import));
// Note that InstallConnexionHandlers will be replaced with
// SetConnexionHandlers "in the future".
extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler,
@@ -37,9 +41,18 @@ extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler
__attribute__((weak_import));
extern UInt16 RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode,
UInt32 mask) __attribute__((weak_import));
extern void SetConnexionClientMask(uint16_t clientID, uint32_t mask)
__attribute__((weak_import));
extern void SetConnexionClientButtonMask(uint16_t clientID, uint32_t buttonMask)
__attribute__((weak_import));
extern void UnregisterConnexionClient(UInt16 clientID) __attribute__((weak_import));
extern void CleanupConnexionHandlers(void) __attribute__((weak_import));
extern int16_t ConnexionControl(uint32_t message, int32_t param, int32_t *result);
extern int16_t ConnexionClientControl(uint16_t clientID, uint32_t message, int32_t param, int32_t *result);
extern int16_t ConnexionGetCurrentDevicePrefs(uint32_t deviceID, ConnexionDevicePrefs *prefs);
extern int16_t ConnexionSetButtonLabels(uint8_t *labels, uint16_t size);
namespace Gui
{
class GUIApplicationNativeEventAware;

95
src/Gui/DlgCustomizeSpaceball.cpp
View File

@@ -33,6 +33,7 @@
#include <QPrinter>
#include <QPainter>
#include <QTableView>
#include <QComboBox>
#endif
#include "Base/Console.h"
@@ -55,6 +56,7 @@ ButtonView::ButtonView(QWidget *parent) : QListView(parent)
void ButtonView::selectButton(int number)
{
this->selectionModel()->select(this->model()->index(number, 0), QItemSelectionModel::ClearAndSelect);
this->scrollTo(this->model()->index(number, 0), QAbstractItemView::EnsureVisible);
}
void ButtonView::goSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
@@ -78,7 +80,7 @@ void ButtonView::goChangedCommand(const QString& commandName)
ButtonModel::ButtonModel(QObject *parent) : QAbstractListModel(parent)
{
load3DConnexionButtons("SpacePilot Pro");
//load3DConnexionButtons("SpacePilot Pro");
}
// Process the given Mapping tree to load in the Button mappings.
@@ -129,6 +131,7 @@ void ButtonModel::load3DConnexionButtonMapping(boost::property_tree::ptree Butto
newGroup = spaceballButtonGroup()->GetGroup(ButtonCode.c_str());
newGroup->SetASCII("Command", ButtonCommand.c_str());
newGroup->SetASCII("Description", ButtonDescription.c_str());
}
}
}
@@ -224,6 +227,7 @@ void ButtonModel::insertButtonRows(int number)
groupName.setNum(index);
Base::Reference<ParameterGrp> newGroup = spaceballButtonGroup()->GetGroup(groupName.toLatin1());//builds the group.
newGroup->SetASCII("Command", "");
newGroup->SetASCII("Description", "");
}
endInsertRows();
return;
@@ -269,12 +273,28 @@ ParameterGrp::handle ButtonModel::spaceballButtonGroup() const
QString ButtonModel::getLabel(const int &number) const
{
if (number > -1 && number < 20)
return tr("Button %1").arg(number+1);
else
if (number > -1 && number < 32) {
QString numberString;
numberString.setNum(number);
QString desc = QString::fromStdString(spaceballButtonGroup()->
GetGroup(numberString.toLatin1())->
GetASCII("Description",""));
if (desc.length())
desc = tr(" \"") + desc + tr("\"");
return tr("Button %1").arg(number + 1) + desc;
} else
return tr("Out Of Range");
}
void ButtonModel::loadConfig(const char *RequiredDeviceName)
{
goClear();
if (!RequiredDeviceName) {
return;
}
load3DConnexionButtons(RequiredDeviceName);
}
//////////////////////////////////////////////////////////////////////////////////////////
CommandView::CommandView(QWidget *parent) : QTreeView(parent)
@@ -693,11 +713,26 @@ void DlgCustomizeSpaceball::setupCommandModelView()
void DlgCustomizeSpaceball::setupLayout()
{
QLabel *buttonLabel = new QLabel(tr("Buttons"), this);
clearButton = new QPushButton(tr("Clear"), this);
clearButton = new QPushButton(tr("Reset"), this);
devModel = new QComboBox(this);
// Load the devModel(s) from the config xml file
devModel->addItems(getModels());
// Select the current preference or the first entry
QString model = QString::fromStdString(App::GetApplication().GetUserParameter().GetGroup("BaseApp")->
GetGroup("Spaceball")->GetASCII("Model",""));
if (model.length() > 0) {
devModel->setCurrentIndex(devModel->findText(model));
} else {
devModel->setCurrentIndex(0);
}
QVBoxLayout *buttonGroup = new QVBoxLayout();
buttonGroup->addWidget(buttonLabel);
buttonGroup->addWidget(buttonView);
QHBoxLayout *clearLayout = new QHBoxLayout();
clearLayout->addWidget(devModel);
clearLayout->addWidget(clearButton);
clearLayout->addStretch();
buttonGroup->addLayout(clearLayout);
@@ -730,7 +765,12 @@ void DlgCustomizeSpaceball::goClear()
commandView->clearSelection();
commandView->collapseAll();
commandView->setDisabled(true);
buttonModel->goClear();
//buttonModel->goClear();
QByteArray currentDevice = devModel->currentText().toLocal8Bit();
App::GetApplication().GetUserParameter().GetGroup("BaseApp")->
GetGroup("Spaceball")->SetASCII("Model", currentDevice.data());
buttonModel->loadConfig(currentDevice.data());
}
void DlgCustomizeSpaceball::goPrint()
@@ -828,4 +868,47 @@ void DlgCustomizeSpaceball::onModifyMacroAction(const QByteArray &macroName)
Q_UNUSED(macroName);
}
QStringList DlgCustomizeSpaceball::getModels()
{
QStringList modelList;
try
{
boost::property_tree::ptree tree;
boost::property_tree::ptree DeviceTree;
// exception thrown if no file found
std::string path = App::Application::getResourceDir();
path += "3Dconnexion/3DConnexion.xml";
read_xml(path.c_str(), tree);
BOOST_FOREACH(const boost::property_tree::ptree::value_type &ButtonMap, tree.get_child(""))
{
if ("ButtonMap" == ButtonMap.first)
{
// Inspect ButtonMap attributes for DeviceName
BOOST_FOREACH(const boost::property_tree::ptree::value_type &kv, ButtonMap.second.get_child("<xmlattr>"))
{
std::string Attribute;
std::string Value;
Attribute = kv.first.data();
Value = kv.second.data();
if (0 == Attribute.compare("DeviceName"))
{
modelList << QString::fromStdString(Value);
}
}
}
}
}
catch (const std::exception& e)
{
// We don't mind not finding the file to be opened
Base::Console().Warning("%s\n", e.what());
}
return modelList;
}
#include "moc_DlgCustomizeSpaceball.cpp"

4
src/Gui/DlgCustomizeSpaceball.h
View File

@@ -25,6 +25,7 @@
#include <QTreeView>
#include <QListView>
#include <QComboBox>
#include <QAbstractListModel>
#include "PropertyPage.h"
@@ -66,6 +67,7 @@ namespace Gui
void goButtonPress(int number);
void goMacroRemoved(const QByteArray& macroName);
void goClear();
void loadConfig(const char *RequiredDeviceName);
private:
void load3DConnexionButtonMapping(boost::property_tree::ptree ButtonMapTree);
void load3DConnexionButtons(const char *RequiredDeviceName);
@@ -164,6 +166,7 @@ namespace Gui
void setupCommandModelView();
void setupLayout();
void setMessage(const QString& message);
QStringList getModels();
ButtonView *buttonView;
ButtonModel *buttonModel;
@@ -171,6 +174,7 @@ namespace Gui
CommandModel *commandModel;
QPushButton *clearButton;
QPushButton *printReference;
QComboBox *devModel;
};
}
}