Merge pull request #1278 from wawuwo/fix-1273-crash-in-one-two-wires

Fix crash when coordinates of wire ends are in wrong order

Fix #1273

qucs/schematic_file.cpp

@@ -121,7 +121,7 @@ QString Schematic::createClipboardFile()
   s += "<Paintings>\n";
   for(pp = a_Paintings->first(); pp != 0; pp = a_Paintings->next())
     if(pp->isSelected)
-      if(pp->Name.at(0) != '.') {  // subcircuit specific -> do not copy
+      if ((a_isSymbolOnly && pp->Name.startsWith(".PortSym")) || pp->Name.at(0) != '.') {  // subcircuit specific -> do not copy
         s += "<"+pp->save()+">\n";  z++; }
   s += "</Paintings>\n";
 
@@ -983,7 +983,26 @@ bool Schematic::loadWires(QTextStream *stream, QList<Element*> *List)
       List->append(w);
       if(w->Label)  List->append(w->Label);
     }
-    else simpleInsertWire(w);
+    else {
+      // Quick fix for ra3xdh#1273.
+      //
+      // A wire whose (x1,y1) coordinates are not less than (x2,y2)
+      // coordinates somehow deals some damage like crashes or funny behaviour.
+      //
+      // I wasn't able to understand how exactly this happens, i.e. why it's
+      // important to have x1 less than x2 for a wire, so I decided to fix this
+      // in a most straightforward way by "normalizing" the wire before installing
+      // it into schematic
+      if (w->x1 > w->x2) {
+        std::swap(w->x1, w->x2);
+        std::swap(w->y1, w->y2);
+      } else if (w->x1 == w->x2 && w->y1 > w->y2) {
+        std::swap(w->x1, w->x2);
+        std::swap(w->y1, w->y2);
+      }
+
+      simpleInsertWire(w);
+    }
   }
 
   QMessageBox::critical(0, QObject::tr("Error"),

qucs/spicecomponents/LTL_SPICE.cpp

@@ -121,7 +121,11 @@ QString LTL_SPICE::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecom
         s += QStringLiteral(" NL=%1").arg(Nl);
     }
 
-    s += QStringLiteral(" IC=%5, %6, %7, %8 \n").arg(V1).arg(I1).arg(V2).arg(I2);
+    if (dialect == spicecompat::SPICEXyce) {
+      s += "\n"; // Xyce doesn't support IC
+    } else {
+      s += QStringLiteral(" IC=%5, %6, %7, %8 \n").arg(V1).arg(I1).arg(V2).arg(I2);
+    }
 
     return s;
 }