From 08c3ac23e89dcdc6504121af63731d764e1b6b42 Mon Sep 17 00:00:00 2001 From: mpv Date: Thu, 19 Mar 2015 16:57:15 +0300 Subject: [PATCH] Minor corrections --- CMakeLists.txt | 2 +- src/ConstructionPlugin/ConstructionPlugin_Plane.cpp | 3 ++- src/GeomAPI/GeomAPI_Shape.cpp | 2 ++ src/ModuleBase/ModuleBase_PagedContainer.cpp | 2 ++ src/SketchSolver/SketchSolver_ConstraintManager.cpp | 1 - 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8406c7645..789636f2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) PROJECT (NewGEOM) -SET (NewGeom_Version 1.0.0) +SET (NewGeom_Version 1.1.0) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) diff --git a/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp b/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp index 5fecd6524..7448f5a7e 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp +++ b/src/ConstructionPlugin/ConstructionPlugin_Plane.cpp @@ -137,7 +137,8 @@ std::shared_ptr ConstructionPlugin_Plane::createPlaneByGeneralEqu anAttrC->isInitialized() && anAttrD->isInitialized() ) { double aA = anAttrA->value(), aB = anAttrB->value(), aC = anAttrC->value(), aD = anAttrD->value(); - std::shared_ptr aPlane = std::shared_ptr(new GeomAPI_Pln(aA, aB, aC, aD)); + std::shared_ptr aPlane = + std::shared_ptr(new GeomAPI_Pln(aA, aB, aC, aD)); std::string kDefaultPlaneSize = "200"; double aSize = Config_PropManager::integer("Sketch planes", "planes_size", kDefaultPlaneSize); aSize *= 4.; diff --git a/src/GeomAPI/GeomAPI_Shape.cpp b/src/GeomAPI/GeomAPI_Shape.cpp index 5a84a3d98..78d5105ee 100644 --- a/src/GeomAPI/GeomAPI_Shape.cpp +++ b/src/GeomAPI/GeomAPI_Shape.cpp @@ -27,6 +27,8 @@ bool GeomAPI_Shape::isNull() const bool GeomAPI_Shape::isEqual(const std::shared_ptr theShape) const { + if (!theShape.get()) + return false; if (isNull()) return theShape->isNull(); if (theShape->isNull()) diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp index d067e100c..29cdd56ea 100644 --- a/src/ModuleBase/ModuleBase_PagedContainer.cpp +++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp @@ -33,6 +33,7 @@ int ModuleBase_PagedContainer::addPage(ModuleBase_PageBase* thePage, { myCaseIds << theCaseId; myPages << thePage; + storeValueCustom(); // to store the initial state return myPages.count(); } @@ -95,6 +96,7 @@ bool ModuleBase_PagedContainer::storeValueCustom() const AttributeStringPtr aStringAttr = aData->string(attributeID()); QString aWidgetValue = myCaseIds.at(currentPageIndex()); aStringAttr->setValue(aWidgetValue.toStdString()); + updateObject(myFeature); // for preview return true; } diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.cpp b/src/SketchSolver/SketchSolver_ConstraintManager.cpp index 71f062c39..aeaad1aed 100644 --- a/src/SketchSolver/SketchSolver_ConstraintManager.cpp +++ b/src/SketchSolver/SketchSolver_ConstraintManager.cpp @@ -399,4 +399,3 @@ void SketchSolver_ConstraintManager::resolveConstraints(const bool theForceUpdat if (needToUpdate || theForceUpdate) Events_Loop::loop()->flush(anUpdateEvent); } - -- 2.39.2