Import Geant4 11.3.0 source tree
This commit is contained in:
+1
-1
@@ -845,7 +845,7 @@ protected:
|
||||
float b = first_overlap-a*first_scale;
|
||||
//float wanted_scale = -b/a; //zero overlap.
|
||||
float wanted_gap = width.value()*labels_gap.value();
|
||||
float wanted_scale = (-wanted_gap-b)/a;
|
||||
float wanted_scale = (a==0.0f) ? 1 : (-wanted_gap-b)/a; //a==0.0f should not happen.
|
||||
if(wanted_scale<=0) wanted_scale = 1; // this if() should not happen.
|
||||
wanted_scale /= second_scale;
|
||||
{tools_vforcit(matrix*,m_labels_mtxs,it) {
|
||||
|
||||
+4
-2
@@ -39,6 +39,8 @@
|
||||
#include "../sys/atime"
|
||||
#endif
|
||||
|
||||
#include <utility>
|
||||
|
||||
namespace tools {
|
||||
namespace sg {
|
||||
|
||||
@@ -5348,7 +5350,7 @@ protected: //vis bins
|
||||
_ws.push_back(value);
|
||||
}
|
||||
}
|
||||
ws = _ws;
|
||||
ws = std::move(_ws);
|
||||
linen = ws.size()/2;
|
||||
}
|
||||
|
||||
@@ -7181,7 +7183,7 @@ protected: //rep
|
||||
yy = verify_log(yy,ymin,dy,ylog);
|
||||
v.push_back(vec3f(xx,yy,a_zz+zz));
|
||||
}
|
||||
contourVector.push_back(v);
|
||||
contourVector.push_back(std::move(v));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -19,6 +19,8 @@
|
||||
#include "../colorf"
|
||||
#include "../S_STRING"
|
||||
|
||||
#include <utility>
|
||||
|
||||
namespace tools {
|
||||
namespace sg {
|
||||
|
||||
@@ -558,7 +560,7 @@ public:
|
||||
tools_vforcit(std::string,strings.values(),it) {
|
||||
std::string scut;
|
||||
m_base_text->truncate(*it,th,fw,scut);
|
||||
labcut.push_back(scut);
|
||||
labcut.push_back(std::move(scut));
|
||||
}
|
||||
m_base_text->strings = labcut;}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user