piklab-svn Mailing List for Piklab

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2982
          http://piklab.svn.sourceforge.net/piklab/?rev=2982&view=rev
Author:   azhyd
Date:     2012-11-08 05:56:36 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
fix device order and graphs in device selector

Modified Paths:
--------------
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/device_gui.h

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================

--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-11-08 05:45:40 UTC (rev 2981)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-11-08 05:56:36 UTC (rev 2982)
@@ -310,15 +310,37 @@
     return;
   }
 
-  QMap<QString, KListViewItem *> groups;
   Q3ListViewItem *selected = NULL;
+  addListItems("mem24", NULL, i18n("24 EEPROM"), device, selected);
+  for (int i = Pic::Architecture::Nb_Types-1; i >= 0; --i) {
+    Pic::Architecture arch = Pic::Architecture::Type(i);
+    addListItems("pic", arch.key(), arch.label(), device, selected);
+  }
+  if (selected == NULL) selected = _listView->firstChild();
+  if (selected != NULL) {
+    _listView->setSelected(selected, true);
+    _listView->ensureItemVisible(selected);
+    currentChanged(selected);
+  }
+}
+
+void DeviceChooser::Dialog::addListItems(const QString& group, const QString& arch, const QString& parentName, const QString& device, Q3ListViewItem*& selected)
+{
+  ListItem* parentItem = NULL;
+  if (_listTypeCombo->value().type() == ListType::FamilyTree) {
+    parentItem = new ListItem(_listView, parentName, false, false);
+  }
+  const Programmer::Group *pgroup = programmerGroup();
+  const Tool::Group *tgroup = toolGroup();
   const QStringList list = Device::Lister::instance().supportedDevices();
   QStringList::const_iterator it = list.end();
   for (it--; it!=list.begin(); it--) {
+    const Device::Data *data = Device::Lister::instance().data(*it);
+    ASSERT(data);
+    if (data->group().name() != group) continue;
+    if (group == "pic" && static_cast<const Pic::Data *>(data)->architecture().key() != arch) continue;
     if ( pgroup && !pgroup->isSupported(*it) ) continue;
     if ( tgroup && !tgroup->isSupported(*it) ) continue;
-    const Device::Data *data = Device::Lister::instance().data(*it);
-    ASSERT(data);
     if ( _memoryCombo->value()!=Device::MemoryTechnology::Nb_Types && data->memoryTechnology()!=_memoryCombo->value() ) continue;
     if ( _statusCombo->value()!=Device::Status::Nb_Types && data->status()!=_statusCombo->value() ) continue;
     if ( _featureCombo->value()!=Pic::Feature::Nb_Types ) {
@@ -340,10 +362,7 @@
     KListViewItem *item = 0;
     switch (_listTypeCombo->value().type()) {
       case ListType::FamilyTree: {
-        QString gname = data->listViewGroup();
-        if ( !groups.contains(gname) )
-          groups[gname] = new ListItem(_listView, gname, false, false);
-        item = new ListItem(groups[gname], *it);
+        item = new ListItem(parentItem, *it);
         break;
       }
       case ListType::Flat:
@@ -353,11 +372,9 @@
     }
     if ( device==(*it) ) selected = item;
   }
-  if ( selected==0 ) selected = _listView->firstChild();
-  if (selected) {
-    _listView->setSelected(selected, true);
-    _listView->ensureItemVisible(selected);
-    currentChanged(selected);
+  if (parentItem != NULL && parentItem->childCount() == 0) {
+    delete parentItem;
+    parentItem = NULL;
   }
 }
 
@@ -473,19 +490,20 @@
 {
   const Device::Data *data = Device::Lister::instance().data(name);
   if (data == NULL) return;
+  _info->setData(data);
+  _memory->setData(data);
+  _vfg->setData(data);
+  _pins->setData(data);
+
   QString doc = htmlInfo(*data, (cannotChangeDevice ? "" : "device:%1"), Device::documentHtml(*data));
   doc += Device::supportedHtmlInfo(*data);
   _info->setText("<html><body>" + doc + "</body></html>");
-  _info->setData(data);
   doc = voltageFrequencyHtml(*data, "vf_");
   QString label = data->name() + "_memory_map.png";
   _memory->setText("<html><body><img src=\"" + label + "\" /></body></html>");
-  _memory->setData(data);
   _vfg->setText("<html><body>" + doc + "</body></html>");
-  _vfg->setData(data);
   doc = pinsHtml(*data, "pins_");
   _pins->setText("<html><body>" + doc + "</body></html>");
-  _pins->setData(data);
 }
 
 void DeviceChooser::View::setText(const QString &text)

Modified: trunk/piklab_kde4/src/libgui/device_gui.h
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.h	2012-11-08 05:45:40 UTC (rev 2981)
+++ trunk/piklab_kde4/src/libgui/device_gui.h	2012-11-08 05:56:36 UTC (rev 2982)
@@ -111,6 +111,7 @@
   View*     _deviceView;
 
   void updateList(const QString &device);
+  void addListItems(const QString& group, const QString& arch, const QString& parentName, const QString& device, Q3ListViewItem*& selected);
   const Programmer::Group *programmerGroup() const;
   const Tool::Group *toolGroup() const;
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





piklab-svn Mailing List for Piklab

IDE for PIC microcontrollers

piklab-svn — Subversion Commits