Issue #1933:Set auxiliary presentation style

[modules/shaper.git] / src / PartSet / PartSet_WidgetPoint2d.cpp

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index df82c9b5f53c7206c70830319f0b8e1dbab66126..8c7d1031b4d2a7c05410e47a27883d1bc65b8aaa 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -20,6 +20,7 @@
 #include <ModuleBase_ISelection.h>
 #include <ModuleBase_ViewerPrs.h>
 #include <ModuleBase_WidgetValidator.h>
+#include <ModuleBase_LabelValue.h>
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>
@@ -90,33 +91,34 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
   aGroupLay->setColumnStretch(1, 1);
   {
     QLabel* aLabel = new QLabel(myGroupBox);
-    aLabel->setText(tr("X "));
-    aGroupLay->addWidget(aLabel, 0, 0);
-
-    myXSpin = new ModuleBase_ParamSpinBox(myGroupBox);
-    myXSpin->setAcceptVariables(aAcceptVariables);
-    myXSpin->setMinimum(-DBL_MAX);
-    myXSpin->setMaximum(DBL_MAX);
-    myXSpin->setToolTip(tr("X"));
+
+    myXSpin = new ModuleBase_LabelValue(myGroupBox, tr("X"));
+    //ModuleBase_ParamSpinBox(myGroupBox);
+    //myXSpin->setAcceptVariables(aAcceptVariables);
+    //myXSpin->setMinimum(-DBL_MAX);
+    //myXSpin->setMaximum(DBL_MAX);
+    //myXSpin->setToolTip(tr("X"));
     aGroupLay->addWidget(myXSpin, 0, 1);
 
-    connect(myXSpin, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
-    myXSpin->setValueEnabled(isValueEnabled());
+    //connect(myXSpin, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
+    //myXSpin->setValueEnabled(isValueEnabled());
   }
   {
-    QLabel* aLabel = new QLabel(myGroupBox);
-    aLabel->setText(tr("Y "));
-    aGroupLay->addWidget(aLabel, 1, 0);
-
-    myYSpin = new ModuleBase_ParamSpinBox(myGroupBox);
-    myYSpin->setAcceptVariables(aAcceptVariables);
-    myYSpin->setMinimum(-DBL_MAX);
-    myYSpin->setMaximum(DBL_MAX);
-    myYSpin->setToolTip(tr("Y"));
+    //QLabel* aLabel = new QLabel(myGroupBox);
+    //aLabel->setText(tr("Y "));
+    //aGroupLay->addWidget(aLabel, 1, 0);
+
+    myYSpin = new ModuleBase_LabelValue(myGroupBox, tr("Y"));
+    //ModuleBase_ParamSpinBox(myGroupBox);
+    //myYSpin = new ModuleBase_ParamSpinBox(myGroupBox);
+    //myYSpin->setAcceptVariables(aAcceptVariables);
+    //myYSpin->setMinimum(-DBL_MAX);
+    //myYSpin->setMaximum(DBL_MAX);
+    //myYSpin->setToolTip(tr("Y"));
     aGroupLay->addWidget(myYSpin, 1, 1);
 
-    connect(myYSpin, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
-    myYSpin->setValueEnabled(isValueEnabled());
+    //connect(myYSpin, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
+    //myYSpin->setValueEnabled(isValueEnabled());
   }
   QVBoxLayout* aLayout = new QVBoxLayout(this);
   ModuleBase_Tools::zeroMargins(aLayout);
@@ -174,7 +176,8 @@ bool PartSet_WidgetPoint2D::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr
 bool PartSet_WidgetPoint2D::resetCustom()
 {
   bool aDone = false;
-  if (!isUseReset() || isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
+  if (!isUseReset() || isComputedDefault()
+      /*|| myXSpin->hasVariable() || myYSpin->hasVariable()*/) {
     aDone = false;
   }
   else {
@@ -189,8 +192,11 @@ bool PartSet_WidgetPoint2D::resetCustom()
       double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
       // it is important to block the spin box control in order to do not through out the
       // locking of the validating state.
-      ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
-      ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
+      myXSpin->setValue(isOk ? aDefValue : 0.0);
+      myYSpin->setValue(isOk ? aDefValue : 0.0);
+
+      //ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
+      //ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
       storeValueCustom();
       aDone = true;
     }
@@ -225,7 +231,7 @@ bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValu
 
 void PartSet_WidgetPoint2D::selectContent()
 {
-  myXSpin->selectAll();
+ // myXSpin->selectAll();
 }
 
 bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
@@ -235,8 +241,11 @@ bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
   if (fabs(theY) >= MaxCoordinate)
     return false;
 
-  ModuleBase_Tools::setSpinValue(myXSpin, theX);
-  ModuleBase_Tools::setSpinValue(myYSpin, theY);
+  myXSpin->setValue(theX);
+  myYSpin->setValue(theY);
+
+  //ModuleBase_Tools::setSpinValue(myXSpin, theX);
+  //ModuleBase_Tools::setSpinValue(myYSpin, theY);
 
   storeValue();
   return true;
@@ -256,10 +265,11 @@ bool PartSet_WidgetPoint2D::storeValueCustom()
 
   // if text is not empty then setValue will be ignored
   // so we should set the text at first
-  aPoint->setText(myXSpin->hasVariable() ? myXSpin->text().toStdString() : "",
-                  myYSpin->hasVariable() ? myYSpin->text().toStdString() : "");
-  aPoint->setValue(!myXSpin->hasVariable() ? myXSpin->value() : aPoint->x(),
-                   !myYSpin->hasVariable() ? myYSpin->value() : aPoint->y());
+  //aPoint->setText(myXSpin->hasVariable() ? myXSpin->text().toStdString() : "",
+  //                myYSpin->hasVariable() ? myYSpin->text().toStdString() : "");
+  //aPoint->setValue(!myXSpin->hasVariable() ? myXSpin->value() : aPoint->x(),
+  //                 !myYSpin->hasVariable() ? myYSpin->value() : aPoint->y());
+  aPoint->setValue(myXSpin->value(), myYSpin->value());
 
   // after movement the solver will call the update event: optimization
   moveObject(myFeature);
@@ -274,44 +284,19 @@ bool PartSet_WidgetPoint2D::restoreValueCustom()
   std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
   std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       aData->attribute(attributeID()));
-  QString aTextX = QString::fromStdString(aPoint->isInitialized() ? aPoint->textX() : "0");
-  QString aTextY = QString::fromStdString(aPoint->isInitialized() ? aPoint->textY() : "0");
-
-  bool isDouble = false;
-  double aVal = 0;
-  if (aTextX.isEmpty()) {
-    ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
-  } else {
-    aVal = aTextX.toDouble(&isDouble);
-    if (isDouble)
-      ModuleBase_Tools::setSpinValue(myXSpin, aVal);
-    else
-      ModuleBase_Tools::setSpinText(myXSpin, aTextX);
-  }
-  if (aTextY.isEmpty()) {
-    ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
-  } else {
-    aVal = aTextY.toDouble(&isDouble);
-    if (isDouble)
-      ModuleBase_Tools::setSpinValue(myYSpin, aVal);
-    else
-      ModuleBase_Tools::setSpinText(myYSpin, aTextY);
-  }
-  //if (aTextX.empty() || aTextY.empty()) {
-  //  ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
-  //  ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
-  //} else {
-  //  ModuleBase_Tools::setSpinText(myXSpin, QString::fromStdString(aTextX));
-  //  ModuleBase_Tools::setSpinText(myYSpin, QString::fromStdString(aTextY));
-  //}
+  double aValueX = aPoint->isInitialized() ? aPoint->x() : 0.;
+  double aValueY = aPoint->isInitialized() ? aPoint->y() : 0.;
+  myXSpin->setValue(aValueX);
+  myYSpin->setValue(aValueY);
+
   return true;
 }
 
 void PartSet_WidgetPoint2D::storeCurentValue()
 {
   // do not use cash if a variable is used
-  if (myXSpin->hasVariable() || myYSpin->hasVariable())
-    return;
+  //if (myXSpin->hasVariable() || myYSpin->hasVariable())
+  //  return;
 
   myValueIsCashed = true;
   myIsFeatureVisibleInCash = XGUI_Displayer::isVisible(
@@ -329,8 +314,10 @@ bool PartSet_WidgetPoint2D::restoreCurentValue()
 
   myValueIsCashed = false;
   myIsFeatureVisibleInCash = true;
-  ModuleBase_Tools::setSpinValue(myXSpin, myXValueInCash);
-  ModuleBase_Tools::setSpinValue(myYSpin, myYValueInCash);
+  myXSpin->setValue(myXValueInCash);
+  myYSpin->setValue(myYValueInCash);
+  //ModuleBase_Tools::setSpinValue(myXSpin, myXValueInCash);
+  //ModuleBase_Tools::setSpinValue(myYSpin, myYValueInCash);
 
   // store value to the model
   storeValueCustom();
@@ -367,6 +354,10 @@ void PartSet_WidgetPoint2D::activateCustom()
   }
 }
 
+void PartSet_WidgetPoint2D::setHighlighted(bool isHighlighted)
+{
+}
+
 void PartSet_WidgetPoint2D::deactivate()
 {
   // the value of the control should be stored to model if it was not
@@ -455,7 +446,8 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo
     aFirstValue = myPreSelected;
   }
   // if we have selection and use it
-  if (aFirstValue.get() && isValidSelectionCustom(aFirstValue)) {
+  if (aFirstValue.get() && isValidSelectionCustom(aFirstValue) &&
+      aFirstValue->shape().get()) { /// Trihedron Axis may be selected, but shape is empty
     GeomShapePtr aGeomShape = aFirstValue->shape();
     TopoDS_Shape aShape = aGeomShape->impl<TopoDS_Shape>();
     ObjectPtr aObject = aFirstValue->object();
@@ -667,7 +659,8 @@ void PartSet_WidgetPoint2D::initializeValueByActivate()
 
 bool PartSet_WidgetPoint2D::processEnter()
 {
-  bool isModified = getValueState() == ModifiedInPP;
+  return false;
+  /*bool isModified = getValueState() == ModifiedInPP;
   if (isModified) {
     bool isXModified = myXSpin->hasFocus();
     emit valuesChanged();
@@ -676,7 +669,7 @@ bool PartSet_WidgetPoint2D::processEnter()
     else
       myYSpin->selectAll();
   }
-  return isModified;
+  return isModified;*/
 }
 
 bool PartSet_WidgetPoint2D::useSelectedShapes() const