kicad-developers team mailing list archive

[Eldar Khayrullin <eldar.khayrullin@xxxxxxx>]

Next patch continue fixing bug https://bugs.launchpad.net/kicad/+bug/1547822

> On Feb 22 2016, at 7:55 pm, Eldar Khayrullin
<eldar.khayrullin@xxxxxxx> wrote:  
Hello. Patch attached.  
P.S. need work to correct a justification of text and text size (I do)  

>From 766b6e5b5859b8209f5fac79655295aa057a671f Mon Sep 17 00:00:00 2001
From: Eldar Khayrullin <eldar.khayrullin@xxxxxxx>
Date: Mon, 22 Feb 2016 20:38:22 +0300
Subject: [PATCH] Fix bug #1547822: refdes and value fields are set to
 invisible in new PCAD file format

---
 pcbnew/pcad2kicadpcb_plugin/pcb.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb.cpp b/pcbnew/pcad2kicadpcb_plugin/pcb.cpp
index 41f79d2..6d00cbd 100644
--- a/pcbnew/pcad2kicadpcb_plugin/pcb.cpp
+++ b/pcbnew/pcad2kicadpcb_plugin/pcb.cpp
@@ -166,7 +166,7 @@ void PCB::SetTextProperty( XNODE*   aNode, TTEXTVALUE* aTextValue,
                            wxString aActualConversion )
 {
     XNODE*      tNode, * t1Node;
-    wxString    n, pn, propValue, str;
+    wxString    n, nnew, pn, propValue, str;
 
     // aNode is pattern now
     tNode   = aNode;
@@ -199,6 +199,7 @@ void PCB::SetTextProperty( XNODE*   aNode, TTEXTVALUE* aTextValue,
                         str     = aTextValue->text;
                         str.Trim( false );
                         str.Trim( true );
+                        nnew    = n; // new file version
                         n       = n + wxT( ' ' ) + str; // changed in new file version.....
                         tNode   = NULL;
                     }
@@ -219,7 +220,7 @@ void PCB::SetTextProperty( XNODE*   aNode, TTEXTVALUE* aTextValue,
         propValue.Trim( false );
         propValue.Trim( true );
 
-        if( propValue == n )
+        if( propValue == n || propValue == nnew )
             break;
 
         tNode = tNode->GetNext();
-- 
2.5.0