mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-15 08:50:36 +05:00
Issue 0020580: get rid of QtxDoubleSpinBox class and use SalomeApp_DoubleSpinBox instead
This commit is contained in:
parent
d6bfd123a2
commit
fc426d91b1
@ -72,7 +72,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1" colspan="2" >
|
<item row="2" column="1" colspan="2" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox_S" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_S" />
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="3" >
|
<item row="1" column="0" colspan="3" >
|
||||||
<widget class="QGroupBox" name="groupBox" >
|
<widget class="QGroupBox" name="groupBox" >
|
||||||
@ -112,7 +112,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox_DX" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="TextLabel4" >
|
<widget class="QLabel" name="TextLabel4" >
|
||||||
@ -131,7 +131,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox_DY" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="TextLabel5" >
|
<widget class="QLabel" name="TextLabel5" >
|
||||||
@ -150,7 +150,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox_DZ" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
@ -196,9 +196,9 @@
|
|||||||
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>QtxDoubleSpinBox</class>
|
<class>SalomeApp_DoubleSpinBox</class>
|
||||||
<extends>QDoubleSpinBox</extends>
|
<extends>QDoubleSpinBox</extends>
|
||||||
<header location="global" >QtxDoubleSpinBox.h</header>
|
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
|
@ -108,7 +108,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="3" >
|
<item row="1" column="3" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox5" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox5" />
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="0" >
|
<item row="0" column="0" >
|
||||||
<widget class="QLabel" name="TextLabel2" >
|
<widget class="QLabel" name="TextLabel2" >
|
||||||
@ -127,7 +127,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1" >
|
<item row="0" column="1" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox1" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox1" />
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="2" >
|
<item row="1" column="2" >
|
||||||
<widget class="QLabel" name="TextLabel6" >
|
<widget class="QLabel" name="TextLabel6" >
|
||||||
@ -146,13 +146,13 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="3" >
|
<item row="0" column="3" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox2" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox2" />
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1" >
|
<item row="2" column="1" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox3" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox3" />
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1" >
|
<item row="1" column="1" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox4" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox4" />
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" >
|
<item row="1" column="0" >
|
||||||
<widget class="QLabel" name="TextLabel5" >
|
<widget class="QLabel" name="TextLabel5" >
|
||||||
@ -213,9 +213,9 @@
|
|||||||
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>QtxDoubleSpinBox</class>
|
<class>SalomeApp_DoubleSpinBox</class>
|
||||||
<extends>QDoubleSpinBox</extends>
|
<extends>QDoubleSpinBox</extends>
|
||||||
<header location="global" >QtxDoubleSpinBox.h</header>
|
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
|
@ -75,13 +75,13 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="1" colspan="2" >
|
<item row="3" column="1" colspan="2" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox1" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox1" />
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="1" colspan="2" >
|
<item row="5" column="1" colspan="2" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox3" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox3" />
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="1" colspan="2" >
|
<item row="4" column="1" colspan="2" >
|
||||||
<widget class="QtxDoubleSpinBox" name="SpinBox2" />
|
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox2" />
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1" >
|
<item row="1" column="1" >
|
||||||
<widget class="QPushButton" name="PushButton2" >
|
<widget class="QPushButton" name="PushButton2" >
|
||||||
@ -236,9 +236,9 @@
|
|||||||
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>QtxDoubleSpinBox</class>
|
<class>SalomeApp_DoubleSpinBox</class>
|
||||||
<extends>QDoubleSpinBox</extends>
|
<extends>QDoubleSpinBox</extends>
|
||||||
<header location="global" >QtxDoubleSpinBox.h</header>
|
<header location="global" >SalomeApp_DoubleSpinBox.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#include "EntityGUI_3DSketcherDlg.h"
|
#include "EntityGUI_3DSketcherDlg.h"
|
||||||
#include "EntityGUI_Widgets.h"
|
#include "EntityGUI_Widgets.h"
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
//
|
//
|
||||||
#include "EntityGUI_SketcherDlg.h"
|
#include "EntityGUI_SketcherDlg.h"
|
||||||
#include "EntityGUI_Widgets.h"
|
#include "EntityGUI_Widgets.h"
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "GEOMToolsGUI_DeflectionDlg.h"
|
#include "GEOMToolsGUI_DeflectionDlg.h"
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
#include <LightApp_Application.h>
|
#include <LightApp_Application.h>
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <SUIT_MessageBox.h>
|
#include <SUIT_MessageBox.h>
|
||||||
#include <SUIT_ResourceMgr.h>
|
#include <SUIT_ResourceMgr.h>
|
||||||
@ -71,10 +71,11 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
|
|||||||
TextLabel1->setText(tr("GEOM_DEFLECTION"));
|
TextLabel1->setText(tr("GEOM_DEFLECTION"));
|
||||||
GroupC1Layout->addWidget(TextLabel1, 0, 0);
|
GroupC1Layout->addWidget(TextLabel1, 0, 0);
|
||||||
|
|
||||||
SpinBox = new QtxDoubleSpinBox (GroupC1);
|
SpinBox = new SalomeApp_DoubleSpinBox (GroupC1);
|
||||||
// Obtain precision from preferences
|
// Obtain precision from preferences
|
||||||
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
||||||
int aPrecision = resMgr->integerValue( "Geometry", "parametric_precision", 6 );
|
int aPrecision = resMgr->integerValue( "Geometry", "parametric_precision", 6 );
|
||||||
|
SpinBox->setAcceptNames( false );
|
||||||
SpinBox->setPrecision( aPrecision );
|
SpinBox->setPrecision( aPrecision );
|
||||||
SpinBox->setDecimals( aPrecision );
|
SpinBox->setDecimals( aPrecision );
|
||||||
SpinBox->setRange( DEFLECTION_MIN, 1.0 );
|
SpinBox->setRange( DEFLECTION_MIN, 1.0 );
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
class QtxDoubleSpinBox;
|
class SalomeApp_DoubleSpinBox;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : GEOMToolsGUI_DeflectionDlg
|
// class : GEOMToolsGUI_DeflectionDlg
|
||||||
@ -54,7 +54,7 @@ private:
|
|||||||
void keyPressEvent( QKeyEvent* );
|
void keyPressEvent( QKeyEvent* );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QtxDoubleSpinBox* SpinBox;
|
SalomeApp_DoubleSpinBox* SpinBox;
|
||||||
QString myHelpFileName;
|
QString myHelpFileName;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// Author : Damien COQUERET, Open CASCADE S.A.S.
|
// Author : Damien COQUERET, Open CASCADE S.A.S.
|
||||||
//
|
//
|
||||||
#include "OperationGUI_ChamferDlg.h"
|
#include "OperationGUI_ChamferDlg.h"
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <DlgRef.h>
|
#include <DlgRef.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <DlgRef.h>
|
#include <DlgRef.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <SUIT_Session.h>
|
#include <SUIT_Session.h>
|
||||||
#include <SUIT_Desktop.h>
|
#include <SUIT_Desktop.h>
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <DlgRef.h>
|
#include <DlgRef.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <SalomeApp_Application.h>
|
#include <SalomeApp_Application.h>
|
||||||
#include <LightApp_SelectionMgr.h>
|
#include <LightApp_SelectionMgr.h>
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <DlgRef.h>
|
#include <DlgRef.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <SalomeApp_Application.h>
|
#include <SalomeApp_Application.h>
|
||||||
#include <LightApp_SelectionMgr.h>
|
#include <LightApp_SelectionMgr.h>
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <DlgRef.h>
|
#include <DlgRef.h>
|
||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <QtxDoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
|
||||||
#include <SalomeApp_Application.h>
|
#include <SalomeApp_Application.h>
|
||||||
#include <LightApp_SelectionMgr.h>
|
#include <LightApp_SelectionMgr.h>
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
#include <GeometryGUI.h>
|
#include <GeometryGUI.h>
|
||||||
#include <GEOMBase.h>
|
#include <GEOMBase.h>
|
||||||
#include <GEOMImpl_Types.hxx>
|
#include <GEOMImpl_Types.hxx>
|
||||||
#include <QtxDoubleSpinBox.h>
|
|
||||||
|
|
||||||
#include <SalomeApp_Application.h>
|
#include <SalomeApp_Application.h>
|
||||||
#include <SalomeApp_DoubleSpinBox.h>
|
#include <SalomeApp_DoubleSpinBox.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user