cwSvg.h/cpp : Minor updates to SVG test.
This commit is contained in:
parent
375ed8bed4
commit
4ef6d649f5
29
cwSvg.cpp
29
cwSvg.cpp
@ -5,10 +5,11 @@
|
|||||||
#include "cwCommonImpl.h"
|
#include "cwCommonImpl.h"
|
||||||
#include "cwMem.h"
|
#include "cwMem.h"
|
||||||
#include "cwFile.h"
|
#include "cwFile.h"
|
||||||
#include "cwSvg.h"
|
|
||||||
#include "cwText.h"
|
#include "cwText.h"
|
||||||
#include "cwTest.h"
|
#include "cwTest.h"
|
||||||
|
#include "cwObject.h"
|
||||||
#include "cwNumericConvert.h"
|
#include "cwNumericConvert.h"
|
||||||
|
#include "cwSvg.h"
|
||||||
|
|
||||||
namespace cw
|
namespace cw
|
||||||
{
|
{
|
||||||
@ -868,14 +869,29 @@ cw::rc_t cw::svg::write( handle_t h, const char* outFn, const char* cssFn, unsig
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
cw::rc_t cw::svg::test( const char* outFn, const char* cssFn )
|
cw::rc_t cw::svg::test( const cw::object_t* cfg )
|
||||||
{
|
{
|
||||||
rc_t rc = kOkRC;
|
rc_t rc = kOkRC;
|
||||||
handle_t h;
|
handle_t h;
|
||||||
|
|
||||||
if((rc = create(h)) != kOkRC )
|
const char* outFn = nullptr;
|
||||||
cwLogError(rc,"SVG Test failed on create.");
|
const char* cssFn = nullptr;
|
||||||
|
|
||||||
|
if((rc = cfg->getv("outHtmlFn",outFn,
|
||||||
|
"outCssFn",cssFn)) != kOkRC )
|
||||||
|
{
|
||||||
|
rc = cwLogError(rc,"SVG test parameter parsing failed.");
|
||||||
|
goto errLabel;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if((rc = create(h)) != kOkRC )
|
||||||
|
{
|
||||||
|
cwLogError(rc,"SVG Test failed on create.");
|
||||||
|
goto errLabel;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
double yV[] = { 0, 10, 30, 60, 90 };
|
double yV[] = { 0, 10, 30, 60, 90 };
|
||||||
double xV[] = { 0, 40, 60, 40, 10 };
|
double xV[] = { 0, 40, 60, 40, 10 };
|
||||||
@ -900,9 +916,12 @@ cw::rc_t cw::svg::test( const char* outFn, const char* cssFn )
|
|||||||
|
|
||||||
|
|
||||||
write(h,outFn, cssFn, kStandAloneFl, 10,10,10,10);
|
write(h,outFn, cssFn, kStandAloneFl, 10,10,10,10);
|
||||||
|
}
|
||||||
|
|
||||||
|
errLabel:
|
||||||
|
|
||||||
if((rc = destroy(h)) != kOkRC )
|
if((rc = destroy(h)) != kOkRC )
|
||||||
cwLogError(rc,"SVG destroy failed.");
|
rc = cwLogError(rc,"SVG destroy failed.");
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
|
2
cwSvg.h
2
cwSvg.h
@ -102,7 +102,7 @@ namespace cw
|
|||||||
enum { kStandAloneFl=0x01, kPanZoomFl=0x02, kGenCssFileFl=0x04 };
|
enum { kStandAloneFl=0x01, kPanZoomFl=0x02, kGenCssFileFl=0x04 };
|
||||||
rc_t write( handle_t h, const char* outFn, const char* cssFn, unsigned flags, double bordL=5, double bordT=5, double bordR=5, double bordB=5 );
|
rc_t write( handle_t h, const char* outFn, const char* cssFn, unsigned flags, double bordL=5, double bordT=5, double bordR=5, double bordB=5 );
|
||||||
|
|
||||||
rc_t test( const char* outFn, const char* cssFn );
|
rc_t test( const object_t* cfg );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user