Commit 85864aae authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[MERGE]

parents e1352d6a dcc4d090
...@@ -128,8 +128,13 @@ void WQtNetworkEditor::addModule( boost::shared_ptr< WModule > module ) ...@@ -128,8 +128,13 @@ void WQtNetworkEditor::addModule( boost::shared_ptr< WModule > module )
// set the object at a random start position // set the object at a random start position
time( &m_time ); time( &m_time );
#ifndef _MSC_VER
netItem->setPos( rand_r( ( unsigned int * ) &m_time ) % 200, netItem->setPos( rand_r( ( unsigned int * ) &m_time ) % 200,
rand_r( ( unsigned int * ) &m_time ) % 200 ); rand_r( ( unsigned int * ) &m_time ) % 200 );
#else
netItem->setPos( ( rand() + m_time ) % 200,
( rand() + m_time ) % 200 );
#endif
m_scene->addItem( netItem ); m_scene->addItem( netItem );
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
#include "WQtNetworkInputPort.h" #include "WQtNetworkInputPort.h"
const float SIZE = 10.0; const float WSIZE = 10.0;
WQtNetworkInputPort::WQtNetworkInputPort( boost::shared_ptr<WModuleInputConnector> connector ) WQtNetworkInputPort::WQtNetworkInputPort( boost::shared_ptr<WModuleInputConnector> connector )
: WQtNetworkPort() : WQtNetworkPort()
{ {
setRect( 0.0, 0.0, SIZE, SIZE ); setRect( 0.0, 0.0, WSIZE, WSIZE );
setBrush( Qt::gray ); setBrush( Qt::gray );
setPen( QPen( Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ) ); setPen( QPen( Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ) );
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
#include "WQtNetworkOutputPort.h" #include "WQtNetworkOutputPort.h"
const float SIZE = 10.0; const float WSIZE2 = 10.0;
WQtNetworkOutputPort::WQtNetworkOutputPort( boost::shared_ptr<WModuleOutputConnector> connector ) WQtNetworkOutputPort::WQtNetworkOutputPort( boost::shared_ptr<WModuleOutputConnector> connector )
: WQtNetworkPort() : WQtNetworkPort()
{ {
setRect( 0.0, 0.0, SIZE, SIZE ); setRect( 0.0, 0.0, WSIZE2, WSIZE2 );
setBrush( Qt::gray ); setBrush( Qt::gray );
setPen( QPen( Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ) ); setPen( QPen( Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment