diff --git a/cd_utils/cdutils_core.cpp b/cd_utils/cdutils_core.cpp index 136092c..48ebb80 100644 --- a/cd_utils/cdutils_core.cpp +++ b/cd_utils/cdutils_core.cpp @@ -60,7 +60,7 @@ Core * __Core_Initializer__::__instance__(0); __Core_Initializer__::__Core_Initializer__() { count_++; if (count_ > 1) return; - //piCout << "create PIInit"; + //piCout << "create Core"; __instance__ = new Core(); } @@ -68,7 +68,7 @@ __Core_Initializer__::__Core_Initializer__() { __Core_Initializer__::~__Core_Initializer__() { count_--; if (count_ > 0) return; - //piCout << "delete PIInit"; + //piCout << "delete Core"; if (__instance__ != 0) { delete __instance__; __instance__ = 0; diff --git a/cd_utils/cdutils_k.cpp b/cd_utils/cdutils_k.cpp index 8ab51e7..ef53c9c 100644 --- a/cd_utils/cdutils_k.cpp +++ b/cd_utils/cdutils_k.cpp @@ -8,6 +8,7 @@ using namespace CDUtils; KInterface::KInterface() { core = Core::instance(); + piCoutObj << core; k_file = PIStringAscii("k.dat"); k_file_size = 0; CONNECTU(core, K_Sended, this, sended); diff --git a/cd_utils/cdutils_k_parser.cpp b/cd_utils/cdutils_k_parser.cpp index 765fd34..df2088f 100644 --- a/cd_utils/cdutils_k_parser.cpp +++ b/cd_utils/cdutils_k_parser.cpp @@ -69,7 +69,7 @@ PIVector enumValues(const PIString & e, const PIMap & s if (v < 2) return ret; for (int i = 0; i < v; ++i) { ret << i; - enames << PIString::fromNumber(i); + enames << "";//PIString::fromNumber(i); } } return ret; @@ -142,13 +142,14 @@ KSection KParser::parse(PIIODevice * d) { //piCout << a << evals; for (int i = 0; i < evals.size_s(); ++i) { ts.section(evals[i]) = is; - ts.section(evals[i]).index_name = enames[i]; + ts.section(evals[i]).alias = enames[i]; } ts.name = is.name; ts.name.insert(ibpos, PIString("[") << a << "]"); is = ts; ts = KSection(); } + is.alias = alias; cs.section(aval) = is; } } diff --git a/cd_utils/cdutils_k_types.h b/cd_utils/cdutils_k_types.h index ec336c1..9b661a5 100644 --- a/cd_utils/cdutils_k_types.h +++ b/cd_utils/cdutils_k_types.h @@ -60,7 +60,7 @@ public: PIStringList index_names() const; PIString name; - PIString index_name; + PIString alias; private: KSection(PIMap k_, PIMap s_) { diff --git a/cd_utils/pult/cd_pult.cpp b/cd_utils/pult/cd_pult.cpp index 8152497..9db65e3 100644 --- a/cd_utils/pult/cd_pult.cpp +++ b/cd_utils/pult/cd_pult.cpp @@ -219,10 +219,8 @@ void CD_Pult::makeTreeSection(KSection & ks, QTreeWidgetItem * pi) { for (si = ks.s.begin(); si != ks.s.end(); ++si) { QTreeWidgetItem * ti = new QTreeWidgetItem(pi); const KSection & cs(si.value()); - QString sn("[%1]"); - if (cs.index_name.isEmpty()) sn = sn.arg(si.key()); - else sn = sn.arg(PI2QString(cs.index_name)); - ti->setText(0, sn); + ti->setText(0, QString("[%1]").arg(si.key())); + ti->setText(1, PI2QString(cs.alias)); ti->setText(2, PI2QString(cs.name)); makeTreeSection(const_cast(cs), ti); }