jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renames parameterWidget to customizer

Browse source
This commit is contained in:
amarjeetkapoor1 2016-08-18 01:45:39 +05:30
parent 85f4c46517
commit 73eda8117d
10 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
examples/Parameteric/candleStand.json → examples/Parametric/candleStand.json
View file

0
examples/Parameteric/candleStand.scad → examples/Parametric/candleStand.scad
View file

0
examples/Parameteric/sign.json → examples/Parametric/sign.json
View file

0
examples/Parameteric/sign.scad → examples/Parametric/sign.scad
View file

2
examples/examples.json
View file

@ -25,7 +25,7 @@
"animation.scad",
"module_recursion.scad"
],
"Parameteric": [
"Parametric": [
"sign.scad",
"candleStand.scad"
],

2
src/feature.cc
View file

@ -23,7 +23,7 @@ const Feature Feature::ExperimentalEachExpression("lc-each", "Enable <code>each<
const Feature Feature::ExperimentalElseExpression("lc-else", "Enable <code>else</code> expression in list comprehensions.");
const Feature Feature::ExperimentalForCExpression("lc-for-c", "Enable C-style <code>for</code> expression in list comprehensions.");
const Feature Feature::ExperimentalSvgImport("svg-import", "Enable SVG import.");
const Feature Feature::ExperimentalParameterWidget("ParameterWidget", "Enable ParameterWidget");
const Feature Feature::ExperimentalCustomizer("Customizer", "Enable Customizer");
Feature::Feature(const std::string &name, const std::string &description)

2
src/feature.h
View file

@ -18,7 +18,7 @@ public:
static const Feature ExperimentalElseExpression;
static const Feature ExperimentalForCExpression;
static const Feature ExperimentalSvgImport;
static const Feature ExperimentalParameterWidget;
static const Feature ExperimentalCustomizer;
const std::string& get_name() const;

6
src/mainwin.cc
View file

@ -630,7 +630,7 @@ void MainWindow::loadViewSettings(){
viewActionHideToolBars->setChecked(settings.value("view/hideToolbar").toBool());
hideToolbars();
if(Feature::ExperimentalParameterWidget.is_enabled()){
if(Feature::ExperimentalCustomizer.is_enabled()){
viewActionHideParameters->setChecked(settings.value("view/hideCustomizer").toBool());
hideParameters();
}else{
@ -1720,7 +1720,7 @@ void MainWindow::compileTopLevelDocument()
this->fileName.isEmpty() ? "" : fnameba;
this->root_module = parse(fulltext.c_str(), fs::path(fname), false);
if(Feature::ExperimentalParameterWidget.is_enabled()){
if(Feature::ExperimentalCustomizer.is_enabled()){
if(this->root_module!=NULL){
//add parameters as annotation in AST
addParameter(fulltext.c_str(),this->root_module);
@ -1732,7 +1732,7 @@ void MainWindow::compileTopLevelDocument()
}
void MainWindow::changeParameterWidget(){
if(Feature::ExperimentalParameterWidget.is_enabled()){
if(Feature::ExperimentalCustomizer.is_enabled()){
viewActionHideParameters->setVisible(true);
}else{
viewActionHideParameters->setChecked(true);

6
src/openscad.cc
View file

@ -402,7 +402,7 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
return 1;
}
if(Feature::ExperimentalParameterWidget.is_enabled()){
if(Feature::ExperimentalCustomizer.is_enabled()){
// add parameter to AST
addParameter(text.c_str(),root_module);
if(!parameterFile.empty() && !setName.empty()){
@ -915,7 +915,7 @@ int main(int argc, char **argv)
string parameterFile;
string parameterSet;
if(Feature::ExperimentalParameterWidget.is_enabled()){
if(Feature::ExperimentalCustomizer.is_enabled()){
if (vm.count("p")) {
if (!parameterFile.empty()) help(argv[0], true);
@ -931,7 +931,7 @@ int main(int argc, char **argv)
else {
if (vm.count("p") || vm.count("P")) {
if (!parameterSet.empty()) help(argv[0], true);
PRINT("ParameterWidget feature not activated \n");
PRINT("Customizer feature not activated \n");
help(argv[0], true);
}
}

10
tests/CMakeLists.txt
View file

@ -1607,7 +1607,7 @@ add_failing_test(offfailedtest EXE ${PYTHON_EXECUTABLE} SCRIPT ${CMAKE_SOURCE_DI
# Customizer tests
#
add_cmdline_test(customizertest EXE ${OPENSCAD_BINPATH} ARGS --enable=ParameterWidget -o SUFFIX ast FILES
add_cmdline_test(customizertest EXE ${OPENSCAD_BINPATH} ARGS --enable=Customizer -o SUFFIX ast FILES
${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/description.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/parameter.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/allmodulescomment.scad
@ -1616,10 +1616,10 @@ add_cmdline_test(customizertest EXE ${OPENSCAD_BINPATH} ARGS --enable=ParameterW
${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/group.scad
)
add_cmdline_test(customizertest-first EXE ${OPENSCAD_BINPATH} ARGS --enable=ParameterWidget -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P firstSet -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-wrong EXE ${OPENSCAD_BINPATH} ARGS --enable=ParameterWidget -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P wrongSetValues -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-incomplete EXE ${OPENSCAD_BINPATH} ARGS --enable=ParameterWidget -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P thirdSet -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-imgset EXE ${OPENSCAD_BINPATH} ARGS --enable=ParameterWidget -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P imagine -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-first EXE ${OPENSCAD_BINPATH} ARGS --enable=Customizer -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P firstSet -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-wrong EXE ${OPENSCAD_BINPATH} ARGS --enable=Customizer -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P wrongSetValues -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-incomplete EXE ${OPENSCAD_BINPATH} ARGS --enable=Customizer -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P thirdSet -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
add_cmdline_test(customizertest-imgset EXE ${OPENSCAD_BINPATH} ARGS --enable=Customizer -p ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.json -P imagine -o SUFFIX ast FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/customizer/setofparameter.scad)
# Tests using the actual OpenSCAD binary
# non-ASCII filenames