SHS/cd
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update for PIP3

Browse Source
This commit is contained in:
Бычков Андрей
2022-07-29 16:50:38 +03:00
parent 4d9029babe
commit 7a16d76753
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/core/cdutils_c.h
View File

@@ -21,7 +21,7 @@
#define CDUTILS_C_H #define CDUTILS_C_H
#include "cdutils_interface.h" #include "cdutils_interface.h"
#include "cd_core_export.h" #include "cdutils_core.h"
namespace CDUtils { namespace CDUtils {

1
libs/core/cdutils_core.h
View File

@@ -31,6 +31,7 @@ namespace CDUtils {
class CDCore; class CDCore;
typedef void (*Handler)(void*);
class CD_CORE_EXPORT __Core_Initializer__ { class CD_CORE_EXPORT __Core_Initializer__ {
public: public:

4
libs/core/cdutils_parser.cpp
View File

@@ -63,8 +63,8 @@ PIVector<int> enumValues(const PIString & e, const PIMap<PIString, CDSection> &
PIVector<int> ret; PIVector<int> ret;
enames.clear(); enames.clear();
if (sections.contains(e)) { if (sections.contains(e)) {
ret = sections[e].indexes(); ret = sections.at(e).indexes();
enames = sections[e].index_names(); enames = sections.at(e).index_names();
} else { } else {
int v = e.toInt(); int v = e.toInt();
if (v < 2) return ret; if (v < 2) return ret;

2
libs/core/cdutils_types.cpp
View File

@@ -344,7 +344,7 @@ int CDSection::count(bool recursive) const {
if (recursive) { if (recursive) {
PIMap<int, CDSection>::const_iterator i; PIMap<int, CDSection>::const_iterator i;
for (i = s.constBegin(); i != s.constEnd(); ++i) for (i = s.constBegin(); i != s.constEnd(); ++i)
ret += i->second.count(recursive); ret += i.value().count(recursive);
} }
return ret; return ret;
} }

3
libs/core/cdutils_types.h
View File

@@ -127,11 +127,8 @@ public:
bool test(int v) {return cd.value(v).toBool();} bool test(int v) {return cd.value(v).toBool();}
// CDType & operator [](int v) {if (!k.contains(v)) k[v].index_ = v; return k[v];} // CDType & operator [](int v) {if (!k.contains(v)) k[v].index_ = v; return k[v];}
CDType & operator [](int v) {return cd[v];} CDType & operator [](int v) {return cd[v];}
const CDType operator [](int v) const {return cd[v];}
CDType & operator [](const PIString & name_) {return getByName(name_);} CDType & operator [](const PIString & name_) {return getByName(name_);}
const CDType operator [](const PIString & name_) const {return const_cast<CDSection*>(this)->getByName(name_);}
CDType & operator [](const PIDeque<int> & path_) {return getByPath(path_);} CDType & operator [](const PIDeque<int> & path_) {return getByPath(path_);}
const CDType operator [](const PIDeque<int> & path_) const {return const_cast<CDSection*>(this)->getByPath(path_);}
CDSection & section(int v); CDSection & section(int v);
const CDSection section(int v) const; const CDSection section(int v) const;

2
utils/pult/cdgraphics.cpp
View File

@@ -68,7 +68,7 @@ void GDockWidget::addX(const CDType & t) {
void GDockWidget::drawX(const PIMap<PIString, PIVector<double> > & data) { void GDockWidget::drawX(const PIMap<PIString, PIVector<double> > & data) {
for (int i = 0; i < x_list.size_s(); ++i) { for (int i = 0; i < x_list.size_s(); ++i) {
PIString sp = CDCore::pathToString(x_list[i]); PIString sp = CDCore::pathToString(x_list[i]);
const PIVector<double> & ch(data[sp]); PIVector<double> ch(data.at(sp));
for (int j = 0; j < ch.size_s(); ++j) for (int j = 0; j < ch.size_s(); ++j)
graphic->graphic()->addPoint(ch[j], i, false); graphic->graphic()->addPoint(ch[j], i, false);
} }