2009-04-07 Stefan Jahn <stefan@lkcc.org>

* subcircuit.cpp (vhdlCode): Added subcircuit parameters in VHDL
        using the generic map() feature.

        * phototransistor.cpp (createSymbol): Fixed symbol painting.

2009-04-07  Stefan Jahn  <stefan@lkcc.org>

        * textdoc.cpp (createPopupMenu): Added "Document properties" to
        the right click popup menu in text editor files.

        * schematic_file.cpp (createSubNetlistPlain): Using generic()
        definitions for subcircuit parameters in VHDL.

        * qucs_ar.ts: Updated arabic translations.  Thanks to Chabane!

qucs/ChangeLog

@@ -1,3 +1,13 @@
+2009-04-07  Stefan Jahn  <stefan@lkcc.org>
+
+	* textdoc.cpp (createPopupMenu): Added "Document properties" to
+	the right click popup menu in text editor files.
+
+	* schematic_file.cpp (createSubNetlistPlain): Using generic()
+	definitions for subcircuit parameters in VHDL.
+
+	* qucs_ar.ts: Updated arabic translations.  Thanks to Chabane!
+
 2009-03-30  Stefan Jahn  <stefan@lkcc.org>
 
 	* diagrams/tabdiagram.cpp (calcDiagram): Fixed a segfault bug

qucs/components/ChangeLog

@@ -1,3 +1,10 @@
+2009-04-07  Stefan Jahn  <stefan@lkcc.org>
+
+	* subcircuit.cpp (vhdlCode): Added subcircuit parameters in VHDL
+	using the generic map() feature.
+
+	* phototransistor.cpp (createSymbol): Fixed symbol painting.
+
 2009-04-01  Stefan Jahn  <stefan@lkcc.org>
 
 	* rlcg.cpp (RLCG): Added new transmission line defined by RLCG

qucs/components/phototransistor.cpp

@@ -116,7 +116,7 @@ Element * phototransistor::info(QString& Name, char * &BitmapFile, bool getNewOn
 
 void phototransistor::createSymbol()
 {
-  Arcs.append(new Arc(-25,-20, 40, 40,  0,20*360,QPen(QPen::red,2)));
+  Arcs.append(new Arc(-25,-20, 40, 40,  0,16*360,QPen(QPen::red,2)));
   Lines.append(new Line(-10,-15,-10, 15,QPen(QPen::darkBlue,3)));
   Lines.append(new Line(-30,  0,-10,  0,QPen(QPen::darkBlue,2)));
   Lines.append(new Line(-10, -5,  0,-15,QPen(QPen::darkBlue,2)));

qucs/components/subcircuit.cpp

@@ -220,9 +220,20 @@ QString Subcircuit::netlist()
 QString Subcircuit::vhdlCode(int)
 {
   QString f = properFileName(Props.first()->Value);
-  QString s = "  " + Name + ": entity Sub_" + properName(f) + " port map (";
+  QString s = "  " + Name + ": entity Sub_" + properName(f);
+
+  // output all user defined properties
+  Property *pr = Props.next();
+  if (pr) {
+    s += " generic map (";
+    s += pr->Value;
+    for(pr = Props.next(); pr != 0; pr = Props.next())
+      s += ", " + pr->Value;
+    s += ")";
+  }
 
   // output all node names
+  s += " port map (";
   Port *pp = Ports.first();
   if(pp)  s += pp->Connection->Name;
   for(pp = Ports.next(); pp != 0; pp = Ports.next())

qucs/schematic_file.cpp

@@ -1252,11 +1252,30 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QTextEdit *ErrText,
       (*tstream) << VHDL_LIBRARIES;
       (*tstream) << "entity Sub_" << Type << " is\n"
 		 << "  port ("
-		 << SubcircuitPortNames.join(";\n        ") << ");\n"
-		 << "end entity;\n"
+		 << SubcircuitPortNames.join(";\n        ") << ");\n";
+
+      for(pi = SymbolPaints.first(); pi != 0; pi = SymbolPaints.next())
+	if(pi->Name == ".ID ") {
+	  SubParameter *pp;
+	  ID_Text *pid = (ID_Text*)pi;
+	  if(pid->Parameter.first()) {
+	    (*tstream) << "  generic (";
+	    for(pp = pid->Parameter.first(); pp != 0;) {
+	      s = pp->Name;
+	      (*tstream) << s.replace("=", " : real := ");
+	      pp = pid->Parameter.next();
+	      if(pp) (*tstream) << ";\n           ";
+	    }
+	    (*tstream) << ");\n";
+	  }
+	  break;
+	}
+
+      (*tstream) << "end entity;\n"
 		 << "use work.all;\n"
 		 << "architecture Arch_Sub_" << Type << " of Sub_" << Type
 		 << " is\n";
+
       if(!Signals.isEmpty()) {
 	QValueList<DigSignal> values = Signals.values();
 	QValueList<DigSignal>::iterator it;

qucs/textdoc.cpp

@@ -32,6 +32,7 @@
 #include <qmessagebox.h>
 #include <qpaintdevicemetrics.h>
 #include <qfont.h>
+#include <qpopupmenu.h>
 
 
 TextDoc::TextDoc(QucsApp *App_, const QString& Name_) : QucsDoc(App_, Name_)
@@ -192,6 +193,14 @@ void TextDoc::slotSetChanged()
   App->redo->setEnabled(isRedoAvailable());
 }
 
+// ---------------------------------------------------
+QPopupMenu *TextDoc::createPopupMenu( const QPoint &pos )
+{
+   QPopupMenu *popup = QTextEdit::createPopupMenu( pos );
+   App->fileSettings->addTo(popup);
+   return popup;
+}
+
 // ---------------------------------------------------
 bool TextDoc::load()
 {

qucs/textdoc.h

@@ -56,6 +56,8 @@ public:
   bool loadSettings(void);
   bool saveSettings(void);
 
+  QPopupMenu *createPopupMenu( const QPoint & );
+
 public slots:
   void slotCursorPosChanged(int, int);
   void slotSetChanged();