OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • SSH
Fork

pcbelegance: Commit

PCB Elegance source


Commit MetaInfo

Revisão4d44717465fec0fa238083689989f2b8f10f91e5 (tree)
Hora2018-09-06 12:58:33
AutorTim Worthington
CommiterTim Worthington

Mensagem de Log

V3.52 bugfix 1

* Polygons on non-copper layers are now saved correctly
* Nets remember their width/clearance when netlist is updated (old behaviour restored)

Mudança Sumário

Diff

diff -r d5e4ef01f891 -r 4d44717465fe functionsc/mingw/makefile
--- a/functionsc/mingw/makefile Thu Aug 11 16:49:57 2016 +1000
+++ b/functionsc/mingw/makefile Thu Sep 06 13:58:33 2018 +1000
@@ -5,7 +5,7 @@
55 SILENT =@
66 #SILENT =
77
8-GCC = mingw32-gcc
8+GCC = gcc
99 AR = ar
1010
1111
diff -r d5e4ef01f891 -r 4d44717465fe functionsc/version.h
--- a/functionsc/version.h Thu Aug 11 16:49:57 2016 +1000
+++ b/functionsc/version.h Thu Sep 06 13:58:33 2018 +1000
@@ -1,7 +1,7 @@
11 // PCB Elegance release version
22 #define VER_VERSION 352
3-#define VER_VERSION_STR "3.52"
4-#define VER_DATE_STR "25 July, 2016"
3+#define VER_VERSION_STR "3.52 bugfix 2"
4+#define VER_DATE_STR "6 September, 2018"
55 // for .rc files
66 #define VER_FILEVERSION 3,52,0,0
77 #define VER_FILEVERSION_STR "3,52,0,0"
diff -r d5e4ef01f891 -r 4d44717465fe pcb/dialogs.c
--- a/pcb/dialogs.c Thu Aug 11 16:49:57 2016 +1000
+++ b/pcb/dialogs.c Thu Sep 06 13:58:33 2018 +1000
@@ -4586,8 +4586,7 @@
45864586 SetWindowTextUTF8(Dialog, SC(801, "About layout editor"));
45874587 SetDialogItemText(Dialog, IDC_STATIC1, SC(1287, "Layout editor PCB Elegance"));
45884588 SetDialogItemText(Dialog, IDOK, SC(155, "OK"));
4589- sprintf(str, SC(309, "Build version %i.%i.%i [ %s ]"), VER_VERSION / 100, VER_VERSION % 100,
4590- VER_BUILD, VER_DATE_STR);
4589+ sprintf(str, SC(309, "Build version %s [ %s ]"), VER_VERSION_STR, VER_DATE_STR);
45914590 #ifdef GCC_COMP
45924591 strcat(str, "\r\n\r\nCompiled with mingw (gcc 4.9.2)");
45934592 #endif
diff -r d5e4ef01f891 -r 4d44717465fe pcb/files.c
--- a/pcb/files.c Thu Aug 11 16:49:57 2016 +1000
+++ b/pcb/files.c Thu Sep 06 13:58:33 2018 +1000
@@ -2451,6 +2451,27 @@
24512451
24522452 // *****************************************************************************************
24532453 // *****************************************************************************************
2454+// ObjectPolygonMem
2455+
2456+ for (cnt = 0; cnt < Design.NrObjectPolygons; cnt++)
2457+ {
2458+ ObjectPolygon = (ObjectPolygonRecord *) & (ObjectPolygonMem[(*ObjectPolygons)[cnt]]);
2459+
2460+ if (((ObjectPolygon->Info & (OBJECT_NOT_VISIBLE)) == 0) && (ObjectPolygon->NrVertices > 0))
2461+ {
2462+ SetMinMaxObjectPolygon(ObjectPolygon, 0);
2463+
2464+ if ((NewBufPos = WriteToBuf(ObjectPolygon, BufPos, MemSizeObjectPolygon(ObjectPolygon))) == -1)
2465+ {
2466+ return -1;
2467+ }
2468+
2469+ BufPos = NewBufPos;
2470+ }
2471+ }
2472+
2473+// *****************************************************************************************
2474+// *****************************************************************************************
24542475
24552476 memmove(&NewDesign, &Design, sizeof(DesignRecord));
24562477 NewDesign.NrComps = CompsCount;
diff -r d5e4ef01f891 -r 4d44717465fe pcb/import.c
--- a/pcb/import.c Thu Aug 11 16:49:57 2016 +1000
+++ b/pcb/import.c Thu Sep 06 13:58:33 2018 +1000
@@ -2881,25 +2881,8 @@
28812881
28822882 #endif
28832883
2884- if (NewTraceWidth == 0.0)
2885- {
2886- if (InRange(Design.StandardTraceWidth, 0.0))
2887- Net2->TraceWidth = (8 * 2540);
2888- else
2889- Net2->TraceWidth = Design.StandardTraceWidth;
2890- }
2891- else
2892- Net2->TraceWidth = (float) NewTraceWidth;
2893-
2894- if (NewClearance == 0.0)
2895- {
2896- if (InRange(Design.StandardClearance, 0.0))
2897- Net2->TraceClearance = (8 * 2540);
2898- else
2899- Net2->TraceClearance = Design.StandardClearance;
2900- }
2901- else
2902- Net2->TraceClearance = (float) NewClearance;
2884+ Net2->TraceWidth = (float)NewTraceWidth;
2885+ Net2->TraceClearance = (float)NewClearance;
29032886
29042887 NrNets2++;
29052888 NewTraceWidth = 0.0;
@@ -3160,8 +3143,13 @@
31603143 #endif
31613144 strcpy(Net->Name, Net2->Name);
31623145 memcpy(Net->Properties, Net2->Properties, sizeof(Net2->Properties));
3163- Net->TraceWidth = Net2->TraceWidth;
3164- Net->TraceClearance = Net2->TraceClearance;
3146+
3147+ if (Net2->TraceWidth != 0.0)
3148+ Net->TraceWidth = Net2->TraceWidth;
3149+
3150+ if (Net2->TraceClearance != 0.0)
3151+ Net->TraceClearance = Net2->TraceClearance;
3152+
31653153 NrEqualNets++;
31663154 }
31673155 }
@@ -3363,8 +3351,13 @@
33633351 #endif
33643352 strcpy(Net->Name, Net2->Name);
33653353 memcpy(Net->Properties, Net2->Properties, sizeof(Net2->Properties));
3366- Net->TraceWidth = Net2->TraceWidth;
3367- Net->TraceClearance = Net2->TraceClearance;
3354+
3355+
3356+ if (Net2->TraceWidth != 0.0)
3357+ Net->TraceWidth = Net2->TraceWidth;
3358+
3359+ if (Net2->TraceClearance != 0.0)
3360+ Net->TraceClearance = Net2->TraceClearance;
33683361
33693362 for (cnt4 = 0; cnt4 < NrNetItems; cnt4++)
33703363 {
@@ -3451,20 +3444,17 @@
34513444 Net->NetInfo |= 1;
34523445 Net->Info = 0;
34533446 strcpy(Net->Name, Net2->Name);
3454- /*
3455- if (InRange(Design.StandardTraceWidth,0.0)) {
3456- Net->TraceWidth=(8*2540);
3457- } else {
3458- Net->TraceWidth=Design.StandardTraceWidth;
3459- }
3460- if (InRange(Design.StandardClearance,0.0)) {
3461- Net->TraceClearance=(8*2540);
3462- } else {
3463- Net->TraceClearance=Design.StandardClearance;
3464- }
3465- */
3466- Net->TraceWidth = Net2->TraceWidth;
3467- Net->TraceClearance = Net2->TraceClearance;
3447+
3448+ if (InRange(Design.StandardTraceWidth,0.0))
3449+ Net->TraceWidth=(8*2540);
3450+ else
3451+ Net->TraceWidth=Design.StandardTraceWidth;
3452+
3453+ if (InRange(Design.StandardClearance,0.0))
3454+ Net->TraceClearance=(8*2540);
3455+ else
3456+ Net->TraceClearance=Design.StandardClearance;
3457+
34683458 }
34693459
34703460 cnt++;
@@ -3484,20 +3474,16 @@
34843474 // if (AddToMessageBuf(str2)!=0) return -1;
34853475 strcpy(Net->Name, Net2->Name);
34863476 memcpy(Net->Properties, Net2->Properties, sizeof(Net2->Properties));
3487- /*
3488- if (InRange(Design.StandardTraceWidth,0.0)) {
3489- Net->TraceWidth=(8*2540);
3490- } else {
3491- Net->TraceWidth=Design.StandardTraceWidth;
3492- }
3493- if (InRange(Design.StandardClearance,0.0)) {
3494- Net->TraceClearance=(8*2540);
3495- } else {
3496- Net->TraceClearance=Design.StandardClearance;
3497- }
3498- */
3499- Net->TraceWidth = Net2->TraceWidth;
3500- Net->TraceClearance = Net2->TraceClearance;
3477+
3478+ if (InRange(Design.StandardTraceWidth, 0.0))
3479+ Net->TraceWidth = (8 * 2540);
3480+ else
3481+ Net->TraceWidth = Design.StandardTraceWidth;
3482+
3483+ if (InRange(Design.StandardClearance, 0.0))
3484+ Net->TraceClearance = (8 * 2540);
3485+ else
3486+ Net->TraceClearance = Design.StandardClearance;
35013487
35023488 for (cnt4 = 0; cnt4 < Net2->Count; cnt4++)
35033489 {
diff -r d5e4ef01f891 -r 4d44717465fe pcb/mingw/makefile
--- a/pcb/mingw/makefile Thu Aug 11 16:49:57 2016 +1000
+++ b/pcb/mingw/makefile Thu Sep 06 13:58:33 2018 +1000
@@ -4,7 +4,7 @@
44 SILENT =@
55 #SILENT =
66
7-GCC = mingw32-gcc
7+GCC = gcc
88 AR = ar
99
1010 OPTIMIZE =-O2
diff -r d5e4ef01f891 -r 4d44717465fe pcb/resource/pcb.aps
Binary file pcb/resource/pcb.aps has changed
diff -r d5e4ef01f891 -r 4d44717465fe zlib/mingw/makefile
--- a/zlib/mingw/makefile Thu Aug 11 16:49:57 2016 +1000
+++ b/zlib/mingw/makefile Thu Sep 06 13:58:33 2018 +1000
@@ -6,7 +6,7 @@
66 SILENT =@
77 #SILENT =
88
9-GCC = mingw32-gcc
9+GCC = gcc
1010 AR = ar
1111
1212
Show on old repository browser