projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecoderSelector: Fix catching polymorphic types by value.
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index 3d069f799e1f40f9a6066148804c9e73f687109c..bfb702cf064ce062462b67e5c7f0d0eba3f822d0 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-14,18
+14,17
@@
* 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 "deviceoptions.h
pp
"
#include <QFormLayout>
#include <QListWidget>
#include <QFormLayout>
#include <QListWidget>
-#include <pv/prop/property.h>
+#include <pv/prop/property.h
pp
>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::shared_ptr;
using std::shared_ptr;
@@
-36,18
+35,27
@@
namespace popups {
DeviceOptions::DeviceOptions(shared_ptr<Device> device, QWidget *parent) :
Popup(parent),
DeviceOptions::DeviceOptions(shared_ptr<Device> device, QWidget *parent) :
Popup(parent),
-
_device
(device),
-
_layout
(this),
-
_binding
(device)
+
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