Console: rename PascalCase named methods to camelCase
This commit is contained in:
@@ -51,6 +51,6 @@ PyMOD_INIT_FUNC(Import)
|
||||
Base::Interpreter().addType(&Import::StepShapePy ::Type, importModule, "StepShape");
|
||||
|
||||
|
||||
Base::Console().Log("Loading Import module... done\n");
|
||||
Base::Console().log("Loading Import module... done\n");
|
||||
PyMOD_Return(importModule);
|
||||
}
|
||||
|
||||
@@ -159,8 +159,8 @@ private:
|
||||
reader.read(hDoc);
|
||||
}
|
||||
catch (OSD_Exception& e) {
|
||||
Base::Console().Error("%s\n", e.GetMessageString());
|
||||
Base::Console().Message("Try to load STEP file without colors...\n");
|
||||
Base::Console().error("%s\n", e.GetMessageString());
|
||||
Base::Console().message("Try to load STEP file without colors...\n");
|
||||
|
||||
Part::ImportStepParts(pcDoc, Utf8Name.c_str());
|
||||
pcDoc->recompute();
|
||||
@@ -172,8 +172,8 @@ private:
|
||||
reader.read(hDoc);
|
||||
}
|
||||
catch (OSD_Exception& e) {
|
||||
Base::Console().Error("%s\n", e.GetMessageString());
|
||||
Base::Console().Message("Try to load IGES file without colors...\n");
|
||||
Base::Console().error("%s\n", e.GetMessageString());
|
||||
Base::Console().message("Try to load IGES file without colors...\n");
|
||||
|
||||
Part::ImportIgesParts(pcDoc, Utf8Name.c_str());
|
||||
pcDoc->recompute();
|
||||
@@ -428,7 +428,7 @@ private:
|
||||
|
||||
Py::Object writeDXFShape(const Py::Tuple& args)
|
||||
{
|
||||
Base::Console().Message("Imp:writeDXFShape()\n");
|
||||
Base::Console().message("Imp:writeDXFShape()\n");
|
||||
PyObject* shapeObj = nullptr;
|
||||
char* fname = nullptr;
|
||||
std::string filePath;
|
||||
@@ -632,7 +632,7 @@ private:
|
||||
PyMem_Free(fname);
|
||||
App::DocumentObject* obj =
|
||||
static_cast<App::DocumentObjectPy*>(docObj)->getDocumentObjectPtr();
|
||||
Base::Console().Message("Imp:writeDXFObject - docObj: %s\n", obj->getNameInDocument());
|
||||
Base::Console().message("Imp:writeDXFObject - docObj: %s\n", obj->getNameInDocument());
|
||||
|
||||
if ((versionParm == 12) || (versionParm == 14)) {
|
||||
versionOverride = true;
|
||||
|
||||
@@ -175,7 +175,7 @@ void ImportOCAF::loadShapes(const TDF_Label& label,
|
||||
}
|
||||
|
||||
#ifdef FC_DEBUG
|
||||
Base::Console().Log("H:%d, N:%s, T:%d, A:%d, S:%d, C:%d, SS:%d, F:%d, R:%d, C:%d, SS:%d\n",
|
||||
Base::Console().log("H:%d, N:%s, T:%d, A:%d, S:%d, C:%d, SS:%d, F:%d, R:%d, C:%d, SS:%d\n",
|
||||
hash,
|
||||
part_name.c_str(),
|
||||
aShapeTool->IsTopLevel(label),
|
||||
|
||||
@@ -159,7 +159,7 @@ void ImportOCAFAssembly::loadShapes(const TDF_Label& label,
|
||||
|
||||
std::stringstream str;
|
||||
|
||||
Base::Console().Log("H:%-9d \tN:%-30s \tTop:%d, Asm:%d, Shape:%d, Compound:%d, Simple:%d, "
|
||||
Base::Console().log("H:%-9d \tN:%-30s \tTop:%d, Asm:%d, Shape:%d, Compound:%d, Simple:%d, "
|
||||
"Free:%d, Ref:%d, Component:%d, SubShape:%d\tTrf:%s-- Dep:%d \n",
|
||||
hash,
|
||||
part_name.c_str(),
|
||||
@@ -176,7 +176,7 @@ void ImportOCAFAssembly::loadShapes(const TDF_Label& label,
|
||||
dep);
|
||||
|
||||
label.Dump(str);
|
||||
Base::Console().Message(str.str().c_str());
|
||||
Base::Console().message(str.str().c_str());
|
||||
#endif
|
||||
|
||||
std::string asm_name = assembly;
|
||||
@@ -218,7 +218,7 @@ void ImportOCAFAssembly::createShape(const TDF_Label& label,
|
||||
const TopLoc_Location& loc,
|
||||
const std::string& name)
|
||||
{
|
||||
Base::Console().Log("-create Shape\n");
|
||||
Base::Console().log("-create Shape\n");
|
||||
const TopoDS_Shape& aShape = aShapeTool->GetShape(label);
|
||||
if (!aShape.IsNull() && aShape.ShapeType() == TopAbs_COMPOUND) {
|
||||
TopExp_Explorer xp;
|
||||
|
||||
@@ -124,7 +124,7 @@ void Tools::printLabel(TDF_Label label,
|
||||
}
|
||||
|
||||
ss << std::endl;
|
||||
Base::Console().Notify<Base::LogStyle::Log>("ImportOCAF2", ss.str().c_str());
|
||||
Base::Console().notify<Base::LogStyle::Log>("ImportOCAF2", ss.str().c_str());
|
||||
}
|
||||
|
||||
void Tools::dumpLabels(TDF_Label label,
|
||||
|
||||
@@ -241,7 +241,7 @@ void ImpExpDxfRead::OnReadArc(const Base::Vector3d& start,
|
||||
Collector->AddObject(BRepBuilderAPI_MakeEdge(circle, p0, p1).Edge(), "Arc");
|
||||
}
|
||||
else {
|
||||
Base::Console().Warning("ImpExpDxf - ignore degenerate arc of circle\n");
|
||||
Base::Console().warning("ImpExpDxf - ignore degenerate arc of circle\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ void ImpExpDxfRead::OnReadCircle(const Base::Vector3d& start,
|
||||
Collector->AddObject(BRepBuilderAPI_MakeEdge(circle).Edge(), "Circle");
|
||||
}
|
||||
else {
|
||||
Base::Console().Warning("ImpExpDxf - ignore degenerate circle\n");
|
||||
Base::Console().warning("ImpExpDxf - ignore degenerate circle\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -379,7 +379,7 @@ void ImpExpDxfRead::OnReadSpline(struct SplineData& sd)
|
||||
Collector->AddObject(BRepBuilderAPI_MakeEdge(geom).Edge(), "Spline");
|
||||
}
|
||||
catch (const Standard_Failure&) {
|
||||
Base::Console().Warning("ImpExpDxf - failed to create bspline\n");
|
||||
Base::Console().warning("ImpExpDxf - failed to create bspline\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -404,7 +404,7 @@ void ImpExpDxfRead::OnReadEllipse(const Base::Vector3d& center,
|
||||
Collector->AddObject(BRepBuilderAPI_MakeEdge(ellipse).Edge(), "Ellipse");
|
||||
}
|
||||
else {
|
||||
Base::Console().Warning("ImpExpDxf - ignore degenerate ellipse\n");
|
||||
Base::Console().warning("ImpExpDxf - ignore degenerate ellipse\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -896,7 +896,7 @@ void ImpExpDxfWrite::exportShape(const TopoDS_Shape input)
|
||||
exportLine(adapt);
|
||||
}
|
||||
else {
|
||||
Base::Console().Warning("ImpExpDxf - unknown curve type: %d\n",
|
||||
Base::Console().warning("ImpExpDxf - unknown curve type: %d\n",
|
||||
static_cast<int>(adapt.GetType()));
|
||||
}
|
||||
}
|
||||
@@ -1064,14 +1064,14 @@ void ImpExpDxfWrite::exportBSpline(BRepAdaptor_Curve& c)
|
||||
else {
|
||||
if (approx.HasResult()) { // result, but not within tolerance
|
||||
spline = approx.Curve();
|
||||
Base::Console().Message("DxfWrite::exportBSpline - result not within tolerance\n");
|
||||
Base::Console().message("DxfWrite::exportBSpline - result not within tolerance\n");
|
||||
}
|
||||
else {
|
||||
f = c.FirstParameter();
|
||||
l = c.LastParameter();
|
||||
s = c.Value(f);
|
||||
ePt = c.Value(l);
|
||||
Base::Console().Message(
|
||||
Base::Console().message(
|
||||
"DxfWrite::exportBSpline - no result- from:(%.3f,%.3f) to:(%.3f,%.3f)\n",
|
||||
s.X(),
|
||||
s.Y(),
|
||||
@@ -1132,7 +1132,7 @@ void ImpExpDxfWrite::exportBSpline(BRepAdaptor_Curve& c)
|
||||
void ImpExpDxfWrite::exportBCurve(BRepAdaptor_Curve& c)
|
||||
{
|
||||
(void)c;
|
||||
Base::Console().Message("BCurve dxf export not yet supported\n");
|
||||
Base::Console().message("BCurve dxf export not yet supported\n");
|
||||
}
|
||||
|
||||
void ImpExpDxfWrite::exportLine(BRepAdaptor_Curve& c)
|
||||
|
||||
@@ -434,7 +434,7 @@ std::string CDxfWrite::getPlateFile(std::string fileSpec)
|
||||
std::stringstream outString;
|
||||
Base::FileInfo fi(fileSpec);
|
||||
if (!fi.isReadable()) {
|
||||
Base::Console().Message("dxf unable to open %s!\n", fileSpec.c_str());
|
||||
Base::Console().message("dxf unable to open %s!\n", fileSpec.c_str());
|
||||
}
|
||||
else {
|
||||
string line;
|
||||
|
||||
@@ -689,12 +689,12 @@ protected:
|
||||
template<typename... args>
|
||||
static void ImportError(const char* format, args&&... argValues)
|
||||
{
|
||||
Base::ConsoleSingleton::Instance().Warning(format, std::forward<args>(argValues)...);
|
||||
Base::ConsoleSingleton::instance().warning(format, std::forward<args>(argValues)...);
|
||||
}
|
||||
template<typename... args>
|
||||
static void ImportObservation(const char* format, args&&... argValues)
|
||||
{
|
||||
Base::ConsoleSingleton::Instance().Message(format, std::forward<args>(argValues)...);
|
||||
Base::ConsoleSingleton::instance().message(format, std::forward<args>(argValues)...);
|
||||
}
|
||||
template<typename... args>
|
||||
void UnsupportedFeature(const char* format, args&&... argValues);
|
||||
|
||||
@@ -56,7 +56,7 @@ PyMOD_INIT_FUNC(ImportGui)
|
||||
}
|
||||
|
||||
PyObject* mod = ImportGui::initModule();
|
||||
Base::Console().Log("Loading GUI of Import module... done\n");
|
||||
Base::Console().log("Loading GUI of Import module... done\n");
|
||||
|
||||
CreateImportCommands();
|
||||
ImportGui::Workbench::init();
|
||||
|
||||
@@ -270,8 +270,8 @@ private:
|
||||
reader.read(hDoc);
|
||||
}
|
||||
catch (OSD_Exception& e) {
|
||||
Base::Console().Error("%s\n", e.GetMessageString());
|
||||
Base::Console().Message("Try to load STEP file without colors...\n");
|
||||
Base::Console().error("%s\n", e.GetMessageString());
|
||||
Base::Console().message("Try to load STEP file without colors...\n");
|
||||
|
||||
Part::ImportStepParts(pcDoc, Utf8Name.c_str());
|
||||
pcDoc->recompute();
|
||||
@@ -283,8 +283,8 @@ private:
|
||||
reader.read(hDoc);
|
||||
}
|
||||
catch (OSD_Exception& e) {
|
||||
Base::Console().Error("%s\n", e.GetMessageString());
|
||||
Base::Console().Message("Try to load IGES file without colors...\n");
|
||||
Base::Console().error("%s\n", e.GetMessageString());
|
||||
Base::Console().message("Try to load IGES file without colors...\n");
|
||||
|
||||
Part::ImportIgesParts(pcDoc, Utf8Name.c_str());
|
||||
pcDoc->recompute();
|
||||
|
||||
Reference in New Issue
Block a user