projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use QMessageBox::setInformativeText()
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index ac7c2b78f3c3eb0245e77e3d6dc248e47264e801..bfb702cf064ce062462b67e5c7f0d0eba3f822d0 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-14,34
+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 std::shared_ptr;
-using namespace boost;
-using namespace std;
+using sigrok::Device;
namespace pv {
namespace popups {
namespace pv {
namespace popups {
-DeviceOptions::DeviceOptions(s
r_dev_inst *sdi
, QWidget *parent) :
+DeviceOptions::DeviceOptions(s
hared_ptr<Device> device
, QWidget *parent) :
Popup(parent),
Popup(parent),
- _sdi(sdi),
- _layout(this),
- _binding(sdi)
+ device_(device),
+ layout_(this),
+ binding_(device)
+{
+ setLayout(&layout_);
+
+ layout_.addWidget(binding_.get_property_form(this, true));
+}
+
+pv::binding::Device& DeviceOptions::binding()
+{
+ return binding_;
+}
+
+void DeviceOptions::show()
{
{
- setLayout(&_layout);
+ // Update device config widgets with the current values supplied by the
+ // driver before actually showing the popup dialog
+ binding_.update_property_widgets();
-
_layout.addWidget(_binding.get_property_form(this, true)
);
+
Popup::show(
);
}
} // namespace popups
}
} // namespace popups