Browse files

renamed EnableRaster to EnableEngraving

  • Loading branch information...
1 parent dec1f3e commit 8ef8e7ea229e6c1369111d8863211cfed165fb13 @kallaballa committed May 19, 2012
Showing with 97 additions and 86 deletions.
  1. +5 −4 .cproject
  2. +10 −0 common.pri
  3. +1 −1 doc/PPD-options.txt
  4. +7 −7 etc/ppd/Epilog/CaptureLegend36EXT.ppd
  5. +7 −7 etc/ppd/Epilog/CaptureZing16.ppd
  6. +7 −7 etc/ppd/Epilog/CaptureZing24.ppd
  7. +7 −7 etc/ppd/Epilog/Legend36EXT.ppd
  8. +7 −7 etc/ppd/Epilog/Zing16.ppd
  9. +7 −7 etc/ppd/Epilog/Zing24.ppd
  10. +4 −4 src/ctrl-cut/Document.cpp
  11. +4 −4 src/ctrl-cut/config/DocumentSettings.cpp
  12. +2 −2 src/ctrl-cut/config/DocumentSettings.hpp
  13. +2 −0 src/cups-filter/CupsFilter.cpp
  14. +4 −4 src/cups-filter/CupsOptions.cpp
  15. +1 −1 src/cups-filter/CupsOptions.hpp
  16. +4 −4 src/gui/LaserDialog.cpp
  17. +2 −4 src/gui/MainWindow.cpp
  18. +4 −4 src/gui/Simplify.cpp
  19. +1 −2 src/gui/gui.pro
  20. +2 −2 src/gui/settings/DocumentSettingsTableModel.h
  21. +2 −1 src/pclint/pclint.pro
  22. BIN test-data/Gimp/checker-4x4x16/checker-4x4x16.ps
  23. +1 −1 test-data/Gimp/common.options
  24. +1 −1 test-data/corel-b/common.options
  25. BIN test-data/corel-b/dotframe/dotframe.ps
  26. +1 −1 test-data/corel-b/line_width_threshold/600/.options
  27. BIN test-data/corel-b/line_width_threshold/600/600.ps
  28. +1 −1 test-data/corel-b/line_width_threshold/75/.options
  29. BIN test-data/corel-b/line_width_threshold/line_width_threshold.ps
  30. BIN test-data/corel-b/metalab/metalab.ps
  31. BIN test-data/corel-r/RGB-raster/RGB-raster.ps
  32. BIN test-data/corel-r/colordots/colordots.ps
  33. +1 −1 test-data/corel-r/common.options
  34. BIN test-data/corel-r/gradient/gradient.ps
  35. BIN test-data/corel-r/palette/palette.ps
  36. BIN test-data/corel-r/pattern/pattern.ps
  37. BIN test-data/corel-v/apollonian_branch/apollonian_branch.ps
  38. BIN test-data/corel-v/clip_circle/clip_circle.ps
  39. BIN test-data/corel-v/cross/cross.ps
  40. BIN test-data/corel-v/duplicate-polygon/duplicate-polygon.ps
  41. BIN test-data/corel-v/quad/default/default.ps
  42. BIN test-data/corel-v/quad/quad.ps
  43. BIN test-data/corel-v/test_clip-max/test_clip-max.ps
  44. BIN test-data/corel-v/zebras/zebras.ps
  45. BIN test-data/inkscape/concentric-polygons/concentric-polygons.ps
  46. BIN test-data/inkscape/deonion-bug/deonion-bug.ps
  47. +1 −1 test-data/inkscape/jpeg/default/.options
  48. BIN test-data/inkscape/jpeg/jpeg.ps
  49. +1 −1 test-data/inkscape/sleepy/default/.options
  50. BIN test-data/inkscape/sleepy/sleepy.ps
  51. BIN test-data/inkscape/spiral/spiral.ps
View
9 .cproject
@@ -20,14 +20,15 @@
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.377733518." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1703556739" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.debug" resourceTypeBasedDiscovery="true" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.141540329" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
- <builder id="cdt.managedbuild.target.gnu.builder.exe.debug.365194582" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="3" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+ <builder id="cdt.managedbuild.target.gnu.builder.exe.debug.140776059" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="3" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1483022190" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1774612933" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1607083553" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1025040037" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.other.other.698641465" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="" valueType="string"/>
<option id="gnu.cpp.compiler.option.include.paths.1326985679" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/local/include/librsvg-2.0"/>
+ <listOptionValue builtIn="false" value="/home/elchaschab/devel/ctrl-cut/src/ctrl-cut"/>
<listOptionValue builtIn="false" value="/usr/local/include/boost"/>
<listOptionValue builtIn="false" value="/usr/local/include/cairo"/>
<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
@@ -142,20 +143,20 @@
<storageModule moduleId="refreshScope" versionNumber="1">
<resource resourceType="PROJECT" workspacePath="/ctrl-cut"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.195001357;cdt.managedbuild.config.gnu.exe.release.195001357.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.352148566;cdt.managedbuild.tool.gnu.c.compiler.input.440922794">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.377733518;cdt.managedbuild.config.gnu.exe.debug.377733518.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1774612933;cdt.managedbuild.tool.gnu.cpp.compiler.input.2094513617">
- <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.195001357;cdt.managedbuild.config.gnu.exe.release.195001357.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.809082097;cdt.managedbuild.tool.gnu.cpp.compiler.input.1293743113">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.377733518;cdt.managedbuild.config.gnu.exe.debug.377733518.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.965524635;cdt.managedbuild.tool.gnu.c.compiler.input.32882746">
- <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
</scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>
View
10 common.pri
@@ -22,6 +22,15 @@ macx {
}
}
+CONFIG(debug, debug|release) {
+QMAKE_CXXFLAGS_DEBUG = -g3 -O0
+message("DEBUG!")
+} else {
+DEFINES += QT_NO_DEBUG
+DEFINES += QT_NO_DEBUG_OUTPUT
+message("RELEASE!")
+}
+
CONFIG += link_pkgconfig
QMAKE_CXXFLAGS += -std=c++98 -Wno-long-long
linux:QMAKE_CXXFLAGS += -pedantic-errors
@@ -38,3 +47,4 @@ include(gio.pri)
include(libxml++.pri)
include(Magick++.pri)
include(libctrl-cut.pri)
+
View
2 doc/PPD-options.txt
@@ -12,5 +12,5 @@ VectorFrequency=[0-5000]
VectorOptimize=Simple/Inner-Outer/Flat
FlipX / noFlipX
Debug / noDebug
-EnableRaster / noEnableRaster
+EnableEngraving / noEnableEngraving
EnableVector / noEnableVector
View
14 etc/ppd/Epilog/CaptureLegend36EXT.ppd
@@ -125,13 +125,13 @@ restore
*OpenGroup: General
-*%******** EnableRaster ********
-*OpenUI *EnableRaster/EnableRaster: Boolean
-*DefaultEnableRaster: False
-*OrderDependency: 140 AnySetup *EnableRaster
-*EnableRaster True: " "
-*EnableRaster False: " "
-*CloseUI: *EnableRaster
+*%******** EnableEngraving ********
+*OpenUI *EnableEngraving/EnableEngraving: Boolean
+*DefaultEnableEngraving: False
+*OrderDependency: 140 AnySetup *EnableEngraving
+*EnableEngraving True: " "
+*EnableEngraving False: " "
+*CloseUI: *EnableEngraving
*%******** EnableVector ********
*OpenUI *EnableVector/EnableVector: Boolean
View
14 etc/ppd/Epilog/CaptureZing16.ppd
@@ -125,13 +125,13 @@ restore
*OpenGroup: General
-*%******** EnableRaster ********
-*OpenUI *EnableRaster/EnableRaster: Boolean
-*DefaultEnableRaster: False
-*OrderDependency: 140 AnySetup *EnableRaster
-*EnableRaster True: " "
-*EnableRaster False: " "
-*CloseUI: *EnableRaster
+*%******** EnableEngraving ********
+*OpenUI *EnableEngraving/EnableEngraving: Boolean
+*DefaultEnableEngraving: False
+*OrderDependency: 140 AnySetup *EnableEngraving
+*EnableEngraving True: " "
+*EnableEngraving False: " "
+*CloseUI: *EnableEngraving
*%******** EnableVector ********
*OpenUI *EnableVector/EnableVector: Boolean
View
14 etc/ppd/Epilog/CaptureZing24.ppd
@@ -125,13 +125,13 @@ restore
*OpenGroup: General
-*%******** EnableRaster ********
-*OpenUI *EnableRaster/EnableRaster: Boolean
-*DefaultEnableRaster: False
-*OrderDependency: 140 AnySetup *EnableRaster
-*EnableRaster True: " "
-*EnableRaster False: " "
-*CloseUI: *EnableRaster
+*%******** EnableEngraving ********
+*OpenUI *EnableEngraving/EnableEngraving: Boolean
+*DefaultEnableEngraving: False
+*OrderDependency: 140 AnySetup *EnableEngraving
+*EnableEngraving True: " "
+*EnableEngraving False: " "
+*CloseUI: *EnableEngraving
*%******** EnableVector ********
*OpenUI *EnableVector/EnableVector: Boolean
View
14 etc/ppd/Epilog/Legend36EXT.ppd
@@ -125,13 +125,13 @@ restore
*OpenGroup: General
-*%******** EnableRaster ********
-*OpenUI *EnableRaster/EnableRaster: Boolean
-*DefaultEnableRaster: False
-*OrderDependency: 140 AnySetup *EnableRaster
-*EnableRaster True: " "
-*EnableRaster False: " "
-*CloseUI: *EnableRaster
+*%******** EnableEngraving ********
+*OpenUI *EnableEngraving/EnableEngraving: Boolean
+*DefaultEnableEngraving: False
+*OrderDependency: 140 AnySetup *EnableEngraving
+*EnableEngraving True: " "
+*EnableEngraving False: " "
+*CloseUI: *EnableEngraving
*%******** EnableVector ********
*OpenUI *EnableVector/EnableVector: Boolean
View
14 etc/ppd/Epilog/Zing16.ppd
@@ -125,13 +125,13 @@ restore
*OpenGroup: General
-*%******** EnableRaster ********
-*OpenUI *EnableRaster/EnableRaster: Boolean
-*DefaultEnableRaster: False
-*OrderDependency: 140 AnySetup *EnableRaster
-*EnableRaster True: " "
-*EnableRaster False: " "
-*CloseUI: *EnableRaster
+*%******** EnableEngraving ********
+*OpenUI *EnableEngraving/EnableEngraving: Boolean
+*DefaultEnableEngraving: False
+*OrderDependency: 140 AnySetup *EnableEngraving
+*EnableEngraving True: " "
+*EnableEngraving False: " "
+*CloseUI: *EnableEngraving
*%******** EnableVector ********
*OpenUI *EnableVector/EnableVector: Boolean
View
14 etc/ppd/Epilog/Zing24.ppd
@@ -125,13 +125,13 @@ restore
*OpenGroup: General
-*%******** EnableRaster ********
-*OpenUI *EnableRaster/EnableRaster: Boolean
-*DefaultEnableRaster: False
-*OrderDependency: 140 AnySetup *EnableRaster
-*EnableRaster True: " "
-*EnableRaster False: " "
-*CloseUI: *EnableRaster
+*%******** EnableEngraving ********
+*OpenUI *EnableEngraving/EnableEngraving: Boolean
+*DefaultEnableEngraving: False
+*OrderDependency: 140 AnySetup *EnableEngraving
+*EnableEngraving True: " "
+*EnableEngraving False: " "
+*CloseUI: *EnableEngraving
*%******** EnableVector ********
*OpenUI *EnableVector/EnableVector: Boolean
View
8 src/ctrl-cut/Document.cpp
@@ -58,8 +58,8 @@ void Document::write(std::ostream &out) {
int resolution = this->get(D_SET::RESOLUTION);
int raster_power = 0;
int raster_speed = 0;
- bool enable_raster = this->get(D_SET::ENABLE_RASTER);
- bool enable_vector = this->get(D_SET::ENABLE_VECTOR);
+ bool enable_raster = this->get(D_SET::ENABLE_ENGRAVING);
+ bool enable_vector = this->get(D_SET::ENABLE_CUT);
enable_raster= false;
if(enable_raster && !this->engraveList.empty()) {
raster_power = this->front_engrave()->settings.get(E_SET::EPOWER);
@@ -220,8 +220,8 @@ bool Document::load(const string& filename, LoadType load, Format docFormat) {
if (docFormat == SVG) {
int convertPipe[2];
- if(!bfs::exists(filename))
- CtrlCutException::fileNotFoundException(filename);
+ /* if(!bfs::exists(filename))
+ CtrlCutException::fileNotFoundException(filename);*/
FILE *svgIn = fopen(filename.c_str(), "r");
int svgFd = fileno (svgIn);
View
8 src/ctrl-cut/config/DocumentSettings.cpp
@@ -37,8 +37,8 @@ const DocumentSettings::Key<Measurement> DocumentSettings::HEIGHT = "height";
const DocumentSettings::Key<bool> DocumentSettings::AUTO_FOCUS = "autoFocus";
const DocumentSettings::Key<uint16_t> DocumentSettings::SCREEN = "screen";
-const DocumentSettings::Key<bool> DocumentSettings::ENABLE_RASTER = "enableRaster";
-const DocumentSettings::Key<bool> DocumentSettings::ENABLE_VECTOR = "enableVector";
+const DocumentSettings::Key<bool> DocumentSettings::ENABLE_ENGRAVING = "enableRaster";
+const DocumentSettings::Key<bool> DocumentSettings::ENABLE_CUT = "enableVector";
const DocumentSettings::Key<bool> DocumentSettings::LOAD_CUT = "loadCut";
const DocumentSettings::Key<bool> DocumentSettings::LOAD_ENGRAVING = "loadEngraving";
@@ -50,8 +50,8 @@ DocumentSettings::DocumentSettings() : Settings() {
this->put(AUTO_FOCUS, true);
this->put(RESOLUTION, 75);
this->put(SCREEN, 8);
- this->put(ENABLE_VECTOR, true);
- this->put(ENABLE_RASTER, false);
+ this->put(ENABLE_CUT, true);
+ this->put(ENABLE_ENGRAVING, false);
this->put(LOAD_CUT, true);
this->put(LOAD_ENGRAVING, false);
View
4 src/ctrl-cut/config/DocumentSettings.hpp
@@ -40,8 +40,8 @@ class DocumentSettings : public Settings
const static Key<bool> AUTO_FOCUS;
const static Key<uint16_t> SCREEN;
- const static Key<bool> ENABLE_RASTER;
- const static Key<bool> ENABLE_VECTOR;
+ const static Key<bool> ENABLE_ENGRAVING;
+ const static Key<bool> ENABLE_CUT;
const static Key<bool> LOAD_CUT;
const static Key<bool> LOAD_ENGRAVING;
const static Key<bool> DUMP_XML;
View
2 src/cups-filter/CupsFilter.cpp
@@ -29,6 +29,8 @@
#include "cut/graph/Traveller.hpp"
#include "cut/graph/Traverse.hpp"
#include "cut/graph/Planar.hpp"
+#include <boost/lexical_cast.hpp>
+
/**
* Cups filter entry point.
*
View
8 src/cups-filter/CupsOptions.cpp
@@ -16,7 +16,7 @@ const string CupsOptions::OPTION_STRINGS[]= {
"VectorReduce",
"VectorOptimze",
"Debug",
- "EnableRaster",
+ "EnableEngraving",
"EnableVector"
};
@@ -126,11 +126,11 @@ CupsOptions CupsOptions::parseSettings(DocumentSettings& ds, cups_option_t *opti
if (v != "false")
Logger::init(CC_DEBUG);
}
- if (cupsOpts.get(CupsOptions::ENABLE_RASTER, v)) {
- ds.put(DS::ENABLE_RASTER, v != "false");
+ if (cupsOpts.get(CupsOptions::ENABLE_ENGRAVING, v)) {
+ ds.put(DS::ENABLE_ENGRAVING, v != "false");
}
if (cupsOpts.get(CupsOptions::ENABLE_VECTOR, v)) {
- ds.put(DS::ENABLE_VECTOR, v != "false");
+ ds.put(DS::ENABLE_CUT, v != "false");
}
if (ds.get(DS::DRIVER) == LaserCutter::UNINITIALIZED) {
View
2 src/cups-filter/CupsOptions.hpp
@@ -37,7 +37,7 @@ class CupsOptions {
VECTOR_REDUCE,
VECTOR_OPTIMIZE,
ENABLE_DEBUG,
- ENABLE_RASTER,
+ ENABLE_ENGRAVING,
ENABLE_VECTOR
};
View
8 src/gui/LaserDialog.cpp
@@ -51,8 +51,8 @@ void LaserDialog::updateLaserConfig(Document& document)
QStringList res = this->resolutionCombo->currentText().split(" ");
if (res.length() > 0) document.put(DS::RESOLUTION, res[0].toInt());
- document.put(DS::ENABLE_RASTER, !this->vectorRadio->isChecked());
- document.put(DS::ENABLE_VECTOR, !this->rasterRadio->isChecked());
+ document.put(DS::ENABLE_ENGRAVING, !this->vectorRadio->isChecked());
+ document.put(DS::ENABLE_CUT, !this->rasterRadio->isChecked());
document.put(ES::ESPEED, this->rasterSpeedSlider->value());
document.put(ES::EPOWER, this->rasterPowerSlider->value());
document.put(ES::DIRECTION, this->rasterDirection->currentIndex());
@@ -88,8 +88,8 @@ void LaserDialog::applyLaserConfig(Document& document)
this->autoFocusBox->setChecked(document.get(DS::AUTO_FOCUS));
this->resolutionCombo->setCurrentIndex(this->resolutionCombo->findText(QString::number(document.get(DS::RESOLUTION)) + " DPI"));
- if (document.get(DS::ENABLE_RASTER) && document.get(DS::ENABLE_VECTOR)) this->combinedRadio->setChecked(true);
- else if (document.get(DS::ENABLE_RASTER)) this->rasterRadio->setChecked(true);
+ if (document.get(DS::ENABLE_ENGRAVING) && document.get(DS::ENABLE_CUT)) this->combinedRadio->setChecked(true);
+ else if (document.get(DS::ENABLE_ENGRAVING)) this->rasterRadio->setChecked(true);
else this->vectorRadio->setChecked(true);
this->rasterSpeedSlider->setValue(document.get(ES::ESPEED));
View
6 src/gui/MainWindow.cpp
@@ -59,16 +59,14 @@ MainWindow::MainWindow() : laserdialog(NULL), simdialog(NULL) {
MainWindow::~MainWindow()
{}
-void MainWindow::createUndoView()
-{
+void MainWindow::createUndoView(){
undoView = new QUndoView(undoStack);
undoView->setWindowTitle(tr("Command List"));
undoView->show();
undoView->setAttribute(Qt::WA_QuitOnClose, false);
}
-void MainWindow::createActions()
-{
+void MainWindow::createActions() {
undoAction = undoStack->createUndoAction(this, tr("&Undo"));
undoAction->setShortcuts(QKeySequence::Undo);
View
8 src/gui/Simplify.cpp
@@ -50,8 +50,8 @@ void LaserDialog::updateLaserConfig(Document& document)
QStringList res = this->resolutionCombo->currentText().split(" ");
if (res.length() > 0) document.put(DS::RESOLUTION, res[0].toInt());
- document.put(DS::ENABLE_RASTER, !this->vectorRadio->isChecked());
- document.put(DS::ENABLE_VECTOR, !this->rasterRadio->isChecked());
+ document.put(DS::ENABLE_ENGRAVING, !this->vectorRadio->isChecked());
+ document.put(DS::ENABLE_CUT, !this->rasterRadio->isChecked());
document.put(ES::ESPEED, this->rasterSpeedSlider->value());
document.put(ES::EPOWER, this->rasterPowerSlider->value());
document.put(ES::DIRECTION, this->rasterDirection->currentIndex());
@@ -87,8 +87,8 @@ void LaserDialog::applyLaserConfig(Document& document)
this->autoFocusBox->setChecked(document.get(DS::AUTO_FOCUS));
this->resolutionCombo->setCurrentIndex(this->resolutionCombo->findText(QString::number(document.get(DS::RESOLUTION)) + " DPI"));
- if (document.get(DS::ENABLE_RASTER) && document.get(DS::ENABLE_VECTOR)) this->combinedRadio->setChecked(true);
- else if (document.get(DS::ENABLE_RASTER)) this->rasterRadio->setChecked(true);
+ if (document.get(DS::ENABLE_ENGRAVING) && document.get(DS::ENABLE_CUT)) this->combinedRadio->setChecked(true);
+ else if (document.get(DS::ENABLE_ENGRAVING)) this->rasterRadio->setChecked(true);
else this->vectorRadio->setChecked(true);
this->rasterSpeedSlider->setValue(document.get(ES::ESPEED));
View
3 src/gui/gui.pro
@@ -61,8 +61,7 @@ HEADERS += ./MainWindow.h \
./settings/CutSettingsTableModel.h \
./settings/EngraveSettingsTableModel.h \
./settings/DocumentSettingsTableModel.h \
- ./settings/SettingsTableModel.h \
- ../ctrl-cut/CtrlCutException.h
+ ./settings/SettingsTableModel.h
SOURCES += ./gui.cpp \
./event/CtrlCutEvent.cpp \
./Commands.cpp \
View
4 src/gui/settings/DocumentSettingsTableModel.h
@@ -16,8 +16,8 @@ class DocumentSettingsTableModel : public SettingsTableModel
addKey(D_SET::HEIGHT);
addKey(D_SET::RESOLUTION);
addKey(D_SET::AUTO_FOCUS);
- addKey(D_SET::ENABLE_RASTER);
- addKey(D_SET::ENABLE_VECTOR);
+ addKey(D_SET::ENABLE_ENGRAVING);
+ addKey(D_SET::ENABLE_CUT);
}
};
View
3 src/pclint/pclint.pro
@@ -2,8 +2,8 @@ TARGET = pclint
CONFIG -= qt
CONFIG += boost_thread
CONFIG += X11
+CONFIG += libpng14
#CONFIG += ImageMagick
-CONFIG += libpng
!macx:CONFIG += SDL
include(common.pri)
@@ -16,4 +16,5 @@ LIBS+= -lpthread
OBJECTS_DIR = objects
SOURCES += \
pclint.cpp \
+SDLCanvas.cpp \
Canvas.cpp
View
BIN test-data/Gimp/checker-4x4x16/checker-4x4x16.ps
Binary file not shown.
View
2 test-data/Gimp/common.options
@@ -1 +1 @@
-EnableRaster Driver=EpilogLegend BedSize=36x24 Resolution=600
+EnableEngraving Driver=EpilogLegend BedSize=36x24 Resolution=600
View
2 test-data/corel-b/common.options
@@ -1 +1 @@
-EnableRaster Driver=EpilogLegend BedSize=36x24 Resolution=600
+EnableEngraving Driver=EpilogLegend BedSize=36x24 Resolution=600
View
BIN test-data/corel-b/dotframe/dotframe.ps
Binary file not shown.
View
2 test-data/corel-b/line_width_threshold/600/.options
@@ -1 +1 @@
-RasterDithering=FloydSteinberg Resolution=600 EnableVector EnableRaster
+RasterDithering=FloydSteinberg Resolution=600 EnableVector EnableEngraving
View
BIN test-data/corel-b/line_width_threshold/600/600.ps
Binary file not shown.
View
2 test-data/corel-b/line_width_threshold/75/.options
@@ -1 +1 @@
-RasterDithering=FloydSteinberg Resolution=75 EnableRaster EnableVector
+RasterDithering=FloydSteinberg Resolution=75 EnableEngraving EnableVector
View
BIN test-data/corel-b/line_width_threshold/line_width_threshold.ps
Binary file not shown.
View
BIN test-data/corel-b/metalab/metalab.ps
Binary file not shown.
View
BIN test-data/corel-r/RGB-raster/RGB-raster.ps
Binary file not shown.
View
BIN test-data/corel-r/colordots/colordots.ps
Binary file not shown.
View
2 test-data/corel-r/common.options
@@ -1 +1 @@
-EnableRaster Driver=EpilogLegend BedSize=36x24 Resolution=600
+EnableEngraving Driver=EpilogLegend BedSize=36x24 Resolution=600
View
BIN test-data/corel-r/gradient/gradient.ps
Binary file not shown.
View
BIN test-data/corel-r/palette/palette.ps
Binary file not shown.
View
BIN test-data/corel-r/pattern/pattern.ps
Binary file not shown.
View
BIN test-data/corel-v/apollonian_branch/apollonian_branch.ps
Binary file not shown.
View
BIN test-data/corel-v/clip_circle/clip_circle.ps
Binary file not shown.
View
BIN test-data/corel-v/cross/cross.ps
Binary file not shown.
View
BIN test-data/corel-v/duplicate-polygon/duplicate-polygon.ps
Binary file not shown.
View
BIN test-data/corel-v/quad/default/default.ps
Binary file not shown.
View
BIN test-data/corel-v/quad/quad.ps
Binary file not shown.
View
BIN test-data/corel-v/test_clip-max/test_clip-max.ps
Binary file not shown.
View
BIN test-data/corel-v/zebras/zebras.ps
Binary file not shown.
View
BIN test-data/inkscape/concentric-polygons/concentric-polygons.ps
Binary file not shown.
View
BIN test-data/inkscape/deonion-bug/deonion-bug.ps
Binary file not shown.
View
2 test-data/inkscape/jpeg/default/.options
@@ -1 +1 @@
-Resolution=75 EnableRaster
+Resolution=75 EnableEngraving
View
BIN test-data/inkscape/jpeg/jpeg.ps
Binary file not shown.
View
2 test-data/inkscape/sleepy/default/.options
@@ -1 +1 @@
-EnableRaster=true
+EnableEngraving=true
View
BIN test-data/inkscape/sleepy/sleepy.ps
Binary file not shown.
View
BIN test-data/inkscape/spiral/spiral.ps
Binary file not shown.

0 comments on commit 8ef8e7e

Please sign in to comment.