got to load symbol file and icon

qucs/components/vacomponent.cpp

@@ -83,9 +83,13 @@ Component *vacomponent::newOne(QString filename)
 }
 
 /*
+ * Get module name, bitmap
+ * if getNewOne set, return new object based on JSON file
  *
+ * TODO
+ * - name, bitmapfile are not really needed for vacoponent, remove
  */
-Element *vacomponent::info(QString &Name, char *&BitmapFile,
+Element *vacomponent::info(QString &Name, QString &BitmapFile,
                            bool getNewOne, QString filename)
 {
   // get variables out of file
@@ -94,11 +98,13 @@ Element *vacomponent::info(QString &Name, char *&BitmapFile,
   QScriptEngine engine;
   QScriptValue vadata = engine.evaluate("(" + data + ")");
 
-  Name  = getDouble(vadata, "Name");
+  Name  = getString(vadata, "Model");
 
   // TODO let user change this, only used to populate the dock
   // use clemens stuff to render out of symbol paintings?
-  BitmapFile = (char *) "VAimage";
+//  BitmapFile = (char *) "VAimage";
+  // Default is [modulename]
+  BitmapFile  = getString(vadata, "BitmapFile");
 
   if(getNewOne) return new vacomponent(filename);
   return 0;

qucs/components/vacomponent.h

@@ -35,7 +35,7 @@ class vacomponent : public Component
     vacomponent(QString filename);
     ~vacomponent() { };
     Component* newOne(QString filename);
-    static Element* info(QString&, char* &,
+    static Element* info(QString&, QString &,
                          bool getNewOne=false, QString filename="");
   protected:
     void createSymbol(QString filename);

qucs/module.cpp

@@ -81,9 +81,10 @@ Component * Module::getComponent (QString Model) {
   if (m) {
     QString Name;
     char * File;
+    QString vaBitmap;
     if (vaComponents.contains(Model))
       return (Component *)
-              vacomponent::info (Name, File, true, vaComponents[Model]);
+              vacomponent::info (Name, vaBitmap, true, vaComponents[Model]);
     else
       return (Component *) m->info (Name, File, true);
   }
@@ -94,24 +95,9 @@ void Module::registerDynamicComponents()
 {
     qDebug() << "Module::registerDynamicComponents()";
 
+  // vaComponents is populated in QucsApp::slotLoadModule
 
-
-    // create a persistent map to hold va modules in use
-
-
-
-  // do it elsewhere
-  // check sanity, uniqueness of keys
-  vaComponents["mypotentiometer"] =
-    "/Users/guilherme/git/qucs/va_loader_inverter_prj/mypotentiometer_symbol.json";
-
-  vaComponents["mybsim4v30pMOS"] =
-      "/Users/guilherme/git/qucs/va_loader_inverter_prj/mybsim4v30pMOS_symbol.json";
-
-  vaComponents["mybsim4v30nMOS"] =
-      "/Users/guilherme/git/qucs/va_loader_inverter_prj/mybsim4v30nMOS_symbol.json";
-
-  // later for keys in vaComponents
+  // register modules symbol and properties out of in vaComponents
   QMapIterator<QString, QString> i(vaComponents);
    while (i.hasNext()) {
      i.next();
@@ -127,18 +113,16 @@ void Module::registerDynamicComponents()
      m->infoVA = &vacomponent::info;
 
      // TODO maybe allow user load into custom category?
-
      m->category = QObject::tr("verilog-a user devices");
 
-
      // instantiation of the component once in order
      // to obtain "Model" property of the component
      //QString Name, Model;
      //char * File;
-     QString Name, Model;
-     char * File;
+     QString Name, Model, vaBitmap;
+//     char * File;
      Component * c = (Component *)
-             vacomponent::info (Name, File, true, vaComponents[i.key()]);
+             vacomponent::info (Name, vaBitmap, true, vaComponents[i.key()]);
      Model = c->Model;
      delete c;
 

qucs/module.h

@@ -24,7 +24,7 @@
 
 // function typedefs for circuits and analyses
 typedef Element * (* pInfoFunc) (QString&, char * &, bool);
-typedef Element * (* pInfoVAFunc) (QString&, char * &, bool, QString);
+typedef Element * (* pInfoVAFunc) (QString&, QString&, bool, QString);
 typedef Component * (* pCreatorFunc) ();
 
 class Module

qucs/qucs.cpp

@@ -640,31 +640,41 @@ void QucsApp::slotSetCompView (int index)
   // if something was registered dynamicaly, get and draw icons into dock
   if (item == QObject::tr("verilog-a user devices")) {
 
-    // need to populate from vaComponents
-    // cannot use ordinary ->info below, need to know JSON
-    // fetch bitmap path from JSON or,
-    // provide default icon or,
-    // use Clemens stuff to bitmap of the symbol itself
-
-    // TODO test if bitmap exists, otherwise use default icon
-
-    QMap<QString, QString> vaBitmaps;
-
-    vaBitmaps["mypotentiometer"] =
-      "/Users/guilherme/git/qucs/va_loader_inverter_prj/mypotentiometer.png";
-    vaBitmaps["mybsim4v30pMOS"] =
-      "/Users/guilherme/git/qucs/va_loader_inverter_prj/mybsim4v30pMOS.png";
-    vaBitmaps["mybsim4v30nMOS"] =
-      "/Users/guilherme/git/qucs/va_loader_inverter_prj/mybsim4v30nMOS.png";
-
     QListWidgetItem *icon;
     QMapIterator<QString, QString> i(Module::vaComponents);
     while (i.hasNext()) {
       i.next();
-      Name = "mypotentiometer"; // goes under icon
-      Name = i.key();
 
-      icon = new QListWidgetItem(QPixmap(vaBitmaps[Name]), Name);
+      // default icon initally matches the module name
+      //Name = i.key();
+
+      // Just need path to bitmap, do not create an object
+      QString Name, vaBitmap;
+      Component * c = (Component *)
+              vacomponent::info (Name, vaBitmap, false, i.value());
+      if (c) delete c;
+
+      // check if icon exists, fall back to default
+      QString iconPath = QucsSettings.QucsWorkDir.filePath(Name+".png");
+
+      QFile iconFile(iconPath);
+      QPixmap vaIcon;
+
+      if(iconFile.exists())
+      {
+        // load bitmap defined on the JSON symbol file
+        vaIcon = QPixmap(iconPath);
+      }
+      else
+      {
+        QMessageBox::information(this, tr("Info"),
+                     tr("Default icon not found:\n %1.png").arg(vaBitmap));
+        // default icon
+        vaIcon = QPixmap(":/bitmaps/editdelete.png");
+      }
+
+      // Add icon an name tag to dock
+      icon = new QListWidgetItem(vaIcon, Name);
       icon->setToolTip(Name);
       CompComps->addItem(icon);
     }
@@ -741,8 +751,8 @@ void QucsApp::slotSelectComponent(QListWidgetItem *item)
     QString name = CompComps->item(i)->toolTip();
     QString filename = Module::vaComponents[name];
 
-    char * Dummy2;
     QString Dummy1;
+    QString Dummy2;
     if (InfosVA) {
       qDebug() <<  " slotSelectComponent, view->selElem" ;
       view->selElem = (*InfosVA) (Dummy1, Dummy2, true, filename);

qucs/qucs_actions.cpp

@@ -36,6 +36,7 @@
 #include "dialogs/changedialog.h"
 #include "dialogs/searchdialog.h"
 #include "dialogs/librarydialog.h"
+#include "dialogs/loaddialog.h"
 #include "dialogs/importdialog.h"
 #include "dialogs/packagedialog.h"
 #include "module.h"
@@ -1367,9 +1368,67 @@ void QucsApp::slotLoadModule()
 {
     qDebug() << "slotLoadModule";
 
-    //
+
+    LoadDialog *ld = new LoadDialog(this);
+    ld->setApp(this);
+
+    // fech list of _symbol.json
+    // fetch timestamp of VA, JSON, if VA newer, need to reload.
+
+    QString fileName ="";
+
+    QDir currentDir = QucsSettings.QucsWorkDir.absolutePath();
+
+    qDebug() << "+++++ curDir " << currentDir;
+
+    QStringList files;
+    if (fileName.isEmpty())
+        fileName = "*_symbol.json";
+    files = currentDir.entryList(QStringList(fileName),
+                                 QDir::Files | QDir::NoSymLinks);
+    qDebug() << files.join(" ");
+
+    ld->addFiles(files);
+    ld->initDialog();
+
+    // check what is already loaded, offer skip, reload
+
+    //pass stuff to ld dialog
+
+    // run, let user do the selections
+    ld->exec();
+
+    // load, unload, reload
+    // inform if symbol changed
+
+    // return what needs to be loaded
+    // reload means unload, load again
+    // populate Module::vaComponents
+
+
+    qDebug() << files.join("\n");
+
+
+    // build vaComponents map
+    for (int i = 0; i < files.size(); ++i){
+
+      //take module name
+      QString key = files.at(i).split("_").at(0);
+      qDebug() << "basename" << key;
+
+      Module::vaComponents[key]=
+              QucsSettings.QucsWorkDir.absoluteFilePath(files.at(i));
+
+    }
+
+    // TODO vaComponents should be populated with the dialog
+
+   // TODO dialog write new bitmap into JSON
+
     Module::registerDynamicComponents();
 
+    // regurns what needs to be unregistered
+
     // update the combobox,
     // pick up new category 'verilog-a user components' from `Module::category`
     // draw icons of dynamically registered components
@@ -1377,6 +1436,8 @@ void QucsApp::slotLoadModule()
 
     //set new category into view
     // TODO
+
+    delete ld;
 }