From 114cb26370416edfad966c78d65a35e90d183de4 Mon Sep 17 00:00:00 2001 From: yoshinrt <32790691+yoshinrt@users.noreply.github.com> Date: Thu, 8 Oct 2015 13:03:12 +0000 Subject: [PATCH] =?UTF-8?q?GetFrameMax()=20=E3=81=8C=20func=5FWndProc()=20?= =?UTF-8?q?=E5=86=85=E3=81=A7=E5=91=BC=E3=81=B0=E3=82=8C=E3=82=8B=E3=81=A8?= =?UTF-8?q?=20fpip=20=E3=81=8C=E4=B8=8D=E6=AD=A3=E3=81=AA=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20=E5=90=8C=E6=9C=9F=E3=82=B9?= =?UTF-8?q?=E3=82=AD=E3=83=B3=E3=81=AB=E3=83=98=E3=83=AB=E3=83=97=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=20Vsd.PrivateBuild=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///home/yoshi/.svnrepos/vsd/trunk@941 177d47f1-6453-0410-9475-f12f96c2b1a2 --- vsd_filter/CVsdFilter.cpp | 9 +++- vsd_filter/CVsdFilter.h | 15 +++--- vsd_filter/CVsdFilterAvu.cpp | 20 +++++++- vsd_filter/vsd_filter.suo | Bin 35840 -> 30208 bytes ...37\343\203\242\343\203\274\343\203\211.js" | 43 ++++++++++++++---- 5 files changed, 67 insertions(+), 20 deletions(-) diff --git a/vsd_filter/CVsdFilter.cpp b/vsd_filter/CVsdFilter.cpp index 3fa33c87..99737cf7 100644 --- a/vsd_filter/CVsdFilter.cpp +++ b/vsd_filter/CVsdFilter.cpp @@ -20,7 +20,14 @@ /*** static member **********************************************************/ HINSTANCE CVsdFilter::m_hInst = NULL; -const int CVsdFilter::m_iRevision = PROG_REVISION; +const int CVsdFilter::m_iRevision = PROG_REVISION; + +const int CVsdFilter::m_iPrivateBuild = +#ifdef PUBLIC_MODE + 0; +#else + 1; +#endif CVsdFilter *g_Vsd; diff --git a/vsd_filter/CVsdFilter.h b/vsd_filter/CVsdFilter.h index e004b123..daf17539 100644 --- a/vsd_filter/CVsdFilter.h +++ b/vsd_filter/CVsdFilter.h @@ -37,7 +37,7 @@ #define VsdEd m_piParamS[ PARAM_LEd ] #define GPSSt m_piParamS[ PARAM_GSt ] #define GPSEd m_piParamS[ PARAM_GEd ] - #define DEFAULT_SKIN "standard_l.js" + #define DEFAULT_SKIN "同期モード.js" #else #define VideoSt m_piParamT[ PARAM_VSt ] #define VideoEd m_piParamT[ PARAM_VEd ] @@ -431,6 +431,7 @@ class CVsdFilter // リビジョン番号 static const int m_iRevision; // !js_const:Revision + static const int m_iPrivateBuild; // !js_const:PrivateBuild // ログリードヘルパ int ReadLog( CVsdLog *&pLog, const char *szFileName, const char *szReaderFunc ); @@ -634,12 +635,12 @@ class CVsdFilter std::vector m_vecReaderFunc; // 仮想関数 - int GetWidth( void ) { return fpip ? fpip->w : 0; } - int GetHeight( void ) { return fpip ? fpip->h : 0; } - int GetFrameMax( void ){ return fpip ? fpip->frame_n : 0; } - int GetFrameCnt( void ){ return fpip ? fpip->frame : 0; } - double GetFPS( void ) { return ( double )fileinfo->video_rate / fileinfo->video_scale; } - int IsSaving( void ) { return filter->exfunc->is_saving( editp ); } + int GetWidth( void ) { return fpip->w; } + int GetHeight( void ) { return fpip->h; } + int GetFrameMax( void ) { return filter->exfunc->get_frame_n( editp ); } + int GetFrameCnt( void ) { return fpip->frame; } + double GetFPS( void ) { return ( double )fileinfo->video_rate / fileinfo->video_scale; } + int IsSaving( void ) { return filter->exfunc->is_saving( editp ); } // 同期情報表示 WCHAR *DrawSyncInfoFormatTime( diff --git a/vsd_filter/CVsdFilterAvu.cpp b/vsd_filter/CVsdFilterAvu.cpp index a57e1280..cbdc8ded 100644 --- a/vsd_filter/CVsdFilterAvu.cpp +++ b/vsd_filter/CVsdFilterAvu.cpp @@ -626,9 +626,14 @@ BOOL CVsdFilter::ReadGPSLog( HWND hwnd ){ BOOL func_proc( FILTER *fp, FILTER_PROC_INFO *fpip ){ if( !g_Vsd ) return 0; // クラスに変換 - g_Vsd->fpip = fpip; + g_Vsd->fpip = fpip; - return g_Vsd->DrawVSD(); + BOOL bRet = g_Vsd->DrawVSD(); + #ifdef DEBUG + g_Vsd->fpip = NULL; + #endif + + return bRet; } /*** *.js ファイルリスト取得 ************************************************/ @@ -767,6 +772,17 @@ void ExtendDialog( HWND hwnd, HINSTANCE hInst ){ ScreenToClient( hwnd, &rect.points.topleft ); ScreenToClient( hwnd, &rect.points.bottomright ); + /* + if( rect.rect.right >= POS_TH_EDIT ){ + // エディットボックスのスタイル変更 + //SendMessage( hwnd, EM_SETREADONLY, FALSE, 0 ); + SetWindowLong( + hwndChild, GWL_EXSTYLE, + GetWindowLong( hwndChild, GWL_EXSTYLE ) | WS_EX_RIGHT | WS_EX_CLIENTEDGE + ); + } + */ + // ダイアログ左側を延ばす，EDIT ボックスのサイズを伸ばす #define ResizeControl( name ) { \ if( rect.rect.right >= POS_TH_ ## name ) rect.rect.right += POS_ADD_ ## name; \ diff --git a/vsd_filter/vsd_filter.suo b/vsd_filter/vsd_filter.suo index f408525a27c6057ed7d3dfdc1fce4e13d12ded39..3414b77ffae6667d288905081420f9a702596085 100644 GIT binary patch delta 1286 zcmah}T})eL82-M~)AkgoYnwwuHhxOeslZxJe+h_N`I$3pX6>xFKpYgxHe~!PbO-}R zW4O_H!FXb}xEY7@Vi%eWkBKvqNHR8ATy)cg%?o2>lMAECNQiM}g6}CmqBnl&lfK{k z^SsadednCiSt0c+zkEkH9kYl5#@J*uhmVW?- z_NcSwAubu#oS0Y@axu9@uh%p(49J6qYZN}N!=Li9aY`baMvU6?)LeVQh~HnTRHyPJ zF6qdvwO{AJQvN7!Q3ne43RyC{r(9L0mB)&MAr%jg7uuj4m0)q&5q2g}BwBFO>A-oX zw8~FB>I0`N@DJ2St~woRqFy!m^nPyQBx)t^Uu}vam?_$av0^`JT)QBYRN<=VMY1F! zSt-%EDOp`AY2aA!ZpE~_k{`hFgH;%F+abC`s?XEM$?(A9l@L&>ajVg#*Hdu>lRKWp zaJx-Cs{}chaABv6d2d|L3)9rAmyM(^g4(E}F8N;ImgVj7k-EvT?-Fx!)n%!zFC!Z0 zxBhaou&?95smx&i+x|~RZYYJsjmL{yBo7PsJ&X@?l8Moh9Qd!VE#XiR<(~ zw`Rjp7O-f}yX3e>_vk&Mi$z7w9-o}Qth!CHDMoS4tc$NW?I=&qJ=C}yB1R;{RiP6unV3ss#7 zTo^H7dvCFxGtSw?a055d7_{2M8fO_&jbZ%s8qIXf09$9NPGGg0>(JF?w;$8qgY^32 zi{Ul9c0&@r9o%jIYa@lRCrC2=Xd&Jk)l_TDxN_3GnfZS^ogzx@1M;6v*R*$jZGF9A z!+JCb!v4>JrCWFPnef?YLt0AXu)@!*A14+EcC3pk@f@X7O(<>Nc(66( zZt(}p-GR1%*InKcQrv!jC|K_Ewff>d-|#tjkGzUYulT6;4EFc7BI~fCO5K-qv~j$j G6#fPjZHG_* delta 2656 zcmcImeN0nV6o0Qg+JY^#+SZOyDaf3HEw8kc77-|Y)J?_&CE)x3k(LjE0&VA1Fd=4t zII~3AN$?9Ds7toQY`V9^ZO+*ZH(hj@%cd?%#?-&mxeX2ba51=ZUtbFtvp=?Zo8P|4oVJ4I3X2nV77VM8oJ6e1QQiV($!5`+s;if|)1#6*A9 zudgxB(dm%Rq{+g?Pp7_e_aYx;s%ZHfG^-IX%o%}YnhYjL&(Qeum$iRxW|j z^!32D7{Hy;pt=^CIOINYQT=ubHS|UDgAq)i9^T6^^0zY-68ZvvFLP-e*(V>Gzl;WV zRt2cCY>YvO98FTzvIP1`)JUhzN3;xTR8zH~>`Eq1P(%jv}e zObjq4JD+RbNTad_U(BGg$YC_66h;@SU~B74eh-^R(=r$;(!g~~16d!0ax3L&7&&9g zbo_X31+7v(Kag-(ajL)Q)=YiX-hn$%W!t2#N*Ub#@#RZL7xoW)^+8(8SOx|&f|-%N zn`fixk08%}f|tz&0GF1)gnK{r|n2EVi!YQX4GMopA4{t8GLaSdj{E<15c;UCiw|=j@ zdCVtUKz7P!75XIVd0RN;`$v9p?Mt|t>_|F$y_UyyYe<1lYn$L}qZLw&dN3F0;O_Dp zaKC|rzLpH=s}6&!aJiZH0TALU14DXBzZG}Nz6p`GxFp%``;a^>wIUtrCO#sFVX zf;TDNXd|2^P4I4mBEM9a&Kl9;QxPUN5m`A0LxDjdfInu{g!@pQN34T5 zT^irFZrcnQ*?^YX57&ZeaC&V8s5@93n*cY1v+=zbk~((_OTQX4;(Hk+HJN!w*PC(B z*xd$;{mJlQ-BS=Tx}_^ZURTp5viLbWXs&?8Uym!-QXm#`YJzzBL;iB(P_HG_cj< z;Ua4U?|Y)Z#FkV zRsDR=;Qtn19gW}E;jQoN3PmQM2gF=2i6<4~gXFq}APKZVd83si_2DXraYIY2%@CysbKv#7c=)C}M_4rZzC_yC>1-6pO+U$pQqe|XW>$)Fj8I8JH4~P$ z#oRREEm5~aNE^bt1UMcP=F)AS;X2KQ0Tt*||Vyt7L l_q1-31XJ$m|8NuQ9(fa!yLJPTyAIgqv+!fH9%|&}e*=F_;c)-} diff --git "a/vsd_filter/vsd_plugins/\345\220\214\346\234\237\343\203\242\343\203\274\343\203\211.js" "b/vsd_filter/vsd_plugins/\345\220\214\346\234\237\343\203\242\343\203\274\343\203\211.js" index 1744897d..626ae03a 100644 --- "a/vsd_filter/vsd_plugins/\345\220\214\346\234\237\343\203\242\343\203\274\343\203\211.js" +++ "b/vsd_filter/vsd_plugins/\345\220\214\346\234\237\343\203\242\343\203\274\343\203\211.js" @@ -4,7 +4,7 @@ function Initialize(){ // 菴ｿ逕ｨ縺吶ｋ逕ｻ蜒上ｻ繝輔か繝ｳ繝医ｮ螳｣險 Scale = Vsd.Height / 720; - font = new Font( "ｼｭｼｳ縲繧ｴ繧ｷ繝繧ｯ", 28 * Scale, FONT_OUTLINE | FONT_NOANTIALIAS ); + font = new Font( "ｼｭｼｳ縲繧ｴ繧ｷ繝繧ｯ", 20 * Scale, FONT_OUTLINE | FONT_NOANTIALIAS ); } //*** 繝｡繝ｼ繧ｿ繝ｼ謠冗判蜃ｦ逅 ****************************************************** @@ -39,22 +39,17 @@ function Draw(){ if( MapX >= 10000 || MapY >= 10000 ){ print( "襍ｰ陦瑚ｻ瑚ｷ｡螟ｧ縺阪＆: " + ~~( MapX / 1000 ) + "kmﾃ" + ~~( MapY / 1000 ) + "km", - { x: 0, y: 0, color: 0xFF8000, align: ALIGN_LEFT | ALIGN_TOP } ); + { x: Vsd.Width - 1, y: Vsd.Height - 1, color: 0xFF8000, align: ALIGN_RIGHT | ALIGN_BOTTOM } ); } Vsd.DrawMap( - 4, 4, Vsd.Width / 1.5, Vsd.Height / 1.5, + 4, 4, Vsd.Width - 4, Vsd.Height - 4, ALIGN_TOP | ALIGN_LEFT | DRAW_MAP_START, - 3 * Scale, 6 * Scale, 0xFF0000, 0xFFFF00, 0x00FF00, 0xFF0000 + 1, 6 * Scale, 0x00FF00, 0x40FF8000, 0x40FF8000, 0x40FF8000 ); // 繝ｩ繝繝励ち繧､繝 - if( !Vsd.Config_lap_time ){ - print( "繝ｩ繝繝励ち繧､繝髱櫁｡ｨ遉ｺ", { x: Vsd.Width - 1, y: 0, align: ALIGN_RIGHT | ALIGN_TOP } ); - }else if( Vsd.MaxLapCnt == 0 ){ - print( "繧ｹ繧ｿ繝ｼ繝亥慍轤ｹ縺ｮ譏蜒上ｒ陦ｨ遉ｺ縺", { x: Vsd.Width - 1, y: 0, align: ALIGN_RIGHT | ALIGN_TOP } ); - print( "M繧ｭ繝ｼ縺ｧ繝ｩ繝繝励ち繧､繝險域ｸｬ" ); - }else{ + if( Vsd.Config_lap_time ){ Vsd.DrawLapTimeLog( Vsd.Width - 1, 0, ALIGN_RIGHT | ALIGN_TOP, 10, font ); } @@ -63,4 +58,32 @@ function Draw(){ // 蜷梧悄譁蟄玲ュ蝣ｱ Vsd.DrawSyncInfo( 0, Vsd.Height - 1, font, ALIGN_LEFT | ALIGN_BOTTOM ); + + // 隱ｬ譏取枚 + if( Vsd.PrivateBuild ) return; + Vsd.DrawRect( 0, 0, font.GetTextWidth( "逕ｻ" ) * 35.5, font.Height * 12.5, 0xC0000000, DRAW_FILL ); + + print( "笳丞酔譛滓焔鬆", { x: 0, y: 0, align: ALIGN_LEFT | ALIGN_TOP } ); + if( typeof( Log.Time ) === "undefined" ){ + print( "繝ｻ縲隈PS繝ｭ繧ｰ縲阪ｮ縲碁幕縺上阪懊ち繝ｳ縺ｧGPS繝ｭ繧ｰ繧帝幕縺阪∪縺" ); + }else{ + print( "繝ｻ縺薙ｮ逕ｻ髱｢荳九ｮ繝｡繧､繝ｳ繧ｹ繝ｩ繧､繝繧貞虚縺九＠ｼ" ); + print( " 霆贋ｸ｡縺悟虚縺榊ｺ縺励◆迸ｬ髢薙ｮ譏蜒上ｒ陦ｨ遉ｺ縺励∪縺" ); + print( "繝ｻ縲隈PS繝ｭ繧ｰ菴咲ｽｮ隱ｿ謨ｴ縲阪せ繝ｩ繧､繝繧貞虚縺九＠ｼ後せ繝斐ｼ繝峨げ繝ｩ繝輔′" ); + print( " 0km/h縺九ｉ蜍輔￥迸ｬ髢薙ｮ繧ｰ繝ｩ繝輔↓繧ｰ繝ｩ繝輔き繝ｼ繧ｽ繝ｫ繧貞粋繧上○縺ｾ縺" ); + print( "繝ｻ譏蜒上→繝ｭ繧ｰ縺悟ｰ代＠縺壹▽縺壹ｌ縺ｦ縺縺丞ｴ蜷医ｯｼ梧丐蜒上ｮ邨ゅｏ繧" ); + print( " 莉倩ｿ代〒繧ゅ≧荳蠎ｦ縲隈PS繝ｭ繧ｰ菴咲ｽｮ隱ｿ謨ｴ縲阪せ繝ｩ繧､繝繧定ｪｿ謨ｴ縺励∪縺" ); + + if( Vsd.MaxLapCnt ){ + print( "繝ｻ繝ｩ繝繝怜蜑ｲ縺後≧縺ｾ縺上＞縺｣縺ｦ縺縺ｪ縺蝣ｴ蜷医ｯ縲瑚ｨ域ｸｬ蝨ｰ轤ｹ蟷縲阪ｒ隱ｿ謨ｴ縺励※縺上□縺輔＞" ); + }else if( Vsd.Config_lap_time ){ + print( "繝ｻ縲瑚ｨ域ｸｬ蝨ｰ轤ｹ蟷縲阪ｒ繧ｳ繝ｼ繧ｹ蟷[m]ﾃ10 縺ｫ險ｭ螳壹＠縺ｾ縺" ); + print( "繝ｻ繝｡繧､繝ｳ繧ｹ繝ｩ繧､繝繧貞虚縺九＠ｼ後さ繝ｳ繝医Ο繝ｼ繝ｫ繝ｩ繧､繝ｳ繧帝夐℃縺励◆迸ｬ髢薙ｮ" ); + print( " 譏蜒上ｒ陦ｨ遉ｺ縺励∪縺" ); + print( "繝ｻ縲勲縲阪く繝ｼ繧呈款縺励∪縺" ); + }else{ + print( "繝ｻ繝ｩ繝繝励ち繧､繝陦ｨ遉ｺ縺吶ｋ蝣ｴ蜷医ｯ縲後Λ繝繝励ち繧､繝陦ｨ遉ｺ縲阪ｒON縺ｫ縺励∪縺" ); + } + print( "繝ｻ縺吶∋縺ｦ縺ｮ隱ｿ謨ｴ縺檎ｵゅｏ縺｣縺溘ｉ縲後せ繧ｭ繝ｳ縲阪ｒ縺雁･ｽ縺ｿ縺ｮ繧ｹ繧ｭ繝ｳ縺ｫ螟画峩縺励※縺上□縺輔＞" ); + } }