src/extprogs.cpp

changeset 539
72ad83a67165
parent 538
2f85d4d286e5
child 541
0e38beeb050a
equal deleted inserted replaced
538:2f85d4d286e5 539:72ad83a67165
188 // ============================================================================= 188 // =============================================================================
189 // ----------------------------------------------------------------------------- 189 // -----------------------------------------------------------------------------
190 void writeColorGroup (const int colnum, str fname) 190 void writeColorGroup (const int colnum, str fname)
191 { QList<LDObject*> objects; 191 { QList<LDObject*> objects;
192 192
193 for (LDObject* obj : LDFile::current()->objects()) 193 for (LDObject* obj : LDFile::current()->getObjects())
194 { if (obj->isColored() == false || obj->color() != colnum) 194 { if (obj->isColored() == false || obj->getColor() != colnum)
195 continue; 195 continue;
196 196
197 objects << obj; 197 objects << obj;
198 } 198 }
199 199
402 402
403 QDialog* dlg = new QDialog; 403 QDialog* dlg = new QDialog;
404 Ui::IntersectorUI ui; 404 Ui::IntersectorUI ui;
405 ui.setupUi (dlg); 405 ui.setupUi (dlg);
406 406
407 makeColorSelector (ui.cmb_incol); 407 makeColorComboBox (ui.cmb_incol);
408 makeColorSelector (ui.cmb_cutcol); 408 makeColorComboBox (ui.cmb_cutcol);
409 ui.cb_repeat->setWhatsThis ("If this is set, " APPNAME " runs Intersector a second time with inverse files to cut the " 409 ui.cb_repeat->setWhatsThis ("If this is set, " APPNAME " runs Intersector a second time with inverse files to cut the "
410 " cutter group with the input group. Both groups are cut by the intersection."); 410 " cutter group with the input group. Both groups are cut by the intersection.");
411 ui.cb_edges->setWhatsThis ("Makes " APPNAME " try run Isecalc to create edgelines for the intersection."); 411 ui.cb_edges->setWhatsThis ("Makes " APPNAME " try run Isecalc to create edgelines for the intersection.");
412 412
413 int inCol, cutCol; 413 int inCol, cutCol;
492 return; 492 return;
493 493
494 QDialog* dlg = new QDialog; 494 QDialog* dlg = new QDialog;
495 Ui::CovererUI ui; 495 Ui::CovererUI ui;
496 ui.setupUi (dlg); 496 ui.setupUi (dlg);
497 makeColorSelector (ui.cmb_col1); 497 makeColorComboBox (ui.cmb_col1);
498 makeColorSelector (ui.cmb_col2); 498 makeColorComboBox (ui.cmb_col2);
499 499
500 int in1Col, in2Col; 500 int in1Col, in2Col;
501 501
502 forever 502 forever
503 { if (!dlg->exec()) 503 { if (!dlg->exec())
549 549
550 Ui::IsecalcUI ui; 550 Ui::IsecalcUI ui;
551 QDialog* dlg = new QDialog; 551 QDialog* dlg = new QDialog;
552 ui.setupUi (dlg); 552 ui.setupUi (dlg);
553 553
554 makeColorSelector (ui.cmb_col1); 554 makeColorComboBox (ui.cmb_col1);
555 makeColorSelector (ui.cmb_col2); 555 makeColorComboBox (ui.cmb_col2);
556 556
557 int in1Col, in2Col; 557 int in1Col, in2Col;
558 558
559 // Run the dialog and validate input 559 // Run the dialog and validate input
560 forever 560 forever

mercurial