SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Merge branch 'master' of https://git.shs.tools/SHS/pip

Browse Source
This commit is contained in:
Пелипенко Иван
2020-05-28 17:08:42 +03:00
parent 67f82558d5 988ebac3b7
commit 86b25303ef
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
main.cpp
View File

@@ -117,26 +117,19 @@ PIKbdListener kbd(0, 0, false);
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
//piCout << PISerial::availableDevicesInfo(); PIMathMatrixd m = PIMathMatrixd::identity(3,3);
/*PIIODevice * d = PIIODevice::createFromFullPath(argv[1]); m*=33;
piCout << d; piCout << m;
if (d) { PIMathMatrixd m2;
d->open(); m2 = m; m2.resize(3,5, 99);
piCout << d->constructFullPath() << d->isOpened(); piCout << m2;
}*/ m2 = m; m2.resize(5,3, 88);
/*piCout << PIString("1.1,0:1").findAny(".,:"); piCout << m2;
piCout << PIString("1,1,0:1").findAny(".,:"); m2 = m; m2.resize(4,9, 77);
piCout << PIString("1:1,0:1").findAny(".,:"); piCout << m2;
piCout << PIString("1.1,0:1").findAnyLast(".,:");*/ m2 = m; m2.resize(2,2, 66);
piCout << versionNormalize(""); piCout << m2;
piCout << versionNormalize("1"); m2 = m; m2.resize(2,8, 66);
piCout << versionNormalize("1.2"); piCout << m2;
piCout << versionNormalize("1.2.3");
piCout << versionNormalize("1.2+rc1.99");
piCout << versionNormalize("1.2-alpha");
piCout << versionNormalize("1..4_rc2-999");
//piCout << versionCompare(".2-alpha", "0.2_alpha");
//piCout << versionCompare("1_prebeta", "1.0_alpha");
return 0; return 0;
} }

17
src_main/containers/pivector2d.h
View File

@@ -213,9 +213,24 @@ public:
} }
inline PIVector2D<T> & resize(size_t rows, size_t cols, const T & f = T()) { inline PIVector2D<T> & resize(size_t rows, size_t cols, const T & f = T()) {
mat.resize(rows*cols_, f);
rows_ = rows; rows_ = rows;
cols_ = cols; int cs = (cols - cols_);
if (cs < 0) {
for (size_t r=0; r<rows; ++r) {
mat.remove(r*cols_ + cols_, -cs);
}
}
mat.resize(rows*cols, f); mat.resize(rows*cols, f);
if (!mat.isEmpty()) {
if (cs > 0) {
for (size_t r=0; r<rows_; ++r) {
for (int i=0; i<cs; ++i)
mat.insert(r*cols + cols_, mat.take_back());
}
}
}
cols_ = cols;
return *this; return *this;
} }