← Back to branch summary

~ubuntu-branches/ubuntu/precise/fritzing/precise

« back to all changes in this revision

Viewing changes to src/viewlayer.h

  • Committer: Bazaar Package Importer
  • Author(s): Georges Khaznadar
  • Date: 2011-08-26 10:11:05 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110826101105-w5hmn7zcf93ig5v6
Tags: 0.6.3b-1
http://bugs.debian.org/636441
http://bugs.debian.org/636061
* upgrapded to the newer upstream version
* parameters of the function GraphicsUtils::distanceFromLine in 
  src/svg/groundplanegenerator.cpp:767 are now declared as doubles,
  which Closes: #636441
* the new version fixes src/utils/folderutils.cpp, which
  Closes: #636061

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/viewlayer.h
18
18
 
19
19
********************************************************************
20
20
 
21
 
$Revision: 5206 $:
 
21
$Revision: 5308 $:
22
22
$Author: cohen@irascible.com $:
23
 
$Date: 2011-07-08 23:59:08 +0200 (Fri, 08 Jul 2011) $
 
23
$Date: 2011-07-30 21:09:56 +0200 (Sat, 30 Jul 2011) $
24
24
 
25
25
********************************************************************/
26
26
 
100
100
        static const QString JumperColor;
101
101
 
102
102
protected:
103
 
        static qreal zIncrement;
 
103
        static double zIncrement;
104
104
        static QHash<ViewLayerID, StringPair *> names;
105
105
        static QMultiHash<ViewLayerID, ViewLayerID> alternatives;
106
106
        static QMultiHash<ViewLayerID, ViewLayerID> unconnectables;
107
107
        static QHash<QString, ViewLayerID> xmlHash;
108
108
 
109
109
public:
110
 
        ViewLayer(ViewLayerID, bool visible, qreal initialZ);
 
110
        ViewLayer(ViewLayerID, bool visible, double initialZ);
111
111
        ~ViewLayer();
112
112
 
113
113
        void setAction(QAction *);
115
115
        QString & displayName();
116
116
        bool visible();
117
117
        void setVisible(bool);
118
 
        qreal nextZ();
 
118
        double nextZ();
119
119
        ViewLayerID viewLayerID();
120
 
        qreal incrementZ(qreal);
 
120
        double incrementZ(double);
121
121
        ViewLayer * parentLayer();
122
122
        void setParentLayer(ViewLayer *);
123
123
        const QList<ViewLayer *> & childLayers();
124
 
        bool alreadyInLayer(qreal z);
125
 
        void resetNextZ(qreal z);
 
124
        bool alreadyInLayer(double z);
 
125
        void resetNextZ(double z);
126
126
        void setActive(bool);
127
127
        bool isActive();
128
128
 
131
131
        static const QString & viewLayerNameFromID(ViewLayerID);
132
132
        static const QString & viewLayerXmlNameFromID(ViewLayerID);
133
133
        static void initNames();
134
 
        static qreal getZIncrement();
 
134
        static double getZIncrement();
135
135
        static void cleanup();
136
136
        static QList<ViewLayerID> findAlternativeLayers(ViewLayerID);
137
137
        static bool canConnect(ViewLayerID, ViewLayerID);
146
146
        bool m_visible;
147
147
        ViewLayerID m_viewLayerID;
148
148
        QAction* m_action;
149
 
        qreal m_nextZ;
150
 
        qreal m_initialZ;
 
149
        double m_nextZ;
 
150
        double m_initialZ;
151
151
        QList<ViewLayer *> m_childLayers;
152
152
        ViewLayer * m_parentLayer;
153
153
        bool m_active;