@@ -26,15 +26,15 @@ namespace hal
2626 case 0 :
2727 return mPinName ;
2828 case 1 :
29- return QString::fromStdString (enum_to_string (mPinDirection ));
29+ if (mItemType ==ModulePinsTreeItem::Group)
30+ return (QString (" [%1] %2" ).arg (getChildCount ()).arg (mIndex ? QChar (0x2193 ) : QChar (0x2191 )));
31+ return mIndex ;
3032 case 2 :
31- return QString::fromStdString (enum_to_string (mPinType ));
33+ return QString::fromStdString (enum_to_string (mPinDirection ));
3234 case 3 :
33- return mNetName ;
35+ return QString::fromStdString ( enum_to_string ( mPinType )) ;
3436 case 4 :
35- if (mItemType ==ModulePinsTreeItem::Group)
36- return (QString (" [%1] %2" ).arg (getChildCount ()).arg (mIndex ? " desc" : " asc" ));
37- return mIndex ;
37+ return mNetName ;
3838 }
3939 return QVariant ();
4040 }
@@ -43,10 +43,10 @@ namespace hal
4343 {
4444 Q_ASSERT (data.size () >= 5 );
4545 mPinName = data[0 ].toString ();
46- mPinDirection = enum_from_string<PinDirection>( data[1 ].toString (). toStdString () );
47- mPinType = enum_from_string<PinType >(data[2 ].toString ().toStdString ());
48- mNetName = data[3 ].toString ();
49- mIndex = data[4 ].toInt ();
46+ mIndex = data[1 ].toInt ( );
47+ mPinDirection = enum_from_string<PinDirection >(data[2 ].toString ().toStdString ());
48+ mPinType = enum_from_string<PinType>( data[3 ].toString (). toStdString () );
49+ mNetName = data[4 ].toString ();
5050 }
5151
5252 void ModulePinsTreeItem::setDataAtColumn (int column, QVariant &data)
@@ -57,16 +57,16 @@ namespace hal
5757 mPinName = data.toString ();
5858 break ;
5959 case 1 :
60- mPinDirection = enum_from_string<PinDirection>( data.toString (). toStdString () );
60+ mIndex = data.toInt ( );
6161 break ;
6262 case 2 :
63- mPinType = enum_from_string<PinType >(data.toString ().toStdString ());
63+ mPinDirection = enum_from_string<PinDirection >(data.toString ().toStdString ());
6464 break ;
6565 case 3 :
66- mNetName = data.toString ();
66+ mPinType = enum_from_string<PinType>( data.toString (). toStdString () );
6767 break ;
6868 case 4 :
69- mIndex = data.toInt ();
69+ mNetName = data.toString ();
7070 break ;
7171 }
7272 }
@@ -83,11 +83,11 @@ namespace hal
8383
8484 ModulePinsTreeModel::ModulePinsTreeModel (QObject* parent) : BaseTreeModel(parent)
8585 {
86- setHeaderLabels (QStringList () << " Name"
86+ setHeaderLabels (QStringList () << " Name "
87+ << " Size/Index"
8788 << " Direction"
8889 << " Type"
89- << " Connected Net"
90- << " Index" );
90+ << " Connected Net" );
9191 setModule (gNetlist ->get_module_by_id (1 ));
9292
9393 // connections
0 commit comments