Skip to content

Commit 5421eff

Browse files
peternewmanpeternewman
authored
Merge branch '0.10' into 0.10
2 parents 58ea98a + 3478fc6 commit 5421eff

File tree

1 file changed

+97
-0
lines changed

1 file changed

+97
-0
lines changed

‎.codespellignore‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,100 @@ class AsyncronousLibUsbAdaptor : public BaseLibUsbAdaptor {
8080
explicit AsyncronousLibUsbAdaptor(class LibUsbThread *thread)
8181
DISALLOW_COPY_AND_ASSIGN(AsyncronousLibUsbAdaptor);
8282
manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
83+
STLDeleteValues(&m_uint_map_variables);
84+
return GetMapVar(&m_uint_map_variables, name, label);
85+
STLValues(m_uint_map_variables, &variables);
86+
auto_ptr<JsonUInt> m_uint_value;
87+
m_uint_value.reset(new JsonUInt(4));
88+
m_uint_value->Accept(&wildcard_validator);
89+
m_uint_value->Accept(&validator);
90+
m_uint_value->Accept(&basic_string_validator);
91+
m_uint_value->Accept(&bool_validator);
92+
m_uint_value->Accept(&null_validator);
93+
m_uint_value->Accept(&integer_validator);
94+
auto_ptr<JsonInt> uint_value1(new JsonInt(5));
95+
m_uint_value->Accept(&max_int_validator);
96+
uint_value1->Accept(&max_int_validator);
97+
m_uint_value->Accept(&exclusive_max_int_validator);
98+
uint_value1->Accept(&max_int_validator);
99+
m_uint_value->Accept(&min_int_validator);
100+
m_uint_value->Accept(&exclusive_min_int_validator);
101+
m_uint_value->Accept(&multiple_of_validator);
102+
m_uint_value->Accept(&integer_validator);
103+
m_uint_value->Accept(&object_validator);
104+
m_uint_value->Accept(&array_validator);
105+
m_uint_value->Accept(&all_of_validator);
106+
m_uint_value->Accept(&any_of_validator);
107+
m_uint_value->Accept(&one_of_validator);
108+
m_uint_value->Accept(&not_validator);
109+
JsonInt uint_value1(2);
110+
JsonInt uint_value2(3);
111+
m_uint_value->Accept(&integer_validator);
112+
uint_value1.Accept(&integer_validator);
113+
uint_value2.Accept(&integer_validator);
114+
JsonUInt uint_value(10);
115+
OLA_ASSERT_EQ(expected, JsonWriter::AsString(uint_value));
116+
* Test the uint item
117+
" \"type\": \"uint\",\n"
118+
" \"type\": \"uint\",\n"
119+
" \"type\": \"uint\",\n"
120+
" \"type\": \"uint\",\n"
121+
std::map<std::string, UIntMap*> m_uint_map_variables;
122+
if (message.uint_offset < MAX_UINT_FIELDS) {
123+
message.uint16_fields[message.uint_offset++] = field->Value();
124+
iter->uint_offset != MAX_UINT_FIELDS ||
125+
enum { MAX_UINT_FIELDS = 2 };
126+
uint16_t uint16_fields[MAX_UINT_FIELDS];
127+
uint8_t uint_offset;
128+
status_message() : uint_offset(0), int_offset(0), status_type(0),
129+
std::string Type() const { return "uint"; }
130+
if (items[i]['type'] == 'uint') {
131+
if (items[i]['type'] == 'uint') {
132+
if (type == 'string' || type == 'uint' || type == 'hidden') {
133+
const char RDMHTTPModule::GENERIC_UINT_FIELD[] = "int";
134+
section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
135+
section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
136+
SelectItem *item = new SelectItem("Personality", GENERIC_UINT_FIELD);
137+
string personality_str = request->GetParameter(GENERIC_UINT_FIELD);
138+
UIntItem *uint_item = new UIntItem("DMX Start Address", address,
139+
uint_item->SetMin(DMX_MIN_SLOT_NUMBER);
140+
uint_item->SetMax(DMX_MAX_SLOT_NUMBER);
141+
item = uint_item;
142+
string device_hours = request->GetParameter(GENERIC_UINT_FIELD);
143+
string lamp_hours_str = request->GetParameter(GENERIC_UINT_FIELD);
144+
string lamp_strikes_str = request->GetParameter(GENERIC_UINT_FIELD);
145+
SelectItem *item = new SelectItem("Lamp State", GENERIC_UINT_FIELD);
146+
string lamp_state_str = request->GetParameter(GENERIC_UINT_FIELD);
147+
SelectItem *item = new SelectItem("Lamp Mode", GENERIC_UINT_FIELD);
148+
string lamp_mode_str = request->GetParameter(GENERIC_UINT_FIELD);
149+
string power_cycles_str = request->GetParameter(GENERIC_UINT_FIELD);
150+
UIntItem *item = new UIntItem("Display Level", value, GENERIC_UINT_FIELD);
151+
string display_level_str = request->GetParameter(GENERIC_UINT_FIELD);
152+
section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
153+
SelectItem *item = new SelectItem("Power State", GENERIC_UINT_FIELD);
154+
string power_state_str = request->GetParameter(GENERIC_UINT_FIELD);
155+
SelectItem *item = new SelectItem("Reset Device", GENERIC_UINT_FIELD);
156+
string reset_device_str = request->GetParameter(GENERIC_UINT_FIELD);
157+
section.AddItem(new UIntItem(description, value, GENERIC_UINT_FIELD));
158+
s.Xa=function(a){a.keyCode==32&&this.cd(a);return!1};wd("goog-checkbox",function(){return new Jg});function Kg(a,b){var c=b.type,d=b.value,h=b.id;if(c=="hidden"){var g=Q("input");g.id=h;g.type="hidden";g.value=d;a.appendChild(g)}else{g=Q("tr");a.appendChild(g);var j=Q("td");j.innerHTML=b.description;g.appendChild(j);j=Q("td");g.appendChild(j);if(h)if(c=="string"||c=="uint"||c=="hidden"){g=Q("input");g.value=d;g.name=h;if(c=="hidden")g.type="hidden";j.appendChild(g);b.button&&(d=new ed.mf(b.button),S(d,j))}else{if(c=="bool")c=new Jg,c.bc(d==1);else{c=new wg;h=d.length;for(g=0;g<h;++g)c.Ba(new Bg(d[g].label));
159+
function Tg(a){for(var b=a.Vd,c=b.length,d=P(a.za.id()),h="",g=0;g<c;++g){var j=b[g].id;if(j)if(b[g].type=="uint"){var l=d.elements[j].value,n=parseInt(l);if(isNaN(n)){a.Dd("Invalid Value",b[g].description+" must be an integer");return}var o=b[g].min;if(o!=k&&n<o){a.Dd("Invalid Value",b[g].description+" must be > "+(o-1));return}o=b[g].max;if(o!=k&&n>o){a.Dd("Invalid Value",b[g].description+" must be < "+(o+1));return}h+=j+"="+l+"&"}else if(b[g].type=="string")l=d.elements[j].value,h+=j+"="+l+"&";
160+
p.M=function(a){Yc(this.bd,a)};p.B=n("$");p.getParent=n("D");p.u=function(a){this.S=a;this.bd.className=a?"goog-tabpane-tab":"goog-tabpane-tab-disabled"};p.isEnabled=n("S");function dk(a,b){if(a.isEnabled())a.$.style.display=b?"":"none",a.bd.className=b?"goog-tabpane-tab-selected":"goog-tabpane-tab"}p.ue=function(a,b){this.D=a;this.jd=ga(b)?b:l};function ck(a,b,c){E.call(this,a,b);this.page=c}w(ck,E);function ek(a,b,c){ti.call(this,a,b,c);this.Xg(!0)}w(ek,ti);ek.prototype.Ec=function(){return this.dispatchEvent("action")};se("goog-option",function(){return new ek(l)});function fk(a,b){var c=b.type,d=b.value,g=b.id;if(c=="hidden"){var h=P("input");h.id=g;h.type="hidden";h.value=d;a.appendChild(h)}else{h=P("tr");a.appendChild(h);var i=P("td");i.innerHTML=b.description;h.appendChild(i);i=P("td");h.appendChild(i);if(g)if(c=="string"||c=="uint"||c=="hidden"){h=P("input");h.value=d;h.name=g;if(c=="hidden")h.type="hidden";i.appendChild(h);b.button&&(new gk(b.button)).L(i)}else{if(c=="bool")c=new dj,c.Kc(d==1);else{c=new $;g=d.length;for(h=0;h<g;++h)c.bb(new ek(d[h].label));
161+
function ok(a,b){for(var c=a.wa[b].data.items,d=c.length,g=N(a.wa[b].id),h="",i=0;i<d;++i){var k=c[i].id;if(k)if(c[i].type=="uint"){var m=g.elements[k].value,q=parseInt(m);if(isNaN(q)){a.Mb("Invalid Value",c[i].description+" must be an integer");return}var t=c[i].min;if(t!=j&&q<t){a.Mb("Invalid Value",c[i].description+" must be > "+(t-1));return}t=c[i].max;if(t!=j&&q>t){a.Mb("Invalid Value",c[i].description+" must be < "+(t+1));return}h+=k+"="+m+"&"}else if(c[i].type=="string")m=g.elements[k].value,
162+
UIntValidator uint_validator(10, 14);
163+
OLA_ASSERT(uint_validator.IsValid("10"));
164+
OLA_ASSERT(uint_validator.IsValid("14"));
165+
OLA_ASSERT_FALSE(uint_validator.IsValid("0"));
166+
OLA_ASSERT_FALSE(uint_validator.IsValid("9"));
167+
OLA_ASSERT_FALSE(uint_validator.IsValid("15"));
168+
// test get/set/has single values uint
169+
// test get/set multiple value uint
170+
// test SetDefaultValue uint
171+
UIntValidator uint_validator(0, 3);
172+
OLA_ASSERT(preferences->SetDefaultValue(key1, uint_validator, value3));
173+
OLA_ASSERT_FALSE(preferences->SetDefaultValue(key1, uint_validator,
174+
const char *uint_vars[] = {
175+
for (unsigned int i = 0; i < arraysize(uint_vars); ++i) {
176+
m_export_map->GetUIntMapVar(uint_vars[i])->Remove(m_universe_id_str);
177+
static const char GENERIC_UINT_FIELD[];
178+
if ((uint) r != buffer.Size()) {
179+
UIntValidator(0, UINT_MAX),

0 commit comments

Comments
 (0)