HG_REPOSITORIES/LPP/INSTRUMENTATION/kicadtools Commit - r11:10ac2f44ce26

Sync

Jeandet Alexis -

r11:10ac2f44ce26 default

parent child

Context file:

r11:10ac2f44ce26

Collapse all files

qilib/qicadpcb.cpp +15 -4

             {
                 if(node->name==QIlib::Lexique::via_c)
                 {
-                    this->vias.append(new QIcadPcbVia(node));
+                    this->vias.append(new QIcadPcbVia(node,this->setup.defaultViaDrillSize()));
                 }
             }
             void QIlib::QIcadPcbSetup::setNode(QIlib::AbstractNode *node)
             {
+                if(node->name==QIlib::Lexique::setup_c)
+                {
                     this->p_node = node;
+                    for(int i=0;i<node->nodes.count();i++)
+                    {
+                        if(node->nodes.at(i)->name==QIlib::Lexique::via_drill_c)
+                        {
+                            this->via_dril.setNode(node->nodes.at(i));
+                            this->p_defaultViaDrillSize = nodeValueToDouble(node->nodes.at(i));
+                        }
+                    }
+                }
             }
             }
-            QIlib::QIcadPcbVia::QIcadPcbVia(QIlib::AbstractNode *node)
+            QIlib::QIcadPcbVia::QIcadPcbVia(QIlib::AbstractNode *node, double defaultDrill)
-                :QIcadAbstractNodeWrapper(node)
+                :QIcadAbstractNodeWrapper(node),p_drill(defaultDrill)
             {
                 this->setNode(node);
             }
                         if(node->nodes.at(i)->name==QIlib::Lexique::size_c)
                         {
                             this->sizeNode.setNode(node->nodes.at(i));
-                            p_size = nodeTo2DSize(node->nodes.at(i));
+                            p_size = QSizeF(nodeValueToDouble(node->nodes.at(i)),nodeValueToDouble(node->nodes.at(i)));
                         }
                         if(node->nodes.at(i)->name==QIlib::Lexique::drill_c)
                         {

qilib/qicadpcb.h +4 -1

                 QIcadAbstractNodeWrapper visible_elements;
                 QIcadPcbPlotParams plotParams;
                 void setNode(QIlib::AbstractNode* node);
+                double defaultViaDrillSize(){return p_defaultViaDrillSize;}
+            private:
+                double p_defaultViaDrillSize;
             };
             class QIcadPcbNetClass : public QIcadAbstractNodeWrapper
             class QIcadPcbVia : public QIcadAbstractNodeWrapper
             {
             public:
-                QIcadPcbVia(QIlib::AbstractNode* node);
+                QIcadPcbVia(QIlib::AbstractNode* node, double defaultDrill=0);
                 QIcadPcbVia(){}
                 QIcadAbstractNodeWrapper at;
                 QIcadAbstractNodeWrapper sizeNode;

test/PCBView/pcbvia.cpp +8 -6

                 {
                     QGraphicsEllipseItem* ellipse = new QGraphicsEllipseItem();
                     QPen pen = ellipse->pen();
-                    pen.setWidthF(0.01);
+                    double thickness = (this->viaNode->size().width()-this->viaNode->drill())/2;
+                    pen.setWidthF(thickness);
                     ellipse->setPen(pen);
-                    QBrush brush = ellipse->brush();
+            //        QBrush brush = ellipse->brush();
-                    brush.setStyle(Qt::SolidPattern);
+            //        brush.setStyle(Qt::SolidPattern);
-                    brush.setColor(context->layerColor(this->viaNode->layers().at(i)));
+            //        brush.setColor(context->layerColor(this->viaNode->layers().at(i)));
-                    ellipse->setBrush(brush);
+            //        ellipse->setBrush(brush);
-                    QRectF rec(this->viaNode->pos()+offset,this->viaNode->size());
+                    QRectF rec(this->viaNode->pos()+offset,QSizeF(this->viaNode->size().width()-thickness,this->viaNode->size().width()-thickness));
                     ellipse->setRect(rec);
                     ellipse->setZValue(-context->layer(viaNode->layers().at(i)));
                     this->addToGroup(ellipse);

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