HG_REPOSITORIES/LPP/INSTRUMENTATION/kicadtools Commit - r13:e725b52b6a87

Fixed Pad rotation issue.

jeandet -

r13:e725b52b6a87 default

parent child

Context file:

r13:e725b52b6a87

qilib/qicadpcb.cpp +16 -5

             QIlib::QIcadPcbModule::QIcadPcbModule(QIlib::AbstractNode *node)
-                :QIcadAbstractNodeWrapper(node)
+                :QIcadAbstractNodeWrapper(node),p_angle(0.0)
             {
                 this->setNode(node);
             }
             double QIlib::QIcadPcbModule::angle()
             {
-                return p_angle;
+                return - p_angle;
             }
             void QIlib::QIcadPcbModule::setNode(QIlib::AbstractNode *node)
                             if(coords.count()==3)
                             {
                                 p_angle = coords.at(2).toDouble();
+                                this->updatePadsAngle();
                             }
                         }
                         if(node->nodes.at(i)->name==QIlib::Lexique::tags_c)
             {
                 if(node->name==QIlib::Lexique::pad_c)
                 {
-                    this->pads.append(new QIcadPcbPad(node));
+                    this->pads.append(new QIcadPcbPad(node, this->p_angle));
                 }
             }
                 }
             }
+            void QIlib::QIcadPcbModule::updatePadsAngle()
+            {
+                for(int i=0;i<this->pads.count();i++)
+                {
+                    this->pads.at(i)->setModuleAngle(this->p_angle);
+                }
+            }
             QIlib::QIcadPcbDimension::QIcadPcbDimension(QIlib::AbstractNode *node)
                 :QIcadAbstractNodeWrapper(node)
             }
-            QIlib::QIcadPcbPad::QIcadPcbPad(QIlib::AbstractNode *node)
+            QIlib::QIcadPcbPad::QIcadPcbPad(QIlib::AbstractNode *node, double modAngle)
-                :QIcadAbstractNodeWrapper(node)
+                :QIcadAbstractNodeWrapper(node),p_Mod_angle(modAngle),p_angle(0.0)
             {
                 this->setNode(node);
             }
             void QIlib::QIcadPcbPad::setNode(QIlib::AbstractNode *node)
             {
                 if(node->name==QIlib::Lexique::pad_c)

qilib/qicadpcb.h +7 -3

             #include <QRectF>
             namespace QIlib{
             const QPointF nodeTo2DCoords(QIlib::AbstractNode* node);
             const QSizeF nodeTo2DSize(QIlib::AbstractNode* node);
             double nodeValueToDouble(QIlib::AbstractNode* node,int index=0);
                     rectangle,
                     circle
                 }padShape;
-                QIcadPcbPad(QIlib::AbstractNode* node);
+                QIcadPcbPad(QIlib::AbstractNode* node,double modAngle=0.0);
                 QIcadPcbPad(){}
                 QIcadAbstractNodeWrapper at;
                 QIcadAbstractNodeWrapper sizeNode;
                 const QSizeF& size(){return p_size;}
                 const QPointF& pos(){return p_pos;}
                 double drill(){return p_drill;}
-                double angle(){return p_angle;}
+                void setModuleAngle(double modAngle){p_Mod_angle= modAngle;}
+                double angle(){return  - (p_angle - p_Mod_angle);}
                 padShape shape(){return p_shape;}
                 int padNumber(){return p_padNumber;}
                 void setNode(QIlib::AbstractNode* node);
                 padShape p_shape;
                 double p_drill;
                 double p_angle;
+                // Dirty fix to transform pad angle from
+                // PCB coordinates to Module coordinates
+                double p_Mod_angle;
                 QSizeF p_size;
                 QPointF p_pos;
                 QStringList p_layers;
                 void clrCircles();
                 void apendCircle(QIlib::AbstractNode* node);
             private:
+                void updatePadsAngle();
                 QPointF p_pos;
                 double p_angle;
             };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages