projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device.cpp: Add SR_CONF_EXTERNAL_CLOCK_SOURCE.
[pulseview.git]
/
pv
/
prop
/
double.hpp
diff --git
a/pv/prop/double.hpp
b/pv/prop/double.hpp
index dc119bdb36e40c421421869e3e9610cc700157cb..44e9f7e7cb25b94b508ad1b96457454f5b46c7cc 100644
(file)
--- a/
pv/prop/double.hpp
+++ b/
pv/prop/double.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_PROP_DOUBLE_HPP
*/
#ifndef PULSEVIEW_PV_PROP_DOUBLE_HPP
@@
-27,6
+26,8
@@
#include "property.hpp"
#include "property.hpp"
+using std::pair;
+
class QDoubleSpinBox;
namespace pv {
class QDoubleSpinBox;
namespace pv {
@@
-37,8
+38,8
@@
class Double : public Property
Q_OBJECT
public:
Q_OBJECT
public:
- Double(QString name, int decimals, QString suffix,
- boost::optional<
std::
pair<double, double> > range,
+ Double(QString name,
QString desc,
int decimals, QString suffix,
+ boost::optional< pair<double, double> > range,
boost::optional<double> step,
Getter getter,
Setter setter);
boost::optional<double> step,
Getter getter,
Setter setter);
@@
-46,6
+47,7
@@
public:
virtual ~Double() = default;
QWidget* get_widget(QWidget *parent, bool auto_commit);
virtual ~Double() = default;
QWidget* get_widget(QWidget *parent, bool auto_commit);
+ void update_widget();
void commit();
void commit();
@@
-55,13
+57,13
@@
private Q_SLOTS:
private:
const int decimals_;
const QString suffix_;
private:
const int decimals_;
const QString suffix_;
- const boost::optional<
std::
pair<double, double> > range_;
+ const boost::optional< pair<double, double> > range_;
const boost::optional<double> step_;
QDoubleSpinBox *spin_box_;
};
const boost::optional<double> step_;
QDoubleSpinBox *spin_box_;
};
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv
#endif // PULSEVIEW_PV_PROP_DOUBLE_HPP
#endif // PULSEVIEW_PV_PROP_DOUBLE_HPP