projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add libsigrokflow build system integration.
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index 7e1be20d52d5ca4dd7b14835387f960590c75b82..bfb702cf064ce062462b67e5c7f0d0eba3f822d0 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-14,38
+14,48
@@
* 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/>.
*/
*/
-#include "deviceoptions.h"
-
-#include <boost/foreach.hpp>
+#include "deviceoptions.hpp"
#include <QFormLayout>
#include <QListWidget>
#include <QFormLayout>
#include <QListWidget>
-#include <pv/prop/property.h>
+#include <pv/prop/property.hpp>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
-using boost::shared_ptr;
+using std::shared_ptr;
+
+using sigrok::Device;
namespace pv {
namespace popups {
namespace pv {
namespace popups {
-DeviceOptions::DeviceOptions(shared_ptr<Dev
Inst> dev_inst
, QWidget *parent) :
+DeviceOptions::DeviceOptions(shared_ptr<Dev
ice> device
, QWidget *parent) :
Popup(parent),
Popup(parent),
-
_dev_inst(dev_inst
),
-
_layout
(this),
-
_binding(dev_inst
)
+
device_(device
),
+
layout_
(this),
+
binding_(device
)
{
{
- setLayout(&
_layout
);
+ setLayout(&
layout_
);
-
_layout.addWidget(_binding
.get_property_form(this, true));
+
layout_.addWidget(binding_
.get_property_form(this, true));
}
}
-pv::
prop::binding::DeviceOptions
& DeviceOptions::binding()
+pv::
binding::Device
& DeviceOptions::binding()
{
{
- return _binding;
+ return binding_;
+}
+
+void DeviceOptions::show()
+{
+ // Update device config widgets with the current values supplied by the
+ // driver before actually showing the popup dialog
+ binding_.update_property_widgets();
+
+ Popup::show();
}
} // namespace popups
}
} // namespace popups