Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 14:52:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

9
retroshare-gui/src/gui/elastic/node.h
View file

@ -50,6 +50,7 @@
#endif
#include <QList>
#include <retroshare/rstypes.h>
#include "graphwidget.h"
class Edge;
@ -66,13 +67,13 @@ class Node : public QObject, public QGraphicsItem
Q_OBJECT
public:
Node(const std::string& node_string,GraphWidget::NodeType type,GraphWidget::AuthType auth,GraphWidget *graphWidget,const std::string& ssl_id,const std::string& gpg_id);
Node(const std::string& node_string,GraphWidget::NodeType type,GraphWidget::AuthType auth,GraphWidget *graphWidget,const RsPeerId& ssl_id,const RsPgpId& gpg_id);
void addEdge(Edge *edge);
const QList<Edge *>& edges() const;
int type() const { return Type; }
const std::string& idString() const { return _gpg_id ; }
std::string idString() const { return _gpg_id.toStdString() ; }
void calculateForces(const double *data,int width,int height,int W,int H,float x,float y,float speedf);
bool advance();
@ -108,8 +109,8 @@ private:
static Node *_selected_node ;
std::string _ssl_id ;
std::string _gpg_id ;
RsPeerId _ssl_id ;
RsPgpId _gpg_id ;
static const float MASS_FACTOR = 10 ;
static const float FRICTION_FACTOR = 10.8 ;