Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

This commit is contained in:
Tats
2014-10-18 10:05:17 +00:00
9 changed files with 166 additions and 7 deletions

View File

@@ -1196,6 +1196,11 @@ void MainWindow::createActions()
connect(stickyVertices, SIGNAL(toggled(bool)), outputWindow->getCanvas(), SLOT(enableStickyVertices(bool)));
}
void MainWindow::enableFullscreen()
{
outputWindowFullScreen->setEnabled(true);
}
void MainWindow::createMenus()
{
QMenuBar *menuBar = NULL;
@@ -1926,6 +1931,25 @@ void MainWindow::startOscReceiver()
#endif
}
void MainWindow::setOscPort(QString portNumber)
{
if (Util::isNumeric(portNumber))
{
int port = portNumber.toInt();
if (port <= 1023 || port > 65535)
{
std::cout << "OSC port is out of range: " << portNumber.toInt() << std::endl;
return;
}
config_osc_receive_port = port;
startOscReceiver();
}
else
{
std::cout << "OSC port is not a number: " << portNumber.toInt() << std::endl;
}
}
void MainWindow::pollOscInterface()
{
#ifdef HAVE_OSC